25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00

Merge pull request #270 from weiss/log-s2s-in-auth

Log authentication method for incoming s2s connections
This commit is contained in:
Evgeny Khramtsov 2014-08-05 16:51:51 +04:00
commit f91caf7108

View File

@ -374,8 +374,8 @@ wait_for_feature_request({xmlstreamelement, El},
#xmlel{name = <<"success">>, #xmlel{name = <<"success">>,
attrs = [{<<"xmlns">>, ?NS_SASL}], attrs = [{<<"xmlns">>, ?NS_SASL}],
children = []}), children = []}),
?DEBUG("(~w) Accepted s2s authentication for ~s", ?INFO_MSG("Accepted s2s EXTERNAL authentication for ~s (TLS=~p)",
[StateData#state.socket, AuthDomain]), [AuthDomain, StateData#state.tls_enabled]),
change_shaper(StateData, <<"">>, change_shaper(StateData, <<"">>,
jlib:make_jid(<<"">>, AuthDomain, <<"">>)), jlib:make_jid(<<"">>, AuthDomain, <<"">>)),
{next_state, wait_for_stream, {next_state, wait_for_stream,
@ -515,6 +515,8 @@ stream_established({valid, From, To}, StateData) ->
[{<<"from">>, To}, {<<"to">>, From}, [{<<"from">>, To}, {<<"to">>, From},
{<<"type">>, <<"valid">>}], {<<"type">>, <<"valid">>}],
children = []}), children = []}),
?INFO_MSG("Accepted s2s dialback authentication for ~s (TLS=~p)",
[From, StateData#state.tls_enabled]),
LFrom = jlib:nameprep(From), LFrom = jlib:nameprep(From),
LTo = jlib:nameprep(To), LTo = jlib:nameprep(To),
NSD = StateData#state{connections = NSD = StateData#state{connections =