From d93fe8197e9ef1e50e57c8f2d6eb206eecdaf8f9 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 22 Sep 2021 11:20:11 +0200 Subject: [PATCH] Accept chrome extension URLs --- .../controllers/api/external_controller.ex | 11 ++++++----- .../api/external_controller_test.exs | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex index eb3fe70d2..a2e938acd 100644 --- a/lib/plausible_web/controllers/api/external_controller.ex +++ b/lib/plausible_web/controllers/api/external_controller.ex @@ -202,14 +202,15 @@ defmodule PlausibleWeb.Api.ExternalController do end end - defp get_root_domain("(none)"), do: "(none)" + defp get_root_domain(nil), do: "(none)" - defp get_root_domain(hostname) when is_binary(hostname) do - PublicSuffix.registrable_domain(hostname) + defp get_root_domain(hostname) do + case PublicSuffix.registrable_domain(hostname) do + domain when is_binary(domain) -> domain + _ -> hostname + end end - defp get_root_domain(hostname), do: hostname - defp calculate_screen_size(nil), do: nil defp calculate_screen_size(width) when width < 576, do: "Mobile" defp calculate_screen_size(width) when width < 992, do: "Tablet" diff --git a/test/plausible_web/controllers/api/external_controller_test.exs b/test/plausible_web/controllers/api/external_controller_test.exs index 771463801..8837b31d4 100644 --- a/test/plausible_web/controllers/api/external_controller_test.exs +++ b/test/plausible_web/controllers/api/external_controller_test.exs @@ -858,6 +858,24 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do assert pageview.hostname == "(none)" end + test "accepts chrome extension URLs", %{conn: conn} do + params = %{ + domain: "chrome-extension-url.com", + name: "pageview", + url: "chrome-extension://liipgellkffekalgefpjolodblggkmjg/popup.html" + } + + conn = + conn + |> put_req_header("content-type", "text/plain") + |> post("/api/event", Jason.encode!(params)) + + pageview = get_event("chrome-extension-url.com") + + assert response(conn, 202) == "" + assert pageview.hostname == "liipgellkffekalgefpjolodblggkmjg" + end + describe "GET /api/health" do test "returns 200 OK", %{conn: conn} do conn = get(conn, "/api/health")