mirror of
https://github.com/processone/ejabberd.git
synced 2024-06-02 21:17:12 +02:00
* src/web/: Support for HTTP Polling (JEP-0025) (almost complete)
SVN Revision: 209
This commit is contained in:
parent
5696c848a6
commit
a0ae476619
|
@ -1,3 +1,7 @@
|
||||||
|
2004-03-06 Alexey Shchepin <alexey@sevcom.net>
|
||||||
|
|
||||||
|
* src/web/: Support for HTTP Polling (JEP-0025) (almost complete)
|
||||||
|
|
||||||
2004-03-04 Alexey Shchepin <alexey@sevcom.net>
|
2004-03-04 Alexey Shchepin <alexey@sevcom.net>
|
||||||
|
|
||||||
* src/web/: Updated
|
* src/web/: Updated
|
||||||
|
|
|
@ -95,6 +95,14 @@ init([]) ->
|
||||||
infinity,
|
infinity,
|
||||||
supervisor,
|
supervisor,
|
||||||
[ejabberd_tmp_sup]},
|
[ejabberd_tmp_sup]},
|
||||||
|
HTTPPollSupervisor =
|
||||||
|
{ejabberd_http_poll_sup,
|
||||||
|
{ejabberd_tmp_sup, start_link,
|
||||||
|
[ejabberd_http_poll_sup, ejabberd_http_poll]},
|
||||||
|
permanent,
|
||||||
|
infinity,
|
||||||
|
supervisor,
|
||||||
|
[ejabberd_tmp_sup]},
|
||||||
IQSupervisor =
|
IQSupervisor =
|
||||||
{ejabberd_iq_sup,
|
{ejabberd_iq_sup,
|
||||||
{ejabberd_tmp_sup, start_link,
|
{ejabberd_tmp_sup, start_link,
|
||||||
|
@ -111,6 +119,7 @@ init([]) ->
|
||||||
S2SOutSupervisor,
|
S2SOutSupervisor,
|
||||||
ServiceSupervisor,
|
ServiceSupervisor,
|
||||||
HTTPSupervisor,
|
HTTPSupervisor,
|
||||||
|
HTTPPollSupervisor,
|
||||||
IQSupervisor,
|
IQSupervisor,
|
||||||
Listener]}}.
|
Listener]}}.
|
||||||
|
|
||||||
|
|
|
@ -120,7 +120,12 @@ process_request(#state{request_method = 'GET',
|
||||||
El when element(1, El) == xmlelement ->
|
El when element(1, El) == xmlelement ->
|
||||||
make_xhtml_output(200, [], El);
|
make_xhtml_output(200, [], El);
|
||||||
{Status, Headers, El} ->
|
{Status, Headers, El} ->
|
||||||
make_xhtml_output(Status, Headers, El)
|
make_xhtml_output(Status, Headers, El);
|
||||||
|
Text when is_list(Text) ->
|
||||||
|
make_text_output(200, [], Text);
|
||||||
|
{Status, Headers, Text} when
|
||||||
|
is_list(Text) ->
|
||||||
|
make_text_output(Status, Headers, Text)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end;
|
end;
|
||||||
|
@ -174,8 +179,14 @@ process_request(#state{request_method = 'POST',
|
||||||
case ejabberd_web:process_get(Request) of
|
case ejabberd_web:process_get(Request) of
|
||||||
El when element(1, El) == xmlelement ->
|
El when element(1, El) == xmlelement ->
|
||||||
make_xhtml_output(200, [], El);
|
make_xhtml_output(200, [], El);
|
||||||
{Status, Headers, El} ->
|
{Status, Headers, El} when
|
||||||
make_xhtml_output(Status, Headers, El)
|
element(1, El) == xmlelement ->
|
||||||
|
make_xhtml_output(Status, Headers, El);
|
||||||
|
Text when is_list(Text) ->
|
||||||
|
make_text_output(200, [], Text);
|
||||||
|
{Status, Headers, Text} when
|
||||||
|
is_list(Text) ->
|
||||||
|
make_text_output(Status, Headers, Text)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end;
|
end;
|
||||||
|
@ -212,6 +223,17 @@ make_xhtml_output(Status, Headers, XHTML) ->
|
||||||
SL = ["HTTP/1.1 ", integer_to_list(Status), " ",
|
SL = ["HTTP/1.1 ", integer_to_list(Status), " ",
|
||||||
code_to_phrase(Status), "\r\n"],
|
code_to_phrase(Status), "\r\n"],
|
||||||
[SL, H, "\r\n", Data].
|
[SL, H, "\r\n", Data].
|
||||||
|
|
||||||
|
make_text_output(Status, Headers, Text) ->
|
||||||
|
Data = list_to_binary(Text),
|
||||||
|
Headers1 = [{"Content-Type", "text/html; charset=utf-8"},
|
||||||
|
{"Content-Length", integer_to_list(size(Data))} | Headers],
|
||||||
|
H = lists:map(fun({Attr, Val}) ->
|
||||||
|
[Attr, ": ", Val, "\r\n"]
|
||||||
|
end, Headers1),
|
||||||
|
SL = ["HTTP/1.1 ", integer_to_list(Status), " ",
|
||||||
|
code_to_phrase(Status), "\r\n"],
|
||||||
|
[SL, H, "\r\n", Data].
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
290
src/web/ejabberd_http_poll.erl
Normal file
290
src/web/ejabberd_http_poll.erl
Normal file
|
@ -0,0 +1,290 @@
|
||||||
|
%%%----------------------------------------------------------------------
|
||||||
|
%%% File : ejabberd_http_poll.erl
|
||||||
|
%%% Author : Alexey Shchepin <alexey@sevcom.net>
|
||||||
|
%%% Purpose : HTTP Polling support (JEP-0025)
|
||||||
|
%%% Created : 4 Mar 2004 by Alexey Shchepin <alexey@sevcom.net>
|
||||||
|
%%% Id : $Id$
|
||||||
|
%%%----------------------------------------------------------------------
|
||||||
|
|
||||||
|
-module(ejabberd_http_poll).
|
||||||
|
-author('alexey@sevcom.net').
|
||||||
|
-vsn('$Revision$ ').
|
||||||
|
|
||||||
|
%% External exports
|
||||||
|
-export([start_link/2,
|
||||||
|
init/1,
|
||||||
|
handle_event/3,
|
||||||
|
handle_sync_event/4,
|
||||||
|
code_change/4,
|
||||||
|
handle_info/3,
|
||||||
|
terminate/3,
|
||||||
|
send/2,
|
||||||
|
recv/3,
|
||||||
|
close/1,
|
||||||
|
process_request/1]).
|
||||||
|
|
||||||
|
-include("ejabberd.hrl").
|
||||||
|
-include("jlib.hrl").
|
||||||
|
-include("ejabberd_http.hrl").
|
||||||
|
|
||||||
|
-record(http_poll, {id, pid}).
|
||||||
|
|
||||||
|
-record(state, {id,
|
||||||
|
key,
|
||||||
|
output = "",
|
||||||
|
input = "",
|
||||||
|
waiting_input = false}).
|
||||||
|
|
||||||
|
%-define(DBGFSM, true).
|
||||||
|
|
||||||
|
-ifdef(DBGFSM).
|
||||||
|
-define(FSMOPTS, [{debug, [trace]}]).
|
||||||
|
-else.
|
||||||
|
-define(FSMOPTS, []).
|
||||||
|
-endif.
|
||||||
|
|
||||||
|
|
||||||
|
%%%----------------------------------------------------------------------
|
||||||
|
%%% API
|
||||||
|
%%%----------------------------------------------------------------------
|
||||||
|
start(ID, Key) ->
|
||||||
|
mnesia:create_table(http_poll,
|
||||||
|
[{ram_copies, [node()]},
|
||||||
|
{attributes, record_info(fields, http_poll)}]),
|
||||||
|
supervisor:start_child(ejabberd_http_poll_sup, [ID, Key]).
|
||||||
|
|
||||||
|
start_link(ID, Key) ->
|
||||||
|
gen_fsm:start_link(?MODULE, [ID, Key], ?FSMOPTS).
|
||||||
|
|
||||||
|
send({http_poll, FsmRef}, Packet) ->
|
||||||
|
gen_fsm:sync_send_all_state_event(FsmRef, {send, Packet}).
|
||||||
|
|
||||||
|
recv({http_poll, FsmRef}, _Length, Timeout) ->
|
||||||
|
gen_fsm:sync_send_all_state_event(FsmRef, recv, Timeout).
|
||||||
|
|
||||||
|
close({http_poll, FsmRef}) ->
|
||||||
|
gen_fsm:sync_send_all_state_event(FsmRef, close).
|
||||||
|
|
||||||
|
|
||||||
|
process_request(#request{path = [],
|
||||||
|
data = Data} = Request) ->
|
||||||
|
case catch parse_request(Data) of
|
||||||
|
{ok, ID1, Key, NewKey, Packet} ->
|
||||||
|
ID = case ID1 of
|
||||||
|
"0" ->
|
||||||
|
NewID = sha:sha(term_to_binary({now(), make_ref()})),
|
||||||
|
{ok, Pid} = start(NewID, ""),
|
||||||
|
mnesia:transaction(
|
||||||
|
fun() ->
|
||||||
|
mnesia:write(#http_poll{id = NewID,
|
||||||
|
pid = Pid})
|
||||||
|
end),
|
||||||
|
NewID;
|
||||||
|
_ ->
|
||||||
|
ID1
|
||||||
|
end,
|
||||||
|
case http_put(ID, Key, NewKey, Packet) of
|
||||||
|
{error, not_exists} ->
|
||||||
|
{200, [{"Set-Cookie", "ID=-3:0; expires=-1"}], ""};
|
||||||
|
{error, bad_key} ->
|
||||||
|
{200, [{"Set-Cookie", "ID=-3:0; expires=-1"}], ""};
|
||||||
|
ok ->
|
||||||
|
receive
|
||||||
|
after 100 -> ok
|
||||||
|
end,
|
||||||
|
case http_get(ID) of
|
||||||
|
{error, not_exists} ->
|
||||||
|
{200, [{"Set-Cookie", "ID=-3:0; expires=-1"}], ""};
|
||||||
|
{ok, OutPacket} ->
|
||||||
|
Cookie = "ID=" ++ ID ++ "; expires=-1",
|
||||||
|
{200, [{"Set-Cookie", Cookie}], OutPacket}
|
||||||
|
end
|
||||||
|
end;
|
||||||
|
_ ->
|
||||||
|
{200, [{"Set-Cookie", "ID=-2:0; expires=-1"}], ""}
|
||||||
|
end.
|
||||||
|
|
||||||
|
|
||||||
|
%%%----------------------------------------------------------------------
|
||||||
|
%%% Callback functions from gen_fsm
|
||||||
|
%%%----------------------------------------------------------------------
|
||||||
|
|
||||||
|
%%----------------------------------------------------------------------
|
||||||
|
%% Func: init/1
|
||||||
|
%% Returns: {ok, StateName, StateData} |
|
||||||
|
%% {ok, StateName, StateData, Timeout} |
|
||||||
|
%% ignore |
|
||||||
|
%% {stop, StopReason}
|
||||||
|
%%----------------------------------------------------------------------
|
||||||
|
init([ID, Key]) ->
|
||||||
|
?INFO_MSG("started: ~p", [{ID, Key}]),
|
||||||
|
Opts = [], % TODO
|
||||||
|
ejabberd_c2s:start({?MODULE, {http_poll, self()}}, Opts),
|
||||||
|
{ok, loop, #state{id = ID, key = Key}}.
|
||||||
|
|
||||||
|
%%----------------------------------------------------------------------
|
||||||
|
%% Func: StateName/2
|
||||||
|
%% Returns: {next_state, NextStateName, NextStateData} |
|
||||||
|
%% {next_state, NextStateName, NextStateData, Timeout} |
|
||||||
|
%% {stop, Reason, NewStateData}
|
||||||
|
%%----------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
%%----------------------------------------------------------------------
|
||||||
|
%% Func: StateName/3
|
||||||
|
%% Returns: {next_state, NextStateName, NextStateData} |
|
||||||
|
%% {next_state, NextStateName, NextStateData, Timeout} |
|
||||||
|
%% {reply, Reply, NextStateName, NextStateData} |
|
||||||
|
%% {reply, Reply, NextStateName, NextStateData, Timeout} |
|
||||||
|
%% {stop, Reason, NewStateData} |
|
||||||
|
%% {stop, Reason, Reply, NewStateData}
|
||||||
|
%%----------------------------------------------------------------------
|
||||||
|
%state_name(Event, From, StateData) ->
|
||||||
|
% Reply = ok,
|
||||||
|
% {reply, Reply, state_name, StateData}.
|
||||||
|
|
||||||
|
%%----------------------------------------------------------------------
|
||||||
|
%% Func: handle_event/3
|
||||||
|
%% Returns: {next_state, NextStateName, NextStateData} |
|
||||||
|
%% {next_state, NextStateName, NextStateData, Timeout} |
|
||||||
|
%% {stop, Reason, NewStateData}
|
||||||
|
%%----------------------------------------------------------------------
|
||||||
|
handle_event(Event, StateName, StateData) ->
|
||||||
|
{next_state, StateName, StateData}.
|
||||||
|
|
||||||
|
%%----------------------------------------------------------------------
|
||||||
|
%% Func: handle_sync_event/4
|
||||||
|
%% Returns: {next_state, NextStateName, NextStateData} |
|
||||||
|
%% {next_state, NextStateName, NextStateData, Timeout} |
|
||||||
|
%% {reply, Reply, NextStateName, NextStateData} |
|
||||||
|
%% {reply, Reply, NextStateName, NextStateData, Timeout} |
|
||||||
|
%% {stop, Reason, NewStateData} |
|
||||||
|
%% {stop, Reason, Reply, NewStateData}
|
||||||
|
%%----------------------------------------------------------------------
|
||||||
|
handle_sync_event({send, Packet}, From, StateName, StateData) ->
|
||||||
|
Output = [StateData#state.output | Packet],
|
||||||
|
Reply = ok,
|
||||||
|
{reply, Reply, StateName, StateData#state{output = Output}};
|
||||||
|
|
||||||
|
handle_sync_event(recv, From, StateName, StateData) ->
|
||||||
|
case StateData#state.input of
|
||||||
|
"" ->
|
||||||
|
{next_state, StateName, StateData#state{waiting_input = From}};
|
||||||
|
Input ->
|
||||||
|
Reply = {ok, list_to_binary(Input)},
|
||||||
|
{reply, Reply, StateName, StateData#state{input = "",
|
||||||
|
waiting_input = false}}
|
||||||
|
end;
|
||||||
|
|
||||||
|
handle_sync_event({http_put, Key, NewKey, Packet},
|
||||||
|
From, StateName, StateData) ->
|
||||||
|
Allow = case StateData#state.key of
|
||||||
|
"" ->
|
||||||
|
true;
|
||||||
|
OldKey ->
|
||||||
|
NextKey = jlib:encode_base64(
|
||||||
|
binary_to_list(crypto:sha(Key))),
|
||||||
|
if
|
||||||
|
OldKey == NextKey ->
|
||||||
|
true;
|
||||||
|
true ->
|
||||||
|
false
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
if
|
||||||
|
Allow ->
|
||||||
|
case StateData#state.waiting_input of
|
||||||
|
false ->
|
||||||
|
Input = [StateData#state.input | Packet],
|
||||||
|
Reply = ok,
|
||||||
|
{reply, Reply, StateName, StateData#state{input = Input,
|
||||||
|
key = NewKey}};
|
||||||
|
Receiver ->
|
||||||
|
gen_fsm:reply(Receiver, {ok, list_to_binary(Packet)}),
|
||||||
|
Reply = ok,
|
||||||
|
{reply, Reply, StateName,
|
||||||
|
StateData#state{waiting_input = false,
|
||||||
|
key = NewKey}}
|
||||||
|
end;
|
||||||
|
true ->
|
||||||
|
Reply = {error, bad_key},
|
||||||
|
{reply, Reply, StateName, StateData}
|
||||||
|
end;
|
||||||
|
|
||||||
|
handle_sync_event(http_get, From, StateName, StateData) ->
|
||||||
|
Reply = {ok, StateData#state.output},
|
||||||
|
{reply, Reply, StateName, StateData#state{output = ""}};
|
||||||
|
|
||||||
|
handle_sync_event(Event, From, StateName, StateData) ->
|
||||||
|
Reply = ok,
|
||||||
|
{reply, Reply, StateName, StateData}.
|
||||||
|
|
||||||
|
code_change(OldVsn, StateName, StateData, Extra) ->
|
||||||
|
{ok, StateName, StateData}.
|
||||||
|
|
||||||
|
%%----------------------------------------------------------------------
|
||||||
|
%% Func: handle_info/3
|
||||||
|
%% Returns: {next_state, NextStateName, NextStateData} |
|
||||||
|
%% {next_state, NextStateName, NextStateData, Timeout} |
|
||||||
|
%% {stop, Reason, NewStateData}
|
||||||
|
%%----------------------------------------------------------------------
|
||||||
|
handle_info(_, StateName, StateData) ->
|
||||||
|
{next_state, StateName, StateData}.
|
||||||
|
|
||||||
|
%%----------------------------------------------------------------------
|
||||||
|
%% Func: terminate/3
|
||||||
|
%% Purpose: Shutdown the fsm
|
||||||
|
%% Returns: any
|
||||||
|
%%----------------------------------------------------------------------
|
||||||
|
terminate(Reason, StateName, StateData) ->
|
||||||
|
mnesia:transaction(
|
||||||
|
fun() ->
|
||||||
|
mnesia:delete({http_poll, StateData#state.id})
|
||||||
|
end),
|
||||||
|
case StateData#state.waiting_input of
|
||||||
|
false ->
|
||||||
|
ok;
|
||||||
|
Receiver ->
|
||||||
|
gen_fsm:reply(Receiver, {error, closed})
|
||||||
|
end,
|
||||||
|
ok.
|
||||||
|
|
||||||
|
%%%----------------------------------------------------------------------
|
||||||
|
%%% Internal functions
|
||||||
|
%%%----------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
http_put(ID, Key, NewKey, Packet) ->
|
||||||
|
case mnesia:dirty_read({http_poll, ID}) of
|
||||||
|
[] ->
|
||||||
|
{error, not_exists};
|
||||||
|
[#http_poll{pid = FsmRef}] ->
|
||||||
|
gen_fsm:sync_send_all_state_event(
|
||||||
|
FsmRef, {http_put, Key, NewKey, Packet})
|
||||||
|
end.
|
||||||
|
|
||||||
|
http_get(ID) ->
|
||||||
|
case mnesia:dirty_read({http_poll, ID}) of
|
||||||
|
[] ->
|
||||||
|
{error, not_exists};
|
||||||
|
[#http_poll{pid = FsmRef}] ->
|
||||||
|
gen_fsm:sync_send_all_state_event(FsmRef, http_get)
|
||||||
|
end.
|
||||||
|
|
||||||
|
|
||||||
|
parse_request(Data) ->
|
||||||
|
Comma = string:chr(Data, $,),
|
||||||
|
Header = lists:sublist(Data, Comma - 1),
|
||||||
|
Packet = lists:nthtail(Comma, Data),
|
||||||
|
{ID, Key, NewKey} =
|
||||||
|
case string:tokens(Header, ";") of
|
||||||
|
[ID1] ->
|
||||||
|
{ID1, "", ""};
|
||||||
|
[ID1, Key1] ->
|
||||||
|
{ID1, Key1, Key1};
|
||||||
|
[ID1, Key1, NewKey1] ->
|
||||||
|
{ID1, Key1, NewKey1}
|
||||||
|
end,
|
||||||
|
{ok, ID, Key, NewKey, Packet}.
|
||||||
|
|
||||||
|
|
|
@ -65,6 +65,12 @@ process_get(#request{user = User,
|
||||||
[{xmlcdata, "401 Unauthorized"}]}])}
|
[{xmlcdata, "401 Unauthorized"}]}])}
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
process_get(#request{user = User,
|
||||||
|
path = ["http-poll" | RPath],
|
||||||
|
q = Query,
|
||||||
|
lang = Lang} = Request) ->
|
||||||
|
ejabberd_http_poll:process_request(Request#request{path = RPath});
|
||||||
|
|
||||||
process_get(_Request) ->
|
process_get(_Request) ->
|
||||||
{404, [], make_xhtml([?XC("h1", "Not found")])}.
|
{404, [], make_xhtml([?XC("h1", "Not found")])}.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user