Skip to content

fix: normalize application HTTP statuses #1046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NickJ202 wants to merge 1 commit into
base: edge
Choose a base branch
from
+19 −6
Open

fix: normalize application HTTP statuses #1046

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions src/core/http/hb_http.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,14 +481,10 @@ prepare_request(Format, Method, Peer, Path, RawMessage, Opts) ->

%% @doc Reply to the client's HTTP request with a message.
reply(Req, TABMReq, Message, Opts) ->
Status =
case hb_maps:get(<<"status">>, Message, not_found, Opts) of
not_found -> 200;
S-> S
end,
Status = http_status(hb_maps:get(<<"status">>, Message, not_found, Opts)),
reply(Req, TABMReq, Status, Message, Opts).
reply(Req, TABMReq, BinStatus, RawMessage, Opts) when is_binary(BinStatus) ->
reply(Req, TABMReq, binary_to_integer(BinStatus), RawMessage, Opts);
reply(Req, TABMReq, http_status(BinStatus), RawMessage, Opts);
reply(InitReq, TABMReq, RawStatus, RawMessage, Opts) ->
ReplyStartTime = os:system_time(millisecond),
KeyNormMessage = hb_ao:normalize_keys(RawMessage, Opts),
Expand Down Expand Up @@ -561,6 +557,17 @@ reply(InitReq, TABMReq, RawStatus, RawMessage, Opts) ->
),
{ok, PostStreamReq, no_state}.

%% @doc Interpret a message's `status' as an HTTP status only when it is a
%% valid status code. Devices may also use this field for application-level
%% statuses such as `ok', which should be returned with HTTP 200.
http_status(not_found) -> 200;
http_status(Status) when is_integer(Status), Status >= 100, Status =< 599 -> Status;
http_status(Status) when is_binary(Status) ->
try http_status(binary_to_integer(Status))
catch error:badarg -> 200
end;
http_status(_Status) -> 200.

%% @doc Determine if the stream should be finalized.
should_finalize_stream(429, _EncodedBody) -> true;
should_finalize_stream(_, _EncodedBody) -> false.
Expand Down Expand Up @@ -1235,6 +1242,12 @@ simple_ao_resolve_signed_test() ->
),
?assertEqual(<<"Value1">>, Res).

http_status_test() ->
?assertEqual(200, http_status(<<"ok">>)),
?assertEqual(200, http_status(not_found)),
?assertEqual(200, http_status(<<"200">>)),
?assertEqual(404, http_status(404)).

paranoid_http_result_test() ->
% The `http_result' topic verifies each response at the reply boundary (in
% `encode_reply', before wire conversion): a validly committed result
Expand Down