Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-22 22:23:42 +02:00
Code Releases Activity

Merge pull request #182 from hamano/register_account_acl

Browse Source 
fix checking acl in mod_register_web
This commit is contained in:
Evgeny Khramtsov 2014-04-29 13:06:53 +04:00
commit 4073394e7a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mod_register_web.erl
View File

@ -487,12 +487,13 @@ register_account(Username, Host, Password) ->
Access = gen_mod:get_module_opt(Host, mod_register, access, Access = gen_mod:get_module_opt(Host, mod_register, access,
fun(A) when is_atom(A) -> A end, fun(A) when is_atom(A) -> A end,
all), all),
JID = jlib:make_jid(Username, Host, <<"">>), case jlib:make_jid(Username, Host, <<"">>) of
Match = acl:match_rule(Host, Access, JID), error -> {error, invalid_jid};
case {JID, Match} of JID ->
{error, _} -> {error, invalid_jid}; case acl:match_rule(Host, Access, JID) of
{_, deny} -> {error, not_allowed}; deny -> {error, not_allowed};
{_, allow} -> register_account2(Username, Host, Password) allow -> register_account2(Username, Host, Password)
end
end. end.
register_account2(Username, Host, Password) -> register_account2(Username, Host, Password) ->