aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2018-04-20 16:52:15 +0200
committerRaimo Niskanen <[email protected]>2018-04-23 14:58:15 +0200
commit4c4d861792d79ac7773548c089b7a93bc2c72a51 (patch)
tree62b53d8541723c846da603d88d66e8935281ae03 /lib/kernel
parent0edf78512f444b0029b27de1cde60c38ea388845 (diff)
downloadotp-4c4d861792d79ac7773548c089b7a93bc2c72a51.tar.gz
otp-4c4d861792d79ac7773548c089b7a93bc2c72a51.tar.bz2
otp-4c4d861792d79ac7773548c089b7a93bc2c72a51.zip
Open for host and node allow list
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/src/dist_util.erl81
1 files changed, 59 insertions, 22 deletions
diff --git a/lib/kernel/src/dist_util.erl b/lib/kernel/src/dist_util.erl
index b325fc5456..402d474c6d 100644
--- a/lib/kernel/src/dist_util.erl
+++ b/lib/kernel/src/dist_util.erl
@@ -30,7 +30,7 @@
strict_order_flags/0,
start_timer/1, setup_timer/2,
reset_timer/1, cancel_timer/1,
- is_allowed/2,
+ is_node_name/1, split_node/1, is_allowed/2,
shutdown/3, shutdown/4]).
-import(error_logger,[error_msg/2]).
@@ -632,7 +632,7 @@ recv_name(#hs_data{socket = Socket, f_recv = Recv} = HSData) ->
{ok,
[$n,VersionA, VersionB, Flag1, Flag2, Flag3, Flag4
| OtherNode] = Data} ->
- case is_valid_name(OtherNode) of
+ case is_node_name(OtherNode) of
true ->
Flags = ?u32(Flag1, Flag2, Flag3, Flag4),
Version = ?u16(VersionA,VersionB),
@@ -644,6 +644,31 @@ recv_name(#hs_data{socket = Socket, f_recv = Recv} = HSData) ->
?shutdown(no_node)
end.
+is_node_name(OtherNodeName) ->
+ case string:split(OtherNodeName, "@") of
+ [Name,Host] ->
+ (not string:is_empty(Name))
+ andalso (not string:is_empty(Host));
+ _ ->
+ false
+ end.
+
+split_node(Node) ->
+ case string:split(listify_node(Node), "@") of
+ [Name,Host] = Split ->
+ case
+ (not string:is_empty(Name))
+ andalso (not string:is_empty(Host))
+ of
+ true ->
+ {Name,Host};
+ false ->
+ Split
+ end;
+ Split ->
+ Split
+ end.
+
%%
%% check if connecting node is allowed to connect
%% with allow-node-scheme
@@ -661,32 +686,44 @@ is_allowed(#hs_data{allowed = Allowed} = HSData, Flags, Node, Version) ->
?shutdown2(Node, {is_allowed, not_allowed})
end.
+%% Allow Node on Allowed node list, and also if host part
+%% of Node matches Allowed list item. The Allowed list
+%% contains node names or host names.
+%%
is_allowed(_Node, []) ->
false;
+is_allowed(Node, [Node|_Allowed]) when is_atom(Node) ->
+ true;
is_allowed(Node, [AllowedNode|Allowed]) ->
- case is_nodename_equal(Node, AllowedNode) of
- true ->
- true;
- false ->
+ case split_node(AllowedNode) of
+ {AllowedName,AllowedHost} ->
+ %% Allowed node name
+ case split_node(Node) of
+ {AllowedName,AllowedHost} ->
+ true;
+ _ ->
+ is_allowed(Node, Allowed)
+ end;
+ [AllowedHost] ->
+ %% Allowed host name
+ case split_node(Node) of
+ {_,AllowedHost} ->
+ %% Matching Host part
+ true;
+ [AllowedHost] ->
+ %% Host matches Host
+ true;
+ _ ->
+ is_allowed(Node, Allowed)
+ end;
+ _ ->
is_allowed(Node, Allowed)
end.
-is_nodename_equal(A, B) when is_atom(A), is_atom(B) ->
- A =:= B;
-is_nodename_equal(A, B) when is_atom(A) ->
- is_nodename_equal(atom_to_list(A), B);
-is_nodename_equal(A, B) when is_atom(B) ->
- is_nodename_equal(A, atom_to_list(B));
-is_nodename_equal(A, B) when is_list(A), is_list(B) ->
- A =:= B.
-
-is_valid_name(OtherNodeName) ->
- case string:lexemes(OtherNodeName,"@") of
- [_OtherNodeName,_OtherNodeHost] ->
- true;
- _else ->
- false
- end.
+listify_node(Atom) when is_atom(Atom) ->
+ atom_to_list(Atom);
+listify_node(Node) when is_list(Node) ->
+ Node.
publish_type(Flags) ->
case Flags band ?DFLAG_PUBLISHED of