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

XEP-0198: Don't bounce/resend forwarded messages

Browse Source 
On connection timeout, drop any messages that were forwarded by some
encapsulating protocol, such as XEP-0280 carbon copies or XEP-0313
archive messages.  Bouncing or resending them could easily lead to
unexpected results.
This commit is contained in:
Holger Weiss 2014-04-07 21:21:11 +02:00 committed by Holger Wei
parent a97c716352
commit c114eb3736
1 changed files with 52 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/ejabberd_c2s.erl
View File

@ -2808,19 +2808,63 @@ handle_unacked_stanzas(_StateData, _F) ->
handle_unacked_stanzas(StateData) when StateData#state.sm_state == active; handle_unacked_stanzas(StateData) when StateData#state.sm_state == active;
StateData#state.sm_state == pending -> StateData#state.sm_state == pending ->
F = case StateData#state.resend_on_timeout of ReRoute = case StateData#state.resend_on_timeout of
true -> true ->
fun ejabberd_router:route/3; fun ejabberd_router:route/3;
false -> false ->
fun(From, To, El) -> fun(From, To, El) ->
Err = jlib:make_error_reply(El, ?ERR_SERVICE_UNAVAILABLE), Err =
jlib:make_error_reply(El,
?ERR_SERVICE_UNAVAILABLE),
ejabberd_router:route(To, From, Err) ejabberd_router:route(To, From, Err)
end end
end, end,
F = fun(From, To, El) ->
%% We'll drop the stanza if it was <forwarded/> by some
%% encapsulating protocol as per XEP-0297. One such protocol is
%% XEP-0280, which says: "When a receiving server attempts to
%% deliver a forked message, and that message bounces with an
%% error for any reason, the receiving server MUST NOT forward
%% that error back to the original sender." Resending such a
%% stanza could easily lead to unexpected results as well.
case is_encapsulated_forward(El) of
true ->
?DEBUG("Dropping forwarded stanza from ~s",
[xml:get_attr_s(<<"from">>, El#xmlel.attrs)]);
false ->
ReRoute(From, To, El)
end
end,
handle_unacked_stanzas(StateData, F); handle_unacked_stanzas(StateData, F);
handle_unacked_stanzas(_StateData) -> handle_unacked_stanzas(_StateData) ->
ok. ok.
is_encapsulated_forward(#xmlel{name = <<"message">>} = El) ->
SubTag = case {xml:get_subtag(El, <<"sent">>),
xml:get_subtag(El, <<"received">>),
xml:get_subtag(El, <<"result">>)} of
{false, false, false} ->
false;
{Tag, false, false} ->
Tag;
{false, Tag, false} ->
Tag;
{_, _, Tag} ->
Tag
end,
if SubTag == false ->
false;
true ->
case xml:get_subtag(SubTag, <<"forwarded">>) of
false ->
false;
_ ->
true
end
end;
is_encapsulated_forward(_El) ->
false.
inherit_session_state(#state{user = U, server = S} = StateData, ResumeID) -> inherit_session_state(#state{user = U, server = S} = StateData, ResumeID) ->
case jlib:base64_to_term(ResumeID) of case jlib:base64_to_term(ResumeID) of
{term, {U, S, R, Time}} -> {term, {U, S, R, Time}} ->