Merge pull request #354 from weiss/pep-privacy

Respect privacy lists for incoming PEP messages
This commit is contained in:
Evgeny Khramtsov 2014-11-25 14:20:01 +03:00
commit 6b916e7a04
1 changed files with 7 additions and 1 deletions

View File

@ -1755,7 +1755,13 @@ handle_info({send_filtered, Feature, From, To, Packet}, StateName, StateData) ->
FinalPacket = jlib:replace_from_to(From, To, Packet), FinalPacket = jlib:replace_from_to(From, To, Packet),
case StateData#state.jid of case StateData#state.jid of
To -> To ->
send_packet(StateData, FinalPacket); case privacy_check_packet(StateData, From, To,
FinalPacket, in) of
deny ->
StateData;
allow ->
send_stanza(StateData, FinalPacket)
end;
_ -> _ ->
ejabberd_router:route(From, To, FinalPacket), ejabberd_router:route(From, To, FinalPacket),
StateData StateData