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

Fix mod_legacy_auth to reflect recent changes

Browse Source
This commit is contained in:
Evgeny Khramtsov 2019-05-15 20:55:17 +03:00
parent a4c3ea0dfb
commit 2aa181658a
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/mod_legacy_auth.erl
View File

@ -126,10 +126,11 @@ authenticate(#{stream_id := StreamID, server := Server,
case ejabberd_auth:check_password_with_authmodule( case ejabberd_auth:check_password_with_authmodule(
U, U, JID#jid.lserver, P, D, DGen) of U, U, JID#jid.lserver, P, D, DGen) of
{true, AuthModule} -> {true, AuthModule} ->
State1 = ejabberd_c2s:handle_auth_success( State1 = State#{sasl_mech => <<"legacy">>},
U, <<"legacy">>, AuthModule, State), State2 = ejabberd_c2s:handle_auth_success(
State2 = State1#{user := U}, U, <<"legacy">>, AuthModule, State1),
open_session(State2, IQ, R); State3 = State2#{user := U},
open_session(State3, IQ, R);
_ -> _ ->
Err = xmpp:make_error(IQ, xmpp:err_not_authorized()), Err = xmpp:make_error(IQ, xmpp:err_not_authorized()),
process_auth_failure(State, U, Err, 'not-authorized') process_auth_failure(State, U, Err, 'not-authorized')
@ -157,4 +158,14 @@ open_session(State, IQ, R) ->
-spec process_auth_failure(c2s_state(), binary(), iq(), atom()) -> c2s_state(). -spec process_auth_failure(c2s_state(), binary(), iq(), atom()) -> c2s_state().
process_auth_failure(State, User, StanzaErr, Reason) -> process_auth_failure(State, User, StanzaErr, Reason) ->
State1 = ejabberd_c2s:send(State, StanzaErr), State1 = ejabberd_c2s:send(State, StanzaErr),
ejabberd_c2s:handle_auth_failure(User, <<"legacy">>, Reason, State1). State2 = State1#{sasl_mech => <<"legacy">>},
Text = format_reason(Reason),
ejabberd_c2s:handle_auth_failure(User, <<"legacy">>, Text, State2).
-spec format_reason(atom()) -> binary().
format_reason('not-authorized') ->
<<"Invalid username or password">>;
format_reason('forbidden') ->
<<"Access denied by service policy">>;
format_reason('jid-malformed') ->
<<"Malformed XMPP address">>.