diff options
| author | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-04-29 13:06:53 +0400 |
|---|---|---|
| committer | Evgeny Khramtsov <xramtsov@gmail.com> | 2014-04-29 13:06:53 +0400 |
| commit | 4073394e7aabc58e0fcc1f5590f117fcf91831ba (patch) | |
| tree | 0d20f97b981f4584628d122e70ad5a55e6e1f4cb | |
| parent | Merge pull request #179 from hamano/added_get_random_pid_error_handling (diff) | |
| parent | fix checking acl in mod_register_web (diff) | |
Merge pull request #182 from hamano/register_account_acl
fix checking acl in mod_register_web
| -rw-r--r-- | src/mod_register_web.erl | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/mod_register_web.erl b/src/mod_register_web.erl index 0da53b26d..e98478349 100644 --- a/src/mod_register_web.erl +++ b/src/mod_register_web.erl @@ -487,12 +487,13 @@ register_account(Username, Host, Password) -> Access = gen_mod:get_module_opt(Host, mod_register, access, fun(A) when is_atom(A) -> A end, all), - JID = jlib:make_jid(Username, Host, <<"">>), - Match = acl:match_rule(Host, Access, JID), - case {JID, Match} of - {error, _} -> {error, invalid_jid}; - {_, deny} -> {error, not_allowed}; - {_, allow} -> register_account2(Username, Host, Password) + case jlib:make_jid(Username, Host, <<"">>) of + error -> {error, invalid_jid}; + JID -> + case acl:match_rule(Host, Access, JID) of + deny -> {error, not_allowed}; + allow -> register_account2(Username, Host, Password) + end end. register_account2(Username, Host, Password) -> |