Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-24 16:23:40 +01:00
Code Releases Activity

Catch exceptions from acl:add_list in web admin

Browse Source
This commit is contained in:
Paweł Chmielowski 2017-05-04 11:18:16 +02:00
parent cf53d834e9
commit c64e77a08c
2 changed files with 48 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/acl.erl
View File

@ -266,24 +266,42 @@ normalize_spec(Spec) ->
case Spec of case Spec of
all -> all; all -> all;
none -> none; none -> none;
{acl, N} -> {acl, N}; {acl, N} when is_atom(N) ->
{user, {U, S}} -> {user, {nodeprep(U), nameprep(S)}}; {acl, N};
{user, U} -> {user, split_user_server(U, fun nodeprep/1, fun nameprep/1)}; {user, {U, S}} when is_binary(U), is_binary(S) ->
{shared_group, {G, H}} -> {shared_group, {b(G), nameprep(H)}}; {user, {nodeprep(U), nameprep(S)}};
{shared_group, G} -> {shared_group, split_user_server(G, fun b/1, fun nameprep/1)}; {user, U} when is_binary(U) ->
{user_regexp, {UR, S}} -> {user_regexp, {b(UR), nameprep(S)}}; {user, split_user_server(U, fun nodeprep/1, fun nameprep/1)};
{user_regexp, UR} -> {user_regexp, split_user_server(UR, fun b/1, fun nameprep/1)}; {shared_group, {G, H}} when is_binary(G), is_binary(H) ->
{node_regexp, {UR, SR}} -> {node_regexp, {b(UR), b(SR)}}; {shared_group, {b(G), nameprep(H)}};
{user_glob, {UR, S}} -> {user_glob, {b(UR), nameprep(S)}}; {shared_group, G} when is_binary(G) ->
{user_glob, UR} -> {user_glob, split_user_server(UR, fun b/1, fun nameprep/1)}; {shared_group, split_user_server(G, fun b/1, fun nameprep/1)};
{node_glob, {UR, SR}} -> {node_glob, {b(UR), b(SR)}}; {user_regexp, {UR, S}} when is_binary(UR), is_binary(S) ->
{server, S} -> {server, nameprep(S)}; {user_regexp, {b(UR), nameprep(S)}};
{resource, R} -> {resource, resourceprep(R)}; {user_regexp, UR} when is_binary(UR) ->
{server_regexp, SR} -> {server_regexp, b(SR)}; {user_regexp, split_user_server(UR, fun b/1, fun nameprep/1)};
{resource_regexp, R} -> {resource_regexp, b(R)}; {node_regexp, {UR, SR}} when is_binary(UR), is_binary(SR) ->
{server_glob, S} -> {server_glob, b(S)}; {node_regexp, {b(UR), b(SR)}};
{resource_glob, R} -> {resource_glob, b(R)}; {user_glob, {UR, S}} when is_binary(UR), is_binary(S) ->
{ip, {Net, Mask}} -> {ip, {Net, Mask}}; {user_glob, {b(UR), nameprep(S)}};
{user_glob, UR} when is_binary(UR) ->
{user_glob, split_user_server(UR, fun b/1, fun nameprep/1)};
{node_glob, {UR, SR}} when is_binary(UR), is_binary(SR) ->
{node_glob, {b(UR), b(SR)}};
{server, S} when is_binary(S) ->
{server, nameprep(S)};
{resource, R} when is_binary(R) ->
{resource, resourceprep(R)};
{server_regexp, SR} when is_binary(SR) ->
{server_regexp, b(SR)};
{resource_regexp, R} when is_binary(R) ->
{resource_regexp, b(R)};
{server_glob, S} when is_binary(S) ->
{server_glob, b(S)};
{resource_glob, R} when is_binary(R) ->
{resource_glob, b(R)};
{ip, {Net, Mask}} when is_binary(Net), is_integer(Mask) ->
{ip, {Net, Mask}};
{ip, S} -> {ip, S} ->
case parse_ip_netmask(b(S)) of case parse_ip_netmask(b(S)) of
{ok, Net, Mask} -> {ok, Net, Mask} ->
@ -291,7 +309,9 @@ normalize_spec(Spec) ->
error -> error ->
?INFO_MSG("Invalid network address: ~p", [S]), ?INFO_MSG("Invalid network address: ~p", [S]),
none none
end end;
BadVal ->
throw({<<"Invalid acl value">>, BadVal})
end. end.
-spec any_rules_allowed(global | binary(), [access_name()], -spec any_rules_allowed(global | binary(), [access_name()],

12
src/ejabberd_web_admin.erl
View File

@ -740,7 +740,10 @@ process_admin(Host,
{ok, Tokens, _} -> {ok, Tokens, _} ->
case erl_parse:parse_term(Tokens) of case erl_parse:parse_term(Tokens) of
{ok, NewACLs} -> {ok, NewACLs} ->
acl:add_list(Host, NewACLs, true); case catch acl:add_list(Host, NewACLs, true) of
ok -> ok;
_ -> error
end;
_ -> error _ -> error
end; end;
_ -> error _ -> error
@ -779,8 +782,11 @@ process_admin(Host,
case catch acl_parse_query(Host, Query) of case catch acl_parse_query(Host, Query) of
{'EXIT', _} -> error; {'EXIT', _} -> error;
NewACLs -> NewACLs ->
?INFO_MSG("NewACLs at ~s: ~p", [Host, NewACLs]), ?INFO_MSG("NewACLs at ~s: ~p", [Host, NewACLs]),
acl:add_list(Host, NewACLs, true) case catch acl:add_list(Host, NewACLs, true) of
ok -> ok;
_ -> error
end
end; end;
_ -> nothing _ -> nothing
end, end,