Chapril/xmpp.chapril.org-ejabberd
26
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00
Code Releases Activity

Don't check packets sent to self

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2018-06-27 15:02:03 +03:00
parent 9a11db91f9
commit 644873dae9
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mod_block_strangers.erl
View File

@ -190,6 +190,8 @@ maybe_adjust_from(#message{} = Msg) ->
need_check(Pkt) -> need_check(Pkt) ->
To = xmpp:get_to(Pkt), To = xmpp:get_to(Pkt),
From = xmpp:get_from(Pkt), From = xmpp:get_from(Pkt),
IsSelf = To#jid.luser == From#jid.luser andalso
To#jid.lserver == From#jid.lserver,
LServer = To#jid.lserver, LServer = To#jid.lserver,
IsEmpty = case Pkt of IsEmpty = case Pkt of
#message{body = [], subject = []} -> #message{body = [], subject = []} ->
@ -199,7 +201,8 @@ need_check(Pkt) ->
end, end,
AllowLocalUsers = gen_mod:get_module_opt(LServer, ?MODULE, allow_local_users), AllowLocalUsers = gen_mod:get_module_opt(LServer, ?MODULE, allow_local_users),
Access = gen_mod:get_module_opt(LServer, ?MODULE, access), Access = gen_mod:get_module_opt(LServer, ?MODULE, access),
not (IsEmpty orelse acl:match_rule(LServer, Access, From) == allow not (IsSelf orelse IsEmpty
orelse acl:match_rule(LServer, Access, From) == allow
orelse ((AllowLocalUsers orelse From#jid.luser == <<"">>) orelse ((AllowLocalUsers orelse From#jid.luser == <<"">>)
andalso ejabberd_router:is_my_host(From#jid.lserver))). andalso ejabberd_router:is_my_host(From#jid.lserver))).