From 38c016a041205a8584b4bb442b945d3b5138b88a Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Tue, 5 Aug 2014 14:10:32 +0200 Subject: [PATCH] Log auth method for incoming s2s connections Generate an [info] message that logs whether an incoming s2s connection is authenticated using the SASL EXTERNAL mechanism or via Server Dialback. While at it, also mention whether TLS is enabled. --- src/ejabberd_s2s_in.erl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index 4fde814fe..6c594185a 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -374,8 +374,8 @@ wait_for_feature_request({xmlstreamelement, El}, #xmlel{name = <<"success">>, attrs = [{<<"xmlns">>, ?NS_SASL}], children = []}), - ?DEBUG("(~w) Accepted s2s authentication for ~s", - [StateData#state.socket, AuthDomain]), + ?INFO_MSG("Accepted s2s EXTERNAL authentication for ~s (TLS=~p)", + [AuthDomain, StateData#state.tls_enabled]), change_shaper(StateData, <<"">>, jlib:make_jid(<<"">>, AuthDomain, <<"">>)), {next_state, wait_for_stream, @@ -515,6 +515,8 @@ stream_established({valid, From, To}, StateData) -> [{<<"from">>, To}, {<<"to">>, From}, {<<"type">>, <<"valid">>}], children = []}), + ?INFO_MSG("Accepted s2s dialback authentication for ~s (TLS=~p)", + [From, StateData#state.tls_enabled]), LFrom = jlib:nameprep(From), LTo = jlib:nameprep(To), NSD = StateData#state{connections =