0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-14 12:20:24 +00:00

Improve how we detect request errors

When the request process exits with a {request_error, Reason, Human}
exit reason, Cowboy will return a 400 status code instead of 500.
Cowboy may also return a more specific status code depending on
the error. Currently it may also return 408 or 413.

This should prove to be more solid that looking inside the stack
trace.
This commit is contained in:
Loïc Hoguin 2017-09-14 13:42:17 +02:00
parent 15ceaf1edf
commit 3cbf885961
No known key found for this signature in database
GPG key ID: 71366FF21851DF03
4 changed files with 139 additions and 32 deletions

View file

@ -184,7 +184,13 @@ qs(#{qs := Qs}) ->
%% @todo Might be useful to limit the number of keys.
-spec parse_qs(req()) -> [{binary(), binary() | true}].
parse_qs(#{qs := Qs}) ->
cow_qs:parse_qs(Qs).
try
cow_qs:parse_qs(Qs)
catch _:_ ->
erlang:raise(exit, {request_error, qs,
'Malformed query string; application/x-www-form-urlencoded expected.'
}, erlang:get_stacktrace())
end.
-spec match_qs(cowboy:fields(), req()) -> map().
match_qs(Fields, Req) ->
@ -353,15 +359,21 @@ headers(#{headers := Headers}) ->
-spec parse_header(binary(), Req) -> any() when Req::req().
parse_header(Name = <<"content-length">>, Req) ->
parse_header(Name, Req, 0, fun cow_http_hd:parse_content_length/1);
parse_header(Name, Req, 0);
parse_header(Name = <<"cookie">>, Req) ->
parse_header(Name, Req, [], fun cow_cookie:parse_cookie/1);
parse_header(Name, Req, []);
parse_header(Name, Req) ->
parse_header(Name, Req, undefined).
-spec parse_header(binary(), Req, any()) -> any() when Req::req().
parse_header(Name, Req, Default) ->
parse_header(Name, Req, Default, parse_header_fun(Name)).
try
parse_header(Name, Req, Default, parse_header_fun(Name))
catch _:_ ->
erlang:raise(exit, {request_error, {header, Name},
'Malformed header. Please consult the relevant specification.'
}, erlang:get_stacktrace())
end.
parse_header_fun(<<"accept">>) -> fun cow_http_hd:parse_accept/1;
parse_header_fun(<<"accept-charset">>) -> fun cow_http_hd:parse_accept_charset/1;
@ -447,8 +459,26 @@ read_urlencoded_body(Req) ->
-spec read_urlencoded_body(Req, read_body_opts()) -> {ok, [{binary(), binary() | true}], Req} when Req::req().
read_urlencoded_body(Req0, Opts) ->
{ok, Body, Req} = read_body(Req0, Opts),
{ok, cow_qs:parse_qs(Body), Req}.
case read_body(Req0, Opts) of
{ok, Body, Req} ->
try
{ok, cow_qs:parse_qs(Body), Req}
catch _:_ ->
erlang:raise(exit, {request_error, urlencoded_body,
'Malformed body; application/x-www-form-urlencoded expected.'
}, erlang:get_stacktrace())
end;
{more, Body, _} ->
Length = maps:get(length, Opts, 64000),
if
byte_size(Body) < Length ->
exit({request_error, timeout,
'The request body was not received within the configured time.'});
true ->
exit({request_error, payload_too_large,
'The request body is larger than allowed by configuration.'})
end
end.
%% Multipart.
@ -471,7 +501,7 @@ read_part(Req, Opts) ->
end.
read_part(Buffer, Opts, Req=#{multipart := {Boundary, _}}) ->
case cow_multipart:parse_headers(Buffer, Boundary) of
try cow_multipart:parse_headers(Buffer, Boundary) of
more ->
{Data, Req2} = stream_multipart(Req, Opts),
read_part(<< Buffer/binary, Data/binary >>, Opts, Req2);
@ -486,6 +516,10 @@ read_part(Buffer, Opts, Req=#{multipart := {Boundary, _}}) ->
%% Ignore epilogue.
{done, _} ->
{done, Req#{multipart => done}}
catch _:_ ->
erlang:raise(exit, {request_error, {multipart, headers},
'Malformed body; multipart expected.'
}, erlang:get_stacktrace())
end.
-spec read_part_body(Req)
@ -529,8 +563,13 @@ read_part_body(Buffer, Opts, Req=#{multipart := {Boundary, _}}, Acc) ->
init_multipart(Req) ->
{<<"multipart">>, _, Params} = parse_header(<<"content-type">>, Req),
{_, Boundary} = lists:keyfind(<<"boundary">>, 1, Params),
Req#{multipart => {Boundary, <<>>}}.
case lists:keyfind(<<"boundary">>, 1, Params) of
{_, Boundary} ->
Req#{multipart => {Boundary, <<>>}};
false ->
exit({request_error, {multipart, boundary},
'Missing boundary parameter for multipart media type.'})
end.
stream_multipart(Req=#{multipart := done}, _) ->
{<<>>, Req};