diff options
| author | Nathan Bruning <nathan@iperity.com> | 2018-11-10 16:56:34 +0100 |
|---|---|---|
| committer | Nathan Bruning <nathan@iperity.com> | 2018-11-10 16:56:34 +0100 |
| commit | e965119c0e9d539cea02c596c83c069617b5596e (patch) | |
| tree | a18feb51161913c8208b1411c0154590f4c476cc /src/ejabberd_c2s.erl | |
| parent | Fix mod_http_apt_test (diff) | |
Privacy lists: set from/to on packet *before* calling privacy_check_packet
Diffstat (limited to '')
| -rw-r--r-- | src/ejabberd_c2s.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index c65e71bdf..d491ae9d3 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -638,15 +638,16 @@ route_probe_reply(From, #{jid := To, Subscription = get_subscription(To, From), if IsAnotherResource orelse Subscription == both orelse Subscription == from -> - Packet = misc:add_delay_info(LastPres, To, TS), - case privacy_check_packet(State, Packet, out) of + Packet = xmpp:set_from_to(LastPres, To, From), + Packet2 = misc:add_delay_info(Packet, To, TS), + case privacy_check_packet(State, Packet2, out) of deny -> ok; allow -> ejabberd_hooks:run(presence_probe_hook, LServer, [From, To, self()]), - ejabberd_router:route(xmpp:set_from_to(Packet, To, From)) + ejabberd_router:route(Packet2) end; true -> ok |