jacob.eva/ejabberd-contrib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mod_http_upload: Support XEP-0363 namespace

Browse Source
This commit is contained in:
Holger Weiss 2015-08-27 23:40:26 +02:00
parent 06def469a4
commit 19044ccb85
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mod_http_upload/src/mod_http_upload.erl
View File

@ -9,7 +9,8 @@
-author('holger@zedat.fu-berlin.de'). -author('holger@zedat.fu-berlin.de').
-define(GEN_SERVER, gen_server). -define(GEN_SERVER, gen_server).
-define(NS_UPLOAD, <<"eu:siacs:conversations:http:upload">>). -define(NS_HTTP_UPLOAD, <<"urn:xmpp:http:upload">>).
-define(NS_HTTP_UPLOAD_OLD, <<"eu:siacs:conversations:http:upload">>).
-define(SERVICE_REQUEST_TIMEOUT, 5000). % 5 seconds. -define(SERVICE_REQUEST_TIMEOUT, 5000). % 5 seconds.
-define(SLOT_TIMEOUT, 600000). % 10 minutes. -define(SLOT_TIMEOUT, 600000). % 10 minutes.
-define(PROCNAME, ?MODULE). -define(PROCNAME, ?MODULE).
@ -411,9 +412,10 @@ process_iq(_From,
attrs = [{<<"xmlns">>, ?NS_DISCO_INFO}], attrs = [{<<"xmlns">>, ?NS_DISCO_INFO}],
children = iq_disco_info(Lang, Name) ++ AddInfo}]}; children = iq_disco_info(Lang, Name) ++ AddInfo}]};
process_iq(#jid{luser = LUser, lserver = LServer} = From, process_iq(#jid{luser = LUser, lserver = LServer} = From,
#iq{type = get, xmlns = ?NS_UPLOAD, lang = Lang, #iq{type = get, xmlns = XMLNS, lang = Lang, sub_el = SubEl} = IQ,
sub_el = SubEl} = IQ, #state{server_host = ServerHost, access = Access} = State)
#state{server_host = ServerHost, access = Access} = State) -> when XMLNS == ?NS_HTTP_UPLOAD;
XMLNS == ?NS_HTTP_UPLOAD_OLD ->
User = <<LUser/binary, $@, LServer/binary>>, User = <<LUser/binary, $@, LServer/binary>>,
case acl:match_rule(ServerHost, Access, From) of case acl:match_rule(ServerHost, Access, From) of
allow -> allow ->
@ -424,10 +426,11 @@ process_iq(#jid{luser = LUser, lserver = LServer} = From,
{ok, Timer} = timer:send_after(?SLOT_TIMEOUT, {ok, Timer} = timer:send_after(?SLOT_TIMEOUT,
{slot_timed_out, Slot}), {slot_timed_out, Slot}),
NewState = add_slot(Slot, Size, Timer, State), NewState = add_slot(Slot, Size, Timer, State),
{IQ#iq{type = result, sub_el = [slot_el(Slot, State)]}, SlotEl = slot_el(Slot, State, XMLNS),
NewState}; {IQ#iq{type = result, sub_el = [SlotEl]}, NewState};
{ok, PutURL, GetURL} -> {ok, PutURL, GetURL} ->
IQ#iq{type = result, sub_el = [slot_el(PutURL, GetURL)]}; SlotEl = slot_el(PutURL, GetURL, XMLNS),
IQ#iq{type = result, sub_el = [SlotEl]};
{error, Error} -> {error, Error} ->
IQ#iq{type = error, sub_el = [SubEl, Error]} IQ#iq{type = error, sub_el = [SubEl, Error]}
end; end;
@ -451,7 +454,8 @@ process_iq(_From, invalid, _State) ->
parse_request(#xmlel{name = <<"request">>, attrs = Attrs} = Request, Lang) -> parse_request(#xmlel{name = <<"request">>, attrs = Attrs} = Request, Lang) ->
case xml:get_attr(<<"xmlns">>, Attrs) of case xml:get_attr(<<"xmlns">>, Attrs) of
{value, ?NS_UPLOAD} -> {value, XMLNS} when XMLNS == ?NS_HTTP_UPLOAD;
XMLNS == ?NS_HTTP_UPLOAD_OLD ->
case {xml:get_subtag_cdata(Request, <<"filename">>), case {xml:get_subtag_cdata(Request, <<"filename">>),
xml:get_subtag_cdata(Request, <<"size">>), xml:get_subtag_cdata(Request, <<"size">>),
xml:get_subtag_cdata(Request, <<"content-type">>)} of xml:get_subtag_cdata(Request, <<"content-type">>)} of
@ -551,15 +555,15 @@ del_slot(Slot, #state{slots = Slots} = State) ->
NewSlots = dict:erase(Slot, Slots), NewSlots = dict:erase(Slot, Slots),
State#state{slots = NewSlots}. State#state{slots = NewSlots}.
-spec slot_el(slot() | binary(), state() | binary()) -> xmlel(). -spec slot_el(slot() | binary(), state() | binary(), binary()) -> xmlel().
slot_el(Slot, #state{put_url = PutPrefix, get_url = GetPrefix}) -> slot_el(Slot, #state{put_url = PutPrefix, get_url = GetPrefix}, XMLNS) ->
PutURL = str:join([PutPrefix | Slot], <<$/>>), PutURL = str:join([PutPrefix | Slot], <<$/>>),
GetURL = str:join([GetPrefix | Slot], <<$/>>), GetURL = str:join([GetPrefix | Slot], <<$/>>),
slot_el(PutURL, GetURL); slot_el(PutURL, GetURL, XMLNS);
slot_el(PutURL, GetURL) -> slot_el(PutURL, GetURL, XMLNS) ->
#xmlel{name = <<"slot">>, #xmlel{name = <<"slot">>,
attrs = [{<<"xmlns">>, ?NS_UPLOAD}], attrs = [{<<"xmlns">>, XMLNS}],
children = [#xmlel{name = <<"put">>, children = [#xmlel{name = <<"put">>,
children = [{xmlcdata, PutURL}]}, children = [{xmlcdata, PutURL}]},
#xmlel{name = <<"get">>, #xmlel{name = <<"get">>,
@ -625,7 +629,9 @@ iq_disco_info(Lang, Name) ->
{<<"type">>, <<"file">>}, {<<"type">>, <<"file">>},
{<<"name">>, translate:translate(Lang, Name)}]}, {<<"name">>, translate:translate(Lang, Name)}]},
#xmlel{name = <<"feature">>, #xmlel{name = <<"feature">>,
attrs = [{<<"var">>, ?NS_UPLOAD}]}]. attrs = [{<<"var">>, ?NS_HTTP_UPLOAD}]},
#xmlel{name = <<"feature">>,
attrs = [{<<"var">>, ?NS_HTTP_UPLOAD_OLD}]}].
%% HTTP request handling. %% HTTP request handling.