From 254d34d0a42a01dcb604eb09cff491ed7170bbad Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 8 Jan 2020 10:53:08 +0200 Subject: [PATCH] Trim trailing slash from referrer --- .../controllers/api/external_controller.ex | 2 +- .../api/external_controller_test.exs | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex index 7b3322b18..e37f49b65 100644 --- a/lib/plausible_web/controllers/api/external_controller.ex +++ b/lib/plausible_web/controllers/api/external_controller.ex @@ -74,7 +74,7 @@ defmodule PlausibleWeb.Api.ExternalController do defp clean_referrer(referrer) do uri = if referrer do - URI.parse(referrer) + URI.parse(String.trim_trailing(referrer, "/")) end if uri && uri.scheme in ["http", "https"] do diff --git a/test/plausible_web/controllers/api/external_controller_test.exs b/test/plausible_web/controllers/api/external_controller_test.exs index 84e1db5e9..5087d6681 100644 --- a/test/plausible_web/controllers/api/external_controller_test.exs +++ b/test/plausible_web/controllers/api/external_controller_test.exs @@ -116,6 +116,28 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do assert pageview.referrer_source == "Facebook" end + test "strips trailing slash from referrer", %{conn: conn} do + params = %{ + name: "pageview", + url: "http://gigride.live/", + referrer: "https://facebook.com/page/", + new_visitor: false, + uid: UUID.uuid4() + } + + conn = conn + |> put_req_header("content-type", "text/plain") + |> put_req_header("user-agent", @user_agent) + |> post("/api/event", Jason.encode!(params)) + + pageview = Repo.one(Plausible.Event) + finalize_session(pageview.user_id) + + assert response(conn, 202) == "" + assert pageview.referrer == "facebook.com/page" + assert pageview.referrer_source == "Facebook" + end + test "ignores when referrer is internal", %{conn: conn} do params = %{ name: "pageview",