Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00
Code Releases Activity

Attach IP metadata to every stanza received from stream

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2017-02-14 17:09:25 +03:00
parent 0b304731c5
commit 6fd89f5fe0
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ejabberd_c2s.erl
View File

@ -428,22 +428,24 @@ handle_unauthenticated_packet(Pkt, #{lserver := LServer} = State) ->
handle_authenticated_packet(Pkt, #{lserver := LServer} = State) when not ?is_stanza(Pkt) -> handle_authenticated_packet(Pkt, #{lserver := LServer} = State) when not ?is_stanza(Pkt) ->
ejabberd_hooks:run_fold(c2s_authenticated_packet, ejabberd_hooks:run_fold(c2s_authenticated_packet,
LServer, State, [Pkt]); LServer, State, [Pkt]);
handle_authenticated_packet(Pkt, #{lserver := LServer, jid := JID} = State) -> handle_authenticated_packet(Pkt, #{lserver := LServer, jid := JID,
ip := {IP, _}} = State) ->
Pkt1 = xmpp:put_meta(Pkt, ip, IP),
State1 = ejabberd_hooks:run_fold(c2s_authenticated_packet, State1 = ejabberd_hooks:run_fold(c2s_authenticated_packet,
LServer, State, [Pkt]), LServer, State, [Pkt1]),
#jid{luser = LUser} = JID, #jid{luser = LUser} = JID,
{Pkt1, State2} = ejabberd_hooks:run_fold( {Pkt2, State2} = ejabberd_hooks:run_fold(
user_send_packet, LServer, {Pkt, State1}, []), user_send_packet, LServer, {Pkt1, State1}, []),
case Pkt1 of case Pkt2 of
drop -> drop ->
State2; State2;
#presence{to = #jid{luser = LUser, lserver = LServer, #presence{to = #jid{luser = LUser, lserver = LServer,
lresource = <<"">>}} -> lresource = <<"">>}} ->
process_self_presence(State2, Pkt1); process_self_presence(State2, Pkt2);
#presence{} -> #presence{} ->
process_presence_out(State2, Pkt1); process_presence_out(State2, Pkt2);
_ -> _ ->
check_privacy_then_route(State2, Pkt1) check_privacy_then_route(State2, Pkt2)
end. end.
handle_cdata(Data, #{lserver := LServer} = State) -> handle_cdata(Data, #{lserver := LServer} = State) ->

3
src/ejabberd_s2s_in.erl
View File

@ -200,7 +200,8 @@ handle_unauthenticated_packet(Pkt, #{server_host := LServer} = State) ->
handle_authenticated_packet(Pkt, #{server_host := LServer} = State) when not ?is_stanza(Pkt) -> handle_authenticated_packet(Pkt, #{server_host := LServer} = State) when not ?is_stanza(Pkt) ->
ejabberd_hooks:run_fold(s2s_in_authenticated_packet, LServer, State, [Pkt]); ejabberd_hooks:run_fold(s2s_in_authenticated_packet, LServer, State, [Pkt]);
handle_authenticated_packet(Pkt, State) -> handle_authenticated_packet(Pkt0, #{ip := {IP, _}} = State) ->
Pkt = xmpp:put_meta(Pkt0, ip, IP),
From = xmpp:get_from(Pkt), From = xmpp:get_from(Pkt),
To = xmpp:get_to(Pkt), To = xmpp:get_to(Pkt),
case check_from_to(From, To, State) of case check_from_to(From, To, State) of

4
src/ejabberd_service.erl
View File

@ -184,7 +184,9 @@ handle_auth_failure(_, Mech, Reason,
Reason]), Reason]),
State. State.
handle_authenticated_packet(Pkt, #{lang := Lang} = State) when ?is_stanza(Pkt) -> handle_authenticated_packet(Pkt0, #{ip := {IP, _}, lang := Lang} = State)
when ?is_stanza(Pkt0) ->
Pkt = xmpp:put_meta(Pkt0, ip, IP),
From = xmpp:get_from(Pkt), From = xmpp:get_from(Pkt),
case check_from(From, State) of case check_from(From, State) of
true -> true ->