Chapril/xmpp.chapril.org-ejabberd
26
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00
Code Releases Activity

Teach web admin about ip acl rules

Browse Source
This commit is contained in:
Paweł Chmielowski 2017-03-10 14:39:47 +01:00
parent 782caaa678
commit 0822108fc8
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ejabberd_web_admin.erl
View File

@ -1114,6 +1114,8 @@ acl_spec_to_text({server_glob, RS}) ->
acl_spec_to_text({node_glob, {RU, RS}}) -> acl_spec_to_text({node_glob, {RU, RS}}) ->
{node_glob, <<RU/binary, "@", RS/binary>>}; {node_glob, <<RU/binary, "@", RS/binary>>};
acl_spec_to_text(all) -> {all, <<"">>}; acl_spec_to_text(all) -> {all, <<"">>};
acl_spec_to_text({ip, {IP, L}}) -> {ip, <<(jlib:ip_to_list(IP))/binary, "/",
(integer_to_binary(L))/binary>>};
acl_spec_to_text(Spec) -> {raw, term_to_string(Spec)}. acl_spec_to_text(Spec) -> {raw, term_to_string(Spec)}.
acl_spec_to_xhtml(ID, Spec) -> acl_spec_to_xhtml(ID, Spec) ->
@ -1137,7 +1139,7 @@ acl_spec_select(ID, Opt) ->
(iolist_to_binary(atom_to_list(O)))) (iolist_to_binary(atom_to_list(O))))
end, end,
[user, server, user_regexp, server_regexp, node_regexp, [user, server, user_regexp, server_regexp, node_regexp,
user_glob, server_glob, node_glob, all, raw])))]). user_glob, server_glob, node_glob, all, ip, raw])))]).
%% @spec (T::any()) -> StringLine::string() %% @spec (T::any()) -> StringLine::string()
term_to_string(T) -> term_to_string(T) ->
@ -1222,6 +1224,10 @@ string_to_spec(<<"node_glob">>, Val) ->
#jid{luser = U, lserver = S, resource = <<"">>} = #jid{luser = U, lserver = S, resource = <<"">>} =
jid:decode(Val), jid:decode(Val),
{node_glob, U, S}; {node_glob, U, S};
string_to_spec(<<"ip">>, Val) ->
[IPs, Ms] = str:tokens(Val, <<"/">>),
{ok, IP} = inet_parse:address(binary_to_list(IPs)),
{ip, {IP, binary_to_integer(Ms)}};
string_to_spec(<<"all">>, _) -> all; string_to_spec(<<"all">>, _) -> all;
string_to_spec(<<"raw">>, Val) -> string_to_spec(<<"raw">>, Val) ->
{ok, Tokens, _} = erl_scan:string(binary_to_list(<<Val/binary, ".">>)), {ok, Tokens, _} = erl_scan:string(binary_to_list(<<Val/binary, ".">>)),