From 102ff1885e9221ca919847ac2e4a8981ad5f66ef Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Thu, 2 Jun 2022 11:33:24 +0300 Subject: [PATCH] Trim trailing whitespace from pathname --- .../controllers/api/external_controller.ex | 1 + .../controllers/api/external_controller_test.exs | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex index 6ed4a0771..c01be7ab9 100644 --- a/lib/plausible_web/controllers/api/external_controller.ex +++ b/lib/plausible_web/controllers/api/external_controller.ex @@ -271,6 +271,7 @@ defmodule PlausibleWeb.Api.ExternalController do pathname = (uri.path || "/") |> URI.decode() + |> String.trim_trailing() if hash_mode && uri.fragment do pathname <> "#" <> URI.decode(uri.fragment) diff --git a/test/plausible_web/controllers/api/external_controller_test.exs b/test/plausible_web/controllers/api/external_controller_test.exs index 3eab7e1a8..cd345e136 100644 --- a/test/plausible_web/controllers/api/external_controller_test.exs +++ b/test/plausible_web/controllers/api/external_controller_test.exs @@ -141,6 +141,21 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do assert pageview.pathname == "/" end + test "trailing whitespace is removed", %{conn: conn} do + params = %{ + name: "pageview", + url: "http://www.example.com/path ", + domain: "external-controller-test-trailing-whitespace.com" + } + + conn + |> post("/api/event", params) + + pageview = get_event("external-controller-test-trailing-whitespace.com") + + assert pageview.pathname == "/path" + end + test "bots and crawlers are ignored", %{conn: conn} do params = %{ name: "pageview",