yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(conf): check node name, otp regular expression

This commit is contained in:
DDDHuang 2022-05-18 13:59:24 +08:00
parent 84fa6bfaeb
commit cdb1c149e7
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES-4.3.md
View File

@ -31,6 +31,7 @@ File format:
* Improved resilience against autocluster partitioning during cluster * Improved resilience against autocluster partitioning during cluster
startup. [#7876] startup. [#7876]
[ekka-158](https://github.com/emqx/ekka/pull/158) [ekka-158](https://github.com/emqx/ekka/pull/158)
* Fix Added regularity (`^[0-9A-Za-z_\-]+$`) check for node names
## v4.3.14 ## v4.3.14

15
priv/emqx.schema
View File

@ -206,6 +206,21 @@ end}.
{override_env, "NODE_NAME"} {override_env, "NODE_NAME"}
]}. ]}.
%% Node name regular expression from net_kernel:valid_name_head/1.
%% Be same with otp.
{translation, "vm_args.-name",
fun(Conf) ->
NodeName = cuttlefish:conf_get("node.name", Conf),
{Head, _Host} = lists:splitwith(fun(C) -> C =/= $@ end, NodeName),
{ok, MP} = re:compile("^[0-9A-Za-z_\\-]+$", [unicode]),
case re:run(Head, MP) of
{match, _} ->
NodeName;
nomatch ->
cuttlefish:invalid("Bad node name, expect ^[0-9A-Za-z_\\-]+$")
end
end}.
%% @doc Specify SSL Options in the file if using SSL for erlang distribution %% @doc Specify SSL Options in the file if using SSL for erlang distribution
{mapping, "node.ssl_dist_optfile", "vm_args.-ssl_dist_optfile", [ {mapping, "node.ssl_dist_optfile", "vm_args.-ssl_dist_optfile", [
{datatype, string}, {datatype, string},