aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/src
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2018-04-26 09:37:24 +0200
committerRaimo Niskanen <[email protected]>2018-04-26 15:50:45 +0200
commit5586959ed008c09141689f1e8865476150e48519 (patch)
tree5f4aa3e202a7a38e7f7b4a530bc275221e5f034f /lib/kernel/src
parentba25ad268065f48ad7647464c8f4c237d07d18b1 (diff)
downloadotp-5586959ed008c09141689f1e8865476150e48519.tar.gz
otp-5586959ed008c09141689f1e8865476150e48519.tar.bz2
otp-5586959ed008c09141689f1e8865476150e48519.zip
Allow check for node name
Diffstat (limited to 'lib/kernel/src')
-rw-r--r--lib/kernel/src/dist_util.erl76
1 files changed, 51 insertions, 25 deletions
diff --git a/lib/kernel/src/dist_util.erl b/lib/kernel/src/dist_util.erl
index 402d474c6d..ecc022b28d 100644
--- a/lib/kernel/src/dist_util.erl
+++ b/lib/kernel/src/dist_util.erl
@@ -645,7 +645,7 @@ recv_name(#hs_data{socket = Socket, f_recv = Recv} = HSData) ->
end.
is_node_name(OtherNodeName) ->
- case string:split(OtherNodeName, "@") of
+ case string:split(OtherNodeName, "@", all) of
[Name,Host] ->
(not string:is_empty(Name))
andalso (not string:is_empty(Host));
@@ -654,24 +654,32 @@ is_node_name(OtherNodeName) ->
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
+ Split = string:split(listify(Node), "@", all),
+ case Split of
+ [Name,Host] ->
+ case string:is_empty(Name) of
true ->
- {Name,Host};
+ Split;
false ->
- Split
+ case string:is_empty(Host) of
+ true ->
+ {name,Name};
+ false ->
+ {node,Name,Host}
+ end
end;
- Split ->
- Split
+ [Host] ->
+ case string:is_empty(Host) of
+ true ->
+ Split;
+ false ->
+ {host,Host}
+ end
end.
-%%
-%% check if connecting node is allowed to connect
-%% with allow-node-scheme
+%% Check if connecting node is allowed to connect
+%% with allow-node-scheme. An empty allowed list
+%% allows all nodes.
%%
is_allowed(#hs_data{allowed = []}, Flags, Node, Version) ->
{Flags,list_to_atom(Node),Version};
@@ -686,43 +694,61 @@ 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.
+%% The allowed list can contain node names, host names
+%% or names before '@', in atom or list form:
+%% [[email protected], "host.example.org", "node@"].
+%% An empty allowed list allows no nodes.
+%%
+%% Allow a node that matches any entry in the allowed list.
+%% Also allow allowed entries as node to match, not from
+%% this module; here the node has to be a valid name.
%%
is_allowed(_Node, []) ->
false;
-is_allowed(Node, [Node|_Allowed]) when is_atom(Node) ->
+is_allowed(Node, [Node|_Allowed]) ->
+ %% Just an optimization
true;
is_allowed(Node, [AllowedNode|Allowed]) ->
case split_node(AllowedNode) of
- {AllowedName,AllowedHost} ->
+ {node,AllowedName,AllowedHost} ->
%% Allowed node name
case split_node(Node) of
- {AllowedName,AllowedHost} ->
+ {node,AllowedName,AllowedHost} ->
true;
_ ->
is_allowed(Node, Allowed)
end;
- [AllowedHost] ->
+ {host,AllowedHost} ->
%% Allowed host name
case split_node(Node) of
- {_,AllowedHost} ->
+ {node,_,AllowedHost} ->
%% Matching Host part
true;
- [AllowedHost] ->
+ {host,AllowedHost} ->
%% Host matches Host
true;
_ ->
is_allowed(Node, Allowed)
end;
+ {name,AllowedName} ->
+ %% Allowed name before '@'
+ case split_node(Node) of
+ {node,AllowedName,_} ->
+ %% Matching Name part
+ true;
+ {name,AllowedName} ->
+ %% Name matches Name
+ true;
+ _ ->
+ is_allowed(Node, Allowed)
+ end;
_ ->
is_allowed(Node, Allowed)
end.
-listify_node(Atom) when is_atom(Atom) ->
+listify(Atom) when is_atom(Atom) ->
atom_to_list(Atom);
-listify_node(Node) when is_list(Node) ->
+listify(Node) when is_list(Node) ->
Node.
publish_type(Flags) ->