From fa60ebd6b0a91afe6a02e34736a8f4ee641174ab Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 2 Jun 2021 15:30:25 +0300 Subject: [PATCH] Scrub port from x-forwarded-for --- lib/plausible_web/remote_ip.ex | 6 ++++++ .../controllers/api/external_controller_test.exs | 16 ++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/lib/plausible_web/remote_ip.ex b/lib/plausible_web/remote_ip.ex index fd7dcf816..0d6118014 100644 --- a/lib/plausible_web/remote_ip.ex +++ b/lib/plausible_web/remote_ip.ex @@ -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=(?[^;,]+).*$/, 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 diff --git a/test/plausible_web/controllers/api/external_controller_test.exs b/test/plausible_web/controllers/api/external_controller_test.exs index 955baea62..e71f4be3b 100644 --- a/test/plausible_web/controllers/api/external_controller_test.exs +++ b/test/plausible_web/controllers/api/external_controller_test.exs @@ -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",