root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #28 from rabbitmq/rabbitmq-web-dispatch-27 

Ensure that cowboy_req:peer return values will not crash
This commit is contained in:
Michael Klishin 2017-07-20 01:36:18 +03:00 committed by GitHub
parent 05d3eb0912 58cf964936
commit dd2e55b51d
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
deps/rabbitmq_web_dispatch/src/webmachine_log_handler.erl vendored
View File

@ -86,20 +86,25 @@ code_change(_OldVsn, State, _Extra) ->
%% since we are now using Cowboy, a few small parts had to change.
%% This is one such part. The code is however equivalent to Webmachine's.
format_req({Status0, Body, Req}) ->
format_req({Status0, Body, Req0}) ->
User = "-",
Time = webmachine_log:fmtnow(),
Status = integer_to_list(Status0),
Length = integer_to_list(iolist_size(Body)),
{Method, _} = cowboy_req:method(Req),
{Path, _} = cowboy_req:path(Req),
{{Peer, _}, _} = cowboy_req:peer(Req),
Version = case cowboy_req:version(Req) of
{Method, Req1} = cowboy_req:method(Req0),
{Path, Req2} = cowboy_req:path(Req1),
{Peer, Req3} = case cowboy_req:peer(Req2) of
{{Peer0, _Port}, R} ->
{Peer0, R};
{Other, R} ->
{Other, R}
end,
Version = case cowboy_req:version(Req3) of
{'HTTP/1.1', _} -> {1, 1};
{'HTTP/1.0', _} -> {1, 0}
end,
{Referer, _} = cowboy_req:header(<<"referer">>, Req, <<>>),
{UserAgent, _} = cowboy_req:header(<<"user-agent">>, Req, <<>>),
{Referer, Req4} = cowboy_req:header(<<"referer">>, Req3, <<>>),
{UserAgent, _Req5} = cowboy_req:header(<<"user-agent">>, Req4, <<>>),
fmt_alog(Time, Peer, User, Method, Path, Version,
Status, Length, Referer, UserAgent).