Chapril/xmpp.chapril.org-ejabberd
26
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-28 17:38:54 +01:00
Code Releases Activity

Improve logging of outbound s2s auth failures

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2017-02-28 12:13:35 +03:00
parent 95a8f58314
commit d81b07bd5f
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/xmpp_stream_out.erl
View File

@ -639,7 +639,9 @@ process_sasl_success(#{mod := Mod,
end. end.
-spec process_sasl_failure(sasl_failure(), state()) -> state(). -spec process_sasl_failure(sasl_failure(), state()) -> state().
process_sasl_failure(#sasl_failure{reason = Reason}, #{mod := Mod} = State) -> process_sasl_failure(#sasl_failure{} = Failure, #{mod := Mod} = State) ->
Reason = format("Peer responded with error: ~s",
[format_sasl_failure(Failure)]),
try Mod:handle_auth_failure(<<"EXTERNAL">>, {auth, Reason}, State) try Mod:handle_auth_failure(<<"EXTERNAL">>, {auth, Reason}, State)
catch _:undef -> process_stream_end({auth, Reason}, State) catch _:undef -> process_stream_end({auth, Reason}, State)
end. end.
@ -787,6 +789,17 @@ format_tls_error(Reason) when is_atom(Reason) ->
format_tls_error(Reason) -> format_tls_error(Reason) ->
binary_to_list(Reason). binary_to_list(Reason).
format_sasl_failure(#sasl_failure{reason = Reason, text = Txt}) ->
Slogan = case Reason of
undefined -> "no reason";
_ -> atom_to_list(Reason)
end,
case xmpp:get_text(Txt) of
<<"">> -> Slogan;
Data ->
binary_to_list(Data) ++ " (" ++ Slogan ++ ")"
end.
-spec format(io:format(), list()) -> binary(). -spec format(io:format(), list()) -> binary().
format(Fmt, Args) -> format(Fmt, Args) ->
iolist_to_binary(io_lib:format(Fmt, Args)). iolist_to_binary(io_lib:format(Fmt, Args)).