Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

Fix acl issue from cleanup

This commit is contained in:
Christophe Romain 2015-10-07 15:12:15 +02:00
parent f938c2a5e2
commit 653105a44f
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/acl.erl
View File

@ -289,7 +289,7 @@ match_acl(none, _JID, _Host) ->
match_acl(ACL, IP, Host) when tuple_size(IP) == 4; match_acl(ACL, IP, Host) when tuple_size(IP) == 4;
tuple_size(IP) == 8 -> tuple_size(IP) == 8 ->
lists:any( lists:any(
fun({ip, {Net, Mask}}) -> fun(#acl{aclspec = {ip, {Net, Mask}}}) ->
is_ip_match(IP, Net, Mask); is_ip_match(IP, Net, Mask);
(_) -> (_) ->
false false
@ -297,7 +297,7 @@ match_acl(ACL, IP, Host) when tuple_size(IP) == 4;
match_acl(ACL, JID, Host) -> match_acl(ACL, JID, Host) ->
{User, Server, Resource} = jlib:jid_tolower(JID), {User, Server, Resource} = jlib:jid_tolower(JID),
lists:any( lists:any(
fun(Spec) -> fun(#acl{aclspec = Spec}) ->
case Spec of case Spec of
all -> true; all -> true;
{user, {U, S}} -> U == User andalso S == Server; {user, {U, S}} -> U == User andalso S == Server;
@ -346,11 +346,7 @@ match_acl(ACL, JID, Host) ->
get_aclspecs(ACL, Host)). get_aclspecs(ACL, Host)).
get_aclspecs(ACL, Host) -> get_aclspecs(ACL, Host) ->
lists:flatmap( ets:lookup(acl, {ACL, Host}) ++ ets:lookup(acl, {ACL, global}).
fun(#acl{aclspec = Specs}) ->
Specs
end, ets:lookup(acl, {ACL, Host}) ++
ets:lookup(acl, {ACL, global})).
is_regexp_match(String, RegExp) -> is_regexp_match(String, RegExp) ->
case ejabberd_regexp:run(String, RegExp) of case ejabberd_regexp:run(String, RegExp) of