diff options
| author | Badlop <badlop@process-one.net> | 2010-12-02 22:06:07 +0300 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2010-12-23 15:27:24 +0300 |
| commit | fe909a45e9e9f726f0e09052c91ce8d5613efe1b (patch) | |
| tree | a07c4176015c867defe24c13d97de969e4a18960 /src/ejabberd_c2s.erl | |
| parent | bb4a87806fd25a60c3a6f9ba3c9475510144ed88 (diff) | |
Allow auth modules to provide SASL errors; default is "not-authorized".
See
http://tools.ietf.org/html/draft-saintandre-rfc3920bis-09#section-7.4
Diffstat (limited to 'src/ejabberd_c2s.erl')
| -rw-r--r-- | src/ejabberd_c2s.erl | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index 7ef3ab055..da728989c 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -589,6 +589,20 @@ wait_for_auth({xmlstreamelement, El}, StateData) -> send_element(StateData, Res), fsm_next_state(wait_for_auth, StateData) end; + {false, ReasonAuthFail} when is_list(ReasonAuthFail) -> + ?INFO_MSG( + "(~w) Forbidden legacy authentication for ~s due to ~s", + [StateData#state.socket, + exmpp_jid:to_binary(JID), ReasonAuthFail]), + ErrorType = case ReasonAuthFail of + "not-authorized" -> 'not-authorized'; + "temporary-auth-failure" -> 'internal-server-error'; + _ -> 'not-authorized' + end, + Res = exmpp_iq:error_without_original(El, + ErrorType), + send_element(StateData, Res), + fsm_next_state(wait_for_auth, StateData); _ -> ?INFO_MSG( "(~w) Forbidden legacy authentication for ~s", @@ -663,11 +677,11 @@ wait_for_feature_request({xmlstreamelement, #xmlel{ns = NS, name = Name} = El}, fsm_next_state(wait_for_sasl_response, StateData#state{ sasl_state = NewSASLState}); - {error, Error, Username} -> + {error, Error, Username} when is_list(Error) -> ?INFO_MSG( - "(~w) Failed authentication for ~s@~s", + "(~w) Failed authentication for ~s@~s due to ~s", [StateData#state.socket, - Username, StateData#state.server]), + Username, StateData#state.server, Error]), send_element(StateData, exmpp_server_sasl:failure(Error)), {next_state, wait_for_feature_request, StateData, |