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

Update mod_rest as xml_stream:parse_element requires binary (#138)

This commit is contained in:
Badlop 2015-12-29 13:25:04 +01:00
parent ecf8db140d
commit 0d2fa84c8a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mod_rest/src/mod_rest.erl
View File

@ -49,7 +49,7 @@ process([], #request{method = 'POST', data = Data, host = Host, ip = ClientIp})
try try
{ClientAddress, _PortNumber} = ClientIp, {ClientAddress, _PortNumber} = ClientIp,
check_member_option(Host, ClientAddress, allowed_ips), check_member_option(Host, ClientAddress, allowed_ips),
maybe_post_request(binary_to_list(Data), Host, ClientIp) maybe_post_request(Data, Host, ClientIp)
catch catch
error:{badmatch, _} = Error -> error:{badmatch, _} = Error ->
?DEBUG("Error when processing REST request: ~nData: ~p~nError: ~p", [Data, Error]), ?DEBUG("Error when processing REST request: ~nData: ~p~nError: ~p", [Data, Error]),
@ -62,7 +62,7 @@ process(Path, Request) ->
%% If the first character of Data is <, it is considered a stanza to deliver. %% If the first character of Data is <, it is considered a stanza to deliver.
%% Otherwise, it is considered an ejabberd command to execute. %% Otherwise, it is considered an ejabberd command to execute.
maybe_post_request([$< | _ ] = Data, Host, ClientIp) -> maybe_post_request(<<$<,_/binary>> = Data, Host, ClientIp) ->
try try
Stanza = {xmlel, _, _, _} = xml_stream:parse_element(Data), Stanza = {xmlel, _, _, _} = xml_stream:parse_element(Data),
From = jlib:string_to_jid(xml:get_tag_attr_s(<<"from">>, Stanza)), From = jlib:string_to_jid(xml:get_tag_attr_s(<<"from">>, Stanza)),
@ -87,7 +87,7 @@ maybe_post_request([$< | _ ] = Data, Host, ClientIp) ->
end; end;
maybe_post_request(Data, Host, _ClientIp) -> maybe_post_request(Data, Host, _ClientIp) ->
?INFO_MSG("Data: ~p", [Data]), ?INFO_MSG("Data: ~p", [Data]),
Args = split_line(Data), Args = split_line(binary_to_list(Data)),
AccessCommands = get_option_access(Host), AccessCommands = get_option_access(Host),
case ejabberd_ctl:process2(Args, AccessCommands) of case ejabberd_ctl:process2(Args, AccessCommands) of
{"", ?STATUS_SUCCESS} -> {"", ?STATUS_SUCCESS} ->