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

Code cleanup. Code reorganization. Store version of bosh session. Use bosh version for error conditions (thanks to Stefan Strigler)

Browse Source 
SVN Revision: 2220
This commit is contained in:
Badlop 2009-06-16 17:45:22 +00:00
parent 8a89b1737f
commit 4cce314c11
1 changed files with 166 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

260
src/web/ejabberd_http_bind.erl
View File

@ -3,12 +3,12 @@
%%% Author : Stefan Strigler <steve@zeank.in-berlin.de> %%% Author : Stefan Strigler <steve@zeank.in-berlin.de>
%%% Purpose : HTTP Binding support (JEP-0124) %%% Purpose : HTTP Binding support (JEP-0124)
%%% Created : 21 Sep 2005 by Stefan Strigler <steve@zeank.in-berlin.de> %%% Created : 21 Sep 2005 by Stefan Strigler <steve@zeank.in-berlin.de>
%%% Id : $Id: ejabberd_http_bind.erl 275 2007-08-15 13:57:51Z sstrigler $ %%% Id : $Id: ejabberd_http_bind.erl 276 2007-08-15 16:09:23Z sstrigler $
%%%---------------------------------------------------------------------- %%%----------------------------------------------------------------------
-module(ejabberd_http_bind). -module(ejabberd_http_bind).
-author('steve@zeank.in-berlin.de'). -author('steve@zeank.in-berlin.de').
-vsn('$Rev: 275 $'). -vsn('$Rev: 276 $').
-behaviour(gen_fsm). -behaviour(gen_fsm).
@ -43,7 +43,7 @@
out}). out}).
-record(state, {id, -record(state, {id,
rid = error, rid = none,
key, key,
output = "", output = "",
input = "", input = "",
@ -70,8 +70,8 @@
-define(NS_HTTP_BIND, "http://jabber.org/protocol/httpbind"). -define(NS_HTTP_BIND, "http://jabber.org/protocol/httpbind").
-define(MAX_REQUESTS, 2). % number of simultaneous requests -define(MAX_REQUESTS, 2). % number of simultaneous requests
-define(MIN_POLLING, "2"). % don't poll faster than that or we will -define(MIN_POLLING, 2000000). % don't poll faster than that or we will
% shoot you % shoot you (time in µsec)
-define(MAX_WAIT, 3600). % max num of secs to keep a request on hold -define(MAX_WAIT, 3600). % max num of secs to keep a request on hold
-define(MAX_INACTIVITY, 30000). % msecs to wait before terminating -define(MAX_INACTIVITY, 30000). % msecs to wait before terminating
% idle sessions % idle sessions
@ -116,7 +116,7 @@ peername(_Socket) ->
process_request(Data) -> process_request(Data) ->
case catch parse_request(Data) of case catch parse_request(Data) of
{ok, {"", Rid, Key, NewKey, Attrs, Packet}} -> {ok, {"", Rid, Attrs, Payload}} ->
case xml:get_attr_s("to",Attrs) of case xml:get_attr_s("to",Attrs) of
"" -> "" ->
{200, ?HEADER, "<body type='terminate' " {200, ?HEADER, "<body type='terminate' "
@ -125,7 +125,7 @@ process_request(Data) ->
XmppDomain -> XmppDomain ->
%% create new session %% create new session
Sid = sha:sha(term_to_binary({now(), make_ref()})), Sid = sha:sha(term_to_binary({now(), make_ref()})),
{ok, Pid} = start(Sid, Key), {ok, Pid} = start(Sid, ""),
?DEBUG("got pid: ~p", [Pid]), ?DEBUG("got pid: ~p", [Pid]),
Wait = case Wait = case
string:to_integer(xml:get_attr_s("wait",Attrs)) string:to_integer(xml:get_attr_s("wait",Attrs))
@ -160,20 +160,26 @@ process_request(Data) ->
V -> V V -> V
end, end,
XmppVersion = xml:get_attr_s("xmpp:version", Attrs), XmppVersion = xml:get_attr_s("xmpp:version", Attrs),
mnesia:transaction( case catch mnesia:transaction(
fun() -> fun() ->
mnesia:write(#http_bind{id = Sid, mnesia:write(
#http_bind{id = Sid,
pid = Pid, pid = Pid,
to = {XmppDomain, to = {XmppDomain,
XmppVersion}, XmppVersion},
wait = Wait,
hold = Hold, hold = Hold,
version = Version}) wait = Wait,
end), version = Version
handle_http_put(Sid, Rid, Key, NewKey, Wait, Hold, })
Attrs, Packet, true) end) of
{'EXIT', Reason} ->
?DEBUG("failed storing session: ~p", [Reason]);
Foo ->
?DEBUG("foo: ~p", [Foo])
end,
handle_http_put(Sid, Rid, Attrs, Payload, true)
end; end;
{ok, {Sid, Rid, Key, NewKey, Attrs, Packet}} -> {ok, {Sid, Rid, Attrs, Payload1}} ->
%% old session %% old session
StreamStart = StreamStart =
case xml:get_attr_s("xmpp:restart",Attrs) of case xml:get_attr_s("xmpp:restart",Attrs) of
@ -182,17 +188,14 @@ process_request(Data) ->
_ -> _ ->
false false
end, end,
Wait = ?MAX_WAIT, Payload2 = case xml:get_attr_s("type",Attrs) of
Hold = (?MAX_REQUESTS - 1),
InPacket = case xml:get_attr_s("type",Attrs) of
"terminate" -> "terminate" ->
%% close stream %% close stream
Packet ++ "</stream:stream>"; Payload1 ++ "</stream:stream>";
_ -> _ ->
Packet Payload1
end, end,
handle_http_put(Sid, Rid, Key, NewKey, Wait, Hold, Attrs, handle_http_put(Sid, Rid, Attrs, Payload2, StreamStart);
InPacket, StreamStart);
_ -> _ ->
{400, ?HEADER, ""} {400, ?HEADER, ""}
end. end.
@ -281,15 +284,13 @@ handle_sync_event(stop, _From, _StateName, StateData) ->
Reply = ok, Reply = ok,
{stop, normal, Reply, StateData}; {stop, normal, Reply, StateData};
handle_sync_event({http_put, Rid, Key, NewKey, Hold, Packet, StreamTo}, handle_sync_event({http_put, Rid, Attrs, Payload, Hold, StreamTo},
_From, StateName, StateData) -> _From, StateName, StateData) ->
Key = xml:get_attr_s("key", Attrs),
NewKey = xml:get_attr_s("newkey", Attrs),
%% check if Rid valid %% check if Rid valid
RidAllow = case Rid of RidAllow = case StateData#state.rid of
error -> none ->
false;
_ ->
case StateData#state.rid of
error ->
%% first request - nothing saved so far %% first request - nothing saved so far
true; true;
OldRid -> OldRid ->
@ -305,7 +306,6 @@ handle_sync_event({http_put, Rid, Key, NewKey, Hold, Packet, StreamTo},
true -> true ->
false false
end end
end
end, end,
%% check if key valid %% check if key valid
KeyAllow = case RidAllow of KeyAllow = case RidAllow of
@ -335,16 +335,15 @@ handle_sync_event({http_put, Rid, Key, NewKey, Hold, Packet, StreamTo},
{_,TSec,TMSec} = now(), {_,TSec,TMSec} = now(),
TNow = TSec*1000*1000 + TMSec, TNow = TSec*1000*1000 + TMSec,
LastPoll = if LastPoll = if
Packet == "" -> Payload == "" ->
TNow; TNow;
true -> true ->
0 0
end, end,
{MinPoll, _} = string:to_integer(?MIN_POLLING),
if if
(Packet == "") and (Payload == "") and
(Hold == 0) and (Hold == 0) and
(TNow - StateData#state.last_poll < MinPoll*1000*1000) -> (TNow - StateData#state.last_poll < ?MIN_POLLING) ->
Reply = {error, polling_too_frequently}, Reply = {error, polling_too_frequently},
{reply, Reply, StateName, StateData}; {reply, Reply, StateName, StateData};
KeyAllow -> KeyAllow ->
@ -390,7 +389,7 @@ handle_sync_event({http_put, Rid, Key, NewKey, Hold, Packet, StreamTo},
cancel_timer(StateData#state.timer), cancel_timer(StateData#state.timer),
Timer = erlang:start_timer( Timer = erlang:start_timer(
?MAX_INACTIVITY, self(), []), ?MAX_INACTIVITY, self(), []),
Input = Packet ++ [StateData#state.input], Input = Payload ++ [StateData#state.input],
Reply = ok, Reply = ok,
{reply, Reply, StateName, {reply, Reply, StateName,
StateData#state{input = Input, StateData#state{input = Input,
@ -408,15 +407,15 @@ handle_sync_event({http_put, Rid, Key, NewKey, Hold, Packet, StreamTo},
["<stream:stream to='", To, "' " ["<stream:stream to='", To, "' "
"xmlns='"++?NS_CLIENT++"' " "xmlns='"++?NS_CLIENT++"' "
"xmlns:stream='"++?NS_STREAM++"'>"] "xmlns:stream='"++?NS_STREAM++"'>"]
++ Packet; ++ Payload;
{To, Version} -> {To, Version} ->
["<stream:stream to='", To, "' " ["<stream:stream to='", To, "' "
"xmlns='"++?NS_CLIENT++"' " "xmlns='"++?NS_CLIENT++"' "
"version='", Version, "' " "version='", Version, "' "
"xmlns:stream='"++?NS_STREAM++"'>"] "xmlns:stream='"++?NS_STREAM++"'>"]
++ Packet; ++ Payload;
_ -> _ ->
Packet Payload
end, end,
?DEBUG("really sending now: ~s", [SendPacket]), ?DEBUG("really sending now: ~s", [SendPacket]),
Receiver ! {tcp, {http_bind, self()}, Receiver ! {tcp, {http_bind, self()},
@ -531,75 +530,85 @@ terminate(_Reason, _StateName, StateData) ->
%%% Internal functions %%% Internal functions
%%%---------------------------------------------------------------------- %%%----------------------------------------------------------------------
http_put(Sid, Rid, Key, NewKey, Hold, Packet, StreamStart) -> handle_http_put(Sid, Rid, Attrs, Payload, StreamStart) ->
?DEBUG("http-put",[]), case http_put(Sid, Rid, Attrs, Payload, StreamStart) of
case mnesia:dirty_read({http_bind, Sid}) of
[] ->
?DEBUG("not found",[]),
{error, not_exists};
[#http_bind{pid = FsmRef,to={To, Version}}] ->
case StreamStart of
true ->
?DEBUG("restart requested for ~s", [To]),
gen_fsm:sync_send_all_state_event(
FsmRef, {http_put, Rid, Key, NewKey, Hold, Packet, {To, Version}});
_ ->
gen_fsm:sync_send_all_state_event(
FsmRef, {http_put, Rid, Key, NewKey, Hold, Packet, ""})
end
end.
http_get(Sid,Rid) ->
case mnesia:dirty_read({http_bind, Sid}) of
[] ->
{error, not_exists};
[#http_bind{pid = FsmRef, wait = Wait, hold = Hold}] ->
gen_fsm:sync_send_all_state_event(FsmRef,
{http_get, Rid, Wait, Hold})
end.
handle_http_put(Sid, Rid, Key, NewKey, Wait, Hold, Attrs,
Packet, StreamStart) ->
case http_put(Sid, Rid, Key, NewKey, Hold, Packet, StreamStart) of
{error, not_exists} -> {error, not_exists} ->
?DEBUG("no session associated with sid: ~p", [Sid]), ?DEBUG("no session associated with sid: ~p", [Sid]),
{404, ?HEADER, ""}; {404, ?HEADER, ""};
{error, bad_key} -> {{error, Reason}, Sess} ->
?DEBUG("bad key: ~s", [Key]), handle_http_put_error(Reason, Sess);
case mnesia:dirty_read({http_bind, Sid}) of {{repeat, OutPacket}, Sess} ->
[] ->
{404, ?HEADER, ""};
[#http_bind{pid = FsmRef}] ->
gen_fsm:sync_send_all_state_event(FsmRef,stop),
{404, ?HEADER, ""}
end;
{error, polling_too_frequently} ->
?DEBUG("polling too frequently: ~p", [Sid]),
case mnesia:dirty_read({http_bind, Sid}) of
[] -> %% unlikely! (?)
{404, ?HEADER, ""};
[#http_bind{pid = FsmRef}] ->
gen_fsm:sync_send_all_state_event(FsmRef,stop),
{403, ?HEADER, ""}
end;
{repeat, OutPacket} ->
?DEBUG("http_put said 'repeat!' ...~nOutPacket: ~p", ?DEBUG("http_put said 'repeat!' ...~nOutPacket: ~p",
[OutPacket]), [OutPacket]),
send_outpacket(Sid, OutPacket); send_outpacket(Sess, OutPacket);
ok -> {ok, Sess} ->
receive_loop(Sid, Rid, Wait, Hold, Attrs, StreamStart) receive_loop(Sess, Rid, Attrs, StreamStart)
end.
http_put(Sid, Rid, Attrs, Payload, StreamStart) ->
?DEBUG("http-put",[]),
case mnesia:dirty_read({http_bind, Sid}) of
[] ->
{error, not_exists};
[#http_bind{pid = FsmRef, hold=Hold, to={To, StreamVersion}}=Sess] ->
NewStream =
case StreamStart of
true ->
{To, StreamVersion};
_ ->
""
end,
{gen_fsm:sync_send_all_state_event(
FsmRef, {http_put, Rid, Attrs, Payload, Hold, NewStream}), Sess}
end.
handle_http_put_error(Reason, #http_bind{pid=FsmRef, version=Version})
when Version >= 0 ->
gen_fsm:sync_send_all_state_event(FsmRef,stop),
case Reason of
not_exists ->
{200, ?HEADER,
xml:element_to_string(
{xmlelement, "body",
[{"xmlns", ?NS_HTTP_BIND},
{"type", "terminate"},
{"condition", "item-not-found"}], []})};
bad_key ->
{200, ?HEADER,
xml:element_to_string(
{xmlelement, "body",
[{"xmlns", ?NS_HTTP_BIND},
{"type", "terminate"},
{"condition", "item-not-found"}], []})};
polling_too_frequently ->
{200, ?HEADER,
xml:element_to_string(
{xmlelement, "body",
[{"xmlns", ?NS_HTTP_BIND},
{"type", "terminate"},
{"condition", "policy-violation"}], []})}
end;
handle_http_put_error(Reason, #http_bind{pid=FsmRef}) ->
gen_fsm:sync_send_all_state_event(FsmRef,stop),
case Reason of
not_exists -> %% bad rid
{404, ?HEADER, ""};
bad_key ->
{404, ?HEADER, ""};
polling_too_frequently ->
{403, ?HEADER, ""}
end. end.
receive_loop(Sid, Rid, Wait, Hold, Attrs, StreamStart) -> receive_loop(Sess, Rid, Attrs, StreamStart) ->
receive receive
after 100 -> ok after 100 -> ok
end, end,
prepare_response(Sid, Rid, Wait, Hold, Attrs, StreamStart). prepare_response(Sess, Rid, Attrs, StreamStart).
prepare_response(Sid, Rid, Wait, Hold, Attrs, StreamStart) -> prepare_response(#http_bind{id=Sid, wait=Wait, hold=Hold}=Sess,
case http_get(Sid, Rid) of Rid, Attrs, StreamStart) ->
case http_get(Sess, Rid) of
{error, not_exists} -> {error, not_exists} ->
case xml:get_attr_s("type", Attrs) of case xml:get_attr_s("type", Attrs) of
"terminate" -> "terminate" ->
@ -609,7 +618,7 @@ prepare_response(Sid, Rid, Wait, Hold, Attrs, StreamStart) ->
{404, ?HEADER, ""} {404, ?HEADER, ""}
end; end;
{ok, keep_on_hold} -> {ok, keep_on_hold} ->
receive_loop(Sid, Rid, Wait, Hold, Attrs, StreamStart); receive_loop(Sess, Rid, Attrs, StreamStart);
{ok, cancel} -> {ok, cancel} ->
%% actually it would be better if we could completely %% actually it would be better if we could completely
%% cancel this request, but then we would have to hack %% cancel this request, but then we would have to hack
@ -619,7 +628,7 @@ prepare_response(Sid, Rid, Wait, Hold, Attrs, StreamStart) ->
?DEBUG("OutPacket: ~s", [OutPacket]), ?DEBUG("OutPacket: ~s", [OutPacket]),
case StreamStart of case StreamStart of
false -> false ->
send_outpacket(Sid, OutPacket); send_outpacket(Sess, OutPacket);
true -> true ->
OutEls = OutEls =
case xml_stream:parse_element( case xml_stream:parse_element(
@ -679,8 +688,11 @@ prepare_response(Sid, Rid, Wait, Hold, Attrs, StreamStart) ->
{"wait", integer_to_list(Wait)}, {"wait", integer_to_list(Wait)},
{"requests", integer_to_list(Hold+1)}, {"requests", integer_to_list(Hold+1)},
{"inactivity", {"inactivity",
integer_to_list(trunc(?MAX_INACTIVITY/1000))}, integer_to_list(
{"polling", ?MIN_POLLING}, trunc(?MAX_INACTIVITY/1000))},
{"polling",
integer_to_list(
trunc(?MIN_POLLING/1000000))},
{"ver", ?BOSH_VERSION}, {"ver", ?BOSH_VERSION},
{"from", From}, {"from", From},
{"secure", "true"} %% we're always being secure {"secure", "true"} %% we're always being secure
@ -689,15 +701,16 @@ prepare_response(Sid, Rid, Wait, Hold, Attrs, StreamStart) ->
end end
end. end.
send_outpacket(Sid, OutPacket) -> http_get(#http_bind{pid = FsmRef, wait = Wait, hold = Hold}, Rid) ->
gen_fsm:sync_send_all_state_event(FsmRef,
{http_get, Rid, Wait, Hold}).
send_outpacket(#http_bind{pid = FsmRef}, OutPacket) ->
case OutPacket of case OutPacket of
"" -> "" ->
{200, ?HEADER, "<body xmlns='"++?NS_HTTP_BIND++"'/>"}; {200, ?HEADER, "<body xmlns='"++?NS_HTTP_BIND++"'/>"};
"</stream:stream>" -> "</stream:stream>" ->
case mnesia:dirty_read({http_bind, Sid}) of gen_fsm:sync_send_all_state_event(FsmRef,stop),
[#http_bind{pid = FsmRef}] ->
gen_fsm:sync_send_all_state_event(FsmRef,stop)
end,
{200, ?HEADER, "<body xmlns='"++?NS_HTTP_BIND++"'/>"}; {200, ?HEADER, "<body xmlns='"++?NS_HTTP_BIND++"'/>"};
_ -> _ ->
case xml_stream:parse_element("<body>" case xml_stream:parse_element("<body>"
@ -770,13 +783,8 @@ send_outpacket(Sid, OutPacket) ->
{error, _E} -> {error, _E} ->
null null
end, end,
case mnesia:dirty_read({http_bind, Sid}) of
[#http_bind{pid = FsmRef}] ->
gen_fsm:sync_send_all_state_event(FsmRef, gen_fsm:sync_send_all_state_event(FsmRef,
stop); stop),
_ ->
err %% hu?
end,
case StreamErrCond of case StreamErrCond of
null -> null ->
{200, ?HEADER, {200, ?HEADER,
@ -808,6 +816,17 @@ parse_request(Data) ->
case xml_stream:parse_element(Data) of case xml_stream:parse_element(Data) of
El when element(1, El) == xmlelement -> El when element(1, El) == xmlelement ->
{xmlelement, Name, Attrs, Els} = El, {xmlelement, Name, Attrs, Els} = El,
Xmlns = xml:get_attr_s("xmlns",Attrs),
if
Name /= "body" ->
{error, bad_request};
Xmlns /= ?NS_HTTP_BIND ->
{error, bad_request};
true ->
case list_to_integer(xml:get_attr_s("rid", Attrs)) of
{'EXIT', _} ->
{error, bad_request};
Rid ->
FixedEls = FixedEls =
lists:filter( lists:filter(
fun(I) -> fun(I) ->
@ -818,12 +837,8 @@ parse_request(Data) ->
false false
end end
end, Els), end, Els),
Sid = xml:get_attr_s("sid",Attrs), lists:map(
{Rid,_X} = string:to_integer(xml:get_attr_s("rid",Attrs)), fun(E) ->
Key = xml:get_attr_s("key",Attrs),
NewKey = xml:get_attr_s("newkey",Attrs),
Xmlns = xml:get_attr_s("xmlns",Attrs),
lists:map(fun(E) ->
EXmlns = xml:get_tag_attr_s("xmlns",E), EXmlns = xml:get_tag_attr_s("xmlns",E),
if if
EXmlns == ?NS_CLIENT -> EXmlns == ?NS_CLIENT ->
@ -832,14 +847,11 @@ parse_request(Data) ->
ok ok
end end
end, FixedEls), end, FixedEls),
Packet = [xml:element_to_string(E) || E <- FixedEls], Payload = [xml:element_to_string(E) ||
if E <- FixedEls],
Name /= "body" -> Sid = xml:get_attr_s("sid",Attrs),
{error, bad_request}; {ok, {Sid, Rid, Attrs, Payload}}
Xmlns /= ?NS_HTTP_BIND -> end
{error, bad_request};
true ->
{ok, {Sid, Rid, Key, NewKey, Attrs, Packet}}
end; end;
{error, _Reason} -> {error, _Reason} ->
{error, bad_request} {error, bad_request}