Skip to content

Avoid an error when formatting remote data #326

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

Merged
merged 1 commit into from
Jan 31, 2019
Merged

Avoid an error when formatting remote data #326

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
20 changes: 18 additions & 2 deletions lib/sentry/plug.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,18 +171,34 @@ if Code.ensure_loaded?(Plug) do
headers: handle_data(conn, header_scrubber),
env: %{
"REMOTE_ADDR" => remote_address(conn.remote_ip),
"REMOTE_PORT" => Plug.Conn.get_peer_data(conn).port,
"REMOTE_PORT" => remote_port(conn),
"SERVER_NAME" => conn.host,
"SERVER_PORT" => conn.port,
"REQUEST_ID" => Plug.Conn.get_resp_header(conn, request_id) |> List.first()
}
}
end

defp remote_port(conn) do
case Plug.Conn.get_peer_data(conn) do
%{port: port} ->
port

_ ->
""
end
end

defp remote_address(address) do
address
|> :inet.ntoa()
|> to_string()
|> case do
{:error, _} ->
""

address ->
to_string(address)
end
end

defp handle_data(_conn, nil), do: %{}
Expand Down