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

Use ejabberd_c2s:privacy_check_packet/5 for all those hook folded runs in the c2s module

Browse Source
This commit is contained in:
Andreas Köhler 2010-11-05 03:48:13 +01:00 committed by Badlop
parent 614f13714c
commit 351635d0aa
1 changed files with 10 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/ejabberd_c2s.erl
View File

@ -1215,14 +1215,7 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
SRes = is_privacy_allow(StateData, From, To, Packet, in), SRes = is_privacy_allow(StateData, From, To, Packet, in),
{SRes, Attrs, StateData}; {SRes, Attrs, StateData};
_ -> _ ->
case ejabberd_hooks:run_fold( case privacy_check_packet(StateData, From, To, Packet, in) of
privacy_check_packet, StateData#state.server,
allow,
[StateData#state.user,
StateData#state.server,
StateData#state.privacy_list,
{From, To, Packet},
in]) of
allow -> allow ->
LFrom = jlib:short_prepd_jid(From), LFrom = jlib:short_prepd_jid(From),
LBFrom = jlib:short_prepd_bare_jid(From), LBFrom = jlib:short_prepd_bare_jid(From),
@ -1312,14 +1305,7 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
end, end,
{false, Attrs, StateData}; {false, Attrs, StateData};
_ -> _ ->
case ejabberd_hooks:run_fold( case privacy_check_packet(StateData, From, To, Packet, in) of
privacy_check_packet, StateData#state.server,
allow,
[StateData#state.user,
StateData#state.server,
StateData#state.privacy_list,
{From, To, Packet},
in]) of
allow -> allow ->
{true, Attrs, StateData}; {true, Attrs, StateData};
deny -> deny ->
@ -1332,14 +1318,7 @@ handle_info({route, From, To, Packet}, StateName, StateData) ->
{true, Attrs, StateData} {true, Attrs, StateData}
end; end;
#xmlel{attrs = Attrs} when ?IS_MESSAGE(Packet) -> #xmlel{attrs = Attrs} when ?IS_MESSAGE(Packet) ->
case ejabberd_hooks:run_fold( case privacy_check_packet(StateData, From, To, Packet, in) of
privacy_check_packet, StateData#state.server,
allow,
[StateData#state.user,
StateData#state.server,
StateData#state.privacy_list,
{From, To, Packet},
in]) of
allow -> allow ->
case ejabberd_hooks:run_fold( case ejabberd_hooks:run_fold(
feature_check_packet, StateData#state.server, feature_check_packet, StateData#state.server,
@ -1657,14 +1636,7 @@ process_presence_probe(From, To, StateData) ->
[jlib:timestamp_to_xml(Timestamp, utc, To, ""), [jlib:timestamp_to_xml(Timestamp, utc, To, ""),
%% TODO: Delete the next line once XEP-0091 is Obsolete %% TODO: Delete the next line once XEP-0091 is Obsolete
jlib:timestamp_to_xml(Timestamp)]), jlib:timestamp_to_xml(Timestamp)]),
case ejabberd_hooks:run_fold( case privacy_check_packet(StateData, To, From, Packet, out) of
privacy_check_packet, StateData#state.server,
allow,
[StateData#state.user,
StateData#state.server,
StateData#state.privacy_list,
{To, From, Packet},
out]) of
deny -> deny ->
ok; ok;
allow -> allow ->
@ -1832,14 +1804,7 @@ try_check_privacy_route(Type, User, Server, From, StateData, FromRoute, To, Pack
end. end.
check_privacy_route(From, StateData, FromRoute, To, Packet) -> check_privacy_route(From, StateData, FromRoute, To, Packet) ->
case ejabberd_hooks:run_fold( case privacy_check_packet(StateData, From, To, Packet, out) of
privacy_check_packet, StateData#state.server,
allow,
[StateData#state.user,
StateData#state.server,
StateData#state.privacy_list,
{From, To, Packet},
out]) of
deny -> deny ->
Lang = StateData#state.lang, Lang = StateData#state.lang,
ErrText = "Routing of this stanza was denied by your active privacy list", ErrText = "Routing of this stanza was denied by your active privacy list",
@ -1908,14 +1873,7 @@ format_and_check_privacy(From, StateData, Packet, JIDs) ->
FJIDs = [exmpp_jid:make(JID) || JID <- JIDs], FJIDs = [exmpp_jid:make(JID) || JID <- JIDs],
lists:filter( lists:filter(
fun(FJID) -> fun(FJID) ->
case ejabberd_hooks:run_fold( case privacy_check_packet(StateData, From, FJID, Packet, out) of
privacy_check_packet, StateData#state.server,
allow,
[StateData#state.user,
StateData#state.server,
StateData#state.privacy_list,
{From, FJID, Packet},
out]) of
deny -> false; deny -> false;
allow -> true allow -> true
end end
@ -1966,14 +1924,7 @@ roster_change(IJID, ISubscription, StateData) ->
if if
Cond1 -> Cond1 ->
?DEBUG("C1: ~p~n", [LIJID]), ?DEBUG("C1: ~p~n", [LIJID]),
case ejabberd_hooks:run_fold( case privacy_check_packet(StateData, From, To, P, out) of
privacy_check_packet, StateData#state.server,
allow,
[StateData#state.user,
StateData#state.server,
StateData#state.privacy_list,
{From, To, P},
out]) of
deny -> deny ->
ok; ok;
allow -> allow ->
@ -1987,14 +1938,7 @@ roster_change(IJID, ISubscription, StateData) ->
Cond2 -> Cond2 ->
?DEBUG("C2: ~p~n", [LIJID]), ?DEBUG("C2: ~p~n", [LIJID]),
PU = exmpp_presence:unavailable(), PU = exmpp_presence:unavailable(),
case ejabberd_hooks:run_fold( case privacy_check_packet(StateData, From, To, PU, out) of
privacy_check_packet, StateData#state.server,
allow,
[StateData#state.user,
StateData#state.server,
StateData#state.privacy_list,
{From, To, PU},
out]) of
deny -> deny ->
ok; ok;
allow -> allow ->
@ -2060,9 +2004,7 @@ process_privacy_iq(From, To,
resend_offline_messages(#state{user = UserB, resend_offline_messages(#state{user = UserB,
server = ServerB, server = ServerB} = StateData) ->
privacy_list = PrivList} = StateData) ->
case ejabberd_hooks:run_fold(resend_offline_messages_hook, case ejabberd_hooks:run_fold(resend_offline_messages_hook,
StateData#state.server, StateData#state.server,
[], [],
@ -2071,14 +2013,7 @@ resend_offline_messages(#state{user = UserB,
lists:foreach( lists:foreach(
fun({route, fun({route,
From, To, Packet}) -> From, To, Packet}) ->
Pass = case ejabberd_hooks:run_fold( Pass = case privacy_check_packet(StateData, From, To, Packet, in) of
privacy_check_packet, StateData#state.server,
allow,
[StateData#state.user,
StateData#state.server,
PrivList,
{From, To, Packet},
in]) of
allow -> allow ->
true; true;
deny -> deny ->