diff options
| author | Badlop <badlop@process-one.net> | 2008-04-25 09:25:31 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2008-04-25 09:25:31 +0000 |
| commit | c88a4650ba08028d6d8d545de8888dcdd4f11d37 (patch) | |
| tree | a06ef7014d846d897ff29e309b99d56793c6b5fb /src | |
| parent | * src/treap.erl: Bugfix (diff) | |
* src/ejabberd_c2s.erl: Added forbidden_session_hook
* src/acl.erl: New access types: resource, resource_regexp and
resource_glob
* doc/guide.tex: Likewise
SVN Revision: 1301
Diffstat (limited to 'src')
| -rw-r--r-- | src/acl.erl | 8 | ||||
| -rw-r--r-- | src/ejabberd_c2s.erl | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/acl.erl b/src/acl.erl index c3fcebba4..eed295cb8 100644 --- a/src/acl.erl +++ b/src/acl.erl @@ -158,7 +158,7 @@ match_acl(ACL, JID, Host) -> all -> true; none -> false; _ -> - {User, Server, _Resource} = jlib:jid_tolower(JID), + {User, Server, Resource} = jlib:jid_tolower(JID), lists:any(fun(#acl{aclspec = Spec}) -> case Spec of all -> @@ -173,6 +173,8 @@ match_acl(ACL, JID, Host) -> (U == User) andalso (S == Server); {server, S} -> S == Server; + {resource, R} -> + R == Resource; {user_regexp, UR} -> ((Host == Server) orelse ((Host == global) andalso @@ -183,6 +185,8 @@ match_acl(ACL, JID, Host) -> is_regexp_match(User, UR); {server_regexp, SR} -> is_regexp_match(Server, SR); + {resource_regexp, RR} -> + is_regexp_match(Resource, RR); {node_regexp, UR, SR} -> is_regexp_match(Server, SR) andalso is_regexp_match(User, UR); @@ -197,6 +201,8 @@ match_acl(ACL, JID, Host) -> is_glob_match(User, UR); {server_glob, SR} -> is_glob_match(Server, SR); + {resource_glob, RR} -> + is_glob_match(Resource, RR); {node_glob, UR, SR} -> is_glob_match(Server, SR) andalso is_glob_match(User, UR); diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 567cd6b6e..225bce8eb 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -823,6 +823,8 @@ wait_for_session({xmlstreamelement, El}, StateData) -> pres_t = ?SETS:from_list(Ts1), privacy_list = PrivList}); _ -> + ejabberd_hooks:run(forbidden_session_hook, + StateData#state.server, [JID]), ?INFO_MSG("(~w) Forbidden session for ~s", [StateData#state.socket, jlib:jid_to_string(JID)]), |