Scrub port from x-forwarded-for

pull/1104/head
Uku Taht 6 years ago
parent ad6faece87
commit fa60ebd6b0

@ -12,6 +12,7 @@ defmodule PlausibleWeb.RemoteIp do
String.split(forwarded_for, ",")
|> Enum.map(&String.trim/1)
|> List.first()
|> remove_port
forwarded ->
Regex.named_captures(~r/for=(?<for>[^;,]+).*$/, forwarded)
@ -25,4 +26,9 @@ defmodule PlausibleWeb.RemoteIp do
to_string(:inet_parse.ntoa(conn.remote_ip))
end
end
defp remove_port(ip) do
String.split(ip, ":")
|> List.first()
end
end

@ -488,6 +488,22 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
assert pageview.country_code == "US"
end
test "scrubs port from x-forwarded-for", %{conn: conn} do
params = %{
name: "pageview",
domain: "external-controller-test-x-forwarded-for-port.com",
url: "http://gigride.live/"
}
conn
|> put_req_header("x-forwarded-for", "1.1.1.1:123")
|> post("/api/event", params)
pageview = get_event("external-controller-test-x-forwarded-for-port.com")
assert pageview.country_code == "US"
end
test "uses cloudflare's special header for client IP address if present", %{conn: conn} do
params = %{
name: "pageview",

Loading…
Cancel
Save