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

Support in BOSH for stanzas without jabber:client (EJAB-1333)

Browse Source
This commit is contained in:
Badlop 2011-05-04 23:03:26 +02:00
parent f839b1c6ff
commit 05d95f2dd7
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/web/ejabberd_http_bind.erl
View File

@ -1264,6 +1264,10 @@ parse_request(Data, PayloadSize, MaxStanzaSize) ->
{'EXIT', _} -> {'EXIT', _} ->
{error, bad_request}; {error, bad_request};
Rid -> Rid ->
Els2 = case [E || E <- Els, E#xmlel.ns == ?NS_HTTP_BIND] of
[] -> Els;
_ -> force_ns(Data)
end,
%% I guess this is to remove XMLCDATA: Is it really needed ? %% I guess this is to remove XMLCDATA: Is it really needed ?
FixedEls = FixedEls =
lists:filter( lists:filter(
@ -1275,7 +1279,7 @@ parse_request(Data, PayloadSize, MaxStanzaSize) ->
_ -> _ ->
false false
end end
end, Els), end, Els2),
Sid = exmpp_xml:get_attribute_as_list(Xml, <<"sid">>, ""), Sid = exmpp_xml:get_attribute_as_list(Xml, <<"sid">>, ""),
if if
PayloadSize =< MaxStanzaSize -> PayloadSize =< MaxStanzaSize ->
@ -1290,6 +1294,25 @@ parse_request(Data, PayloadSize, MaxStanzaSize) ->
{error, bad_request} {error, bad_request}
end. end.
%% This BOSH stanza contains at least one XMPP stanza without namespace,
%% and exmpp sets the ns of BOSH to it and its children, instead of assuming jabber:client.
%% To avoid that, we set the jabber:client ns to the BOSH stanza, parse it,
%% and the NS will be inherited to the ns-less XMPP stanza.
force_ns(Data) ->
Data2 = change_ns(Data, ?NS_HTTP_BIND_s, ?NS_JABBER_CLIENT_s),
[#xmlel{children = Els}] = exmpp_xmlstream:parse_element(Data2),
Els.
change_ns(String, ?NS_HTTP_BIND_s, ?NS_JABBER_CLIENT_s) ->
change_ns(String, ?NS_HTTP_BIND_s, ?NS_JABBER_CLIENT_s, "").
change_ns([], _NSin, _NSout, Res) ->
lists:reverse(Res);
%%change_ns(NSin ++ String, NSin, NSout, Res) when FirstString->
change_ns(?NS_HTTP_BIND_s ++ String, NSin, NSout, Res) ->
%%change_ns([$h,$t,$t,$p,$:,$/,$/,$j,$a,$b,$b,$e,$r,$.,$o,$r,$g,$/,$p,$r,$o,$t,$o,$c,$o,$l,$/,$h,$t,$t,$p,$b,$i,$n,$d|String], NSin, NSout, Res) ->
change_ns(String, NSin, NSout, lists:reverse(NSout) ++ Res);
change_ns([Char | String], NSin, NSout, Res) ->
change_ns(String, NSin, NSout, [Char | Res]).
send_receiver_reply(undefined, _Reply) -> send_receiver_reply(undefined, _Reply) ->
ok; ok;
send_receiver_reply(Receiver, Reply) -> send_receiver_reply(Receiver, Reply) ->