diff options
| author | badlop <badlop@process-one.net> | 2019-01-09 16:31:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-09 16:31:14 +0100 |
| commit | 325877446ab8e19914ae7e0334ca3701c25bd45c (patch) | |
| tree | 935e2842d5a9873dd2886fe6966ce50e47d11762 /src | |
| parent | Remove slash producing url /admin//additions.js (diff) | |
| parent | Privacy lists: set from/to on packet *before* calling privacy_check_packet (diff) | |
Merge pull request #2680 from Iperity/fix-privacy-check-on-presence-probe
Privacy lists: set from/to on packet *before* calling privacy_check_p…
Diffstat (limited to 'src')
| -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 26bf9b1b2..61284e3e6 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 |