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

Malformed CAPTCHA response may crash a room. This is now fixed. (thanks to Evgeniy Khramtsov)

Browse Source 
SVN Revision: 2150
This commit is contained in:
Badlop 2009-06-09 09:39:07 +00:00
parent a45e6da3d0
commit dd101c99e5
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/ejabberd_captcha.erl
View File

@ -150,30 +150,36 @@ check_captcha(Id, ProvidedKey) ->
process_reply(El) -> process_reply(El) ->
case {exmpp_xml:element_matches(El, captcha), case {exmpp_xml:element_matches(El, captcha),
exmpp_xml:get_element(El, x)} of exmpp_xml:get_element(El, x)} of
{false, _} -> {false, _} ->
{error, malformed}; {error, malformed};
{_, undefined} -> {_, undefined} ->
{error, malformed}; {error, malformed};
{true, Xdata} -> {true, Xdata} ->
Fields = jlib:parse_xdata_submit(Xdata), Fields = jlib:parse_xdata_submit(Xdata),
[Id | _] = proplists:get_value("challenge", Fields, [none]), case {proplists:get_value("challenge", Fields),
[OCR | _] = proplists:get_value("ocr", Fields, [none]), proplists:get_value("ocr", Fields)} of
?T(case mnesia:read(captcha, Id, write) of {[Id|_], [OCR|_]} ->
[#captcha{pid=Pid, args=Args, key=Key, tref=Tref}] -> ?T(case mnesia:read(captcha, Id, write) of
mnesia:delete({captcha, Id}), [#captcha{pid=Pid, args=Args, key=Key, tref=Tref}] ->
erlang:cancel_timer(Tref), mnesia:delete({captcha, Id}),
if OCR == Key -> erlang:cancel_timer(Tref),
Pid ! {captcha_succeed, Args}, if OCR == Key ->
ok; Pid ! {captcha_succeed, Args},
true -> ok;
Pid ! {captcha_failed, Args}, true ->
{error, bad_match} Pid ! {captcha_failed, Args},
end; {error, bad_match}
_ -> end;
{error, not_found} _ ->
end) {error, not_found}
end. end);
_ ->
{error, malformed}
end
end;
process_reply(_) ->
{error, malformed}.
process(_Handlers, #request{method='GET', lang=Lang, path=[_, Id]}) -> process(_Handlers, #request{method='GET', lang=Lang, path=[_, Id]}) ->