diff options
author | Paweł Chmielowski <pchmielowski@process-one.net> | 2017-05-04 11:18:16 +0200 |
---|---|---|
committer | Paweł Chmielowski <pchmielowski@process-one.net> | 2017-05-04 12:01:22 +0200 |
commit | c64e77a08cd065ab9ae9b53590853b4743e1dc9d (patch) | |
tree | cb47b3b069c71f2dff018a76534e1df666442128 /src/acl.erl | |
parent | Introduce 'iqdisc' global option (diff) |
Catch exceptions from acl:add_list in web admin
Diffstat (limited to 'src/acl.erl')
-rw-r--r-- | src/acl.erl | 58 |
1 files changed, 39 insertions, 19 deletions
diff --git a/src/acl.erl b/src/acl.erl index 3e0617f5..2d848b99 100644 --- a/src/acl.erl +++ b/src/acl.erl @@ -266,24 +266,42 @@ normalize_spec(Spec) -> case Spec of all -> all; none -> none; - {acl, N} -> {acl, N}; - {user, {U, S}} -> {user, {nodeprep(U), nameprep(S)}}; - {user, U} -> {user, split_user_server(U, fun nodeprep/1, fun nameprep/1)}; - {shared_group, {G, H}} -> {shared_group, {b(G), nameprep(H)}}; - {shared_group, G} -> {shared_group, split_user_server(G, fun b/1, fun nameprep/1)}; - {user_regexp, {UR, S}} -> {user_regexp, {b(UR), nameprep(S)}}; - {user_regexp, UR} -> {user_regexp, split_user_server(UR, fun b/1, fun nameprep/1)}; - {node_regexp, {UR, SR}} -> {node_regexp, {b(UR), b(SR)}}; - {user_glob, {UR, S}} -> {user_glob, {b(UR), nameprep(S)}}; - {user_glob, UR} -> {user_glob, split_user_server(UR, fun b/1, fun nameprep/1)}; - {node_glob, {UR, SR}} -> {node_glob, {b(UR), b(SR)}}; - {server, S} -> {server, nameprep(S)}; - {resource, R} -> {resource, resourceprep(R)}; - {server_regexp, SR} -> {server_regexp, b(SR)}; - {resource_regexp, R} -> {resource_regexp, b(R)}; - {server_glob, S} -> {server_glob, b(S)}; - {resource_glob, R} -> {resource_glob, b(R)}; - {ip, {Net, Mask}} -> {ip, {Net, Mask}}; + {acl, N} when is_atom(N) -> + {acl, N}; + {user, {U, S}} when is_binary(U), is_binary(S) -> + {user, {nodeprep(U), nameprep(S)}}; + {user, U} when is_binary(U) -> + {user, split_user_server(U, fun nodeprep/1, fun nameprep/1)}; + {shared_group, {G, H}} when is_binary(G), is_binary(H) -> + {shared_group, {b(G), nameprep(H)}}; + {shared_group, G} when is_binary(G) -> + {shared_group, split_user_server(G, fun b/1, fun nameprep/1)}; + {user_regexp, {UR, S}} when is_binary(UR), is_binary(S) -> + {user_regexp, {b(UR), nameprep(S)}}; + {user_regexp, UR} when is_binary(UR) -> + {user_regexp, split_user_server(UR, fun b/1, fun nameprep/1)}; + {node_regexp, {UR, SR}} when is_binary(UR), is_binary(SR) -> + {node_regexp, {b(UR), b(SR)}}; + {user_glob, {UR, S}} when is_binary(UR), is_binary(S) -> + {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} -> case parse_ip_netmask(b(S)) of {ok, Net, Mask} -> @@ -291,7 +309,9 @@ normalize_spec(Spec) -> error -> ?INFO_MSG("Invalid network address: ~p", [S]), none - end + end; + BadVal -> + throw({<<"Invalid acl value">>, BadVal}) end. -spec any_rules_allowed(global | binary(), [access_name()], |