From a228c6162f7fc18968cc7465c0c4ee3f259f4abf Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Mon, 25 May 2020 12:25:41 +0300 Subject: [PATCH] Default to empty pathname --- .../controllers/api/external_controller.ex | 4 +--- lib/plausible_web/views/error_view.ex | 10 ++-------- .../api/external_controller_test.exs | 20 ++++++++++++++++--- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex index 425e17603..b78dc1c4f 100644 --- a/lib/plausible_web/controllers/api/external_controller.ex +++ b/lib/plausible_web/controllers/api/external_controller.ex @@ -51,7 +51,7 @@ defmodule PlausibleWeb.Api.ExternalController do name: params["name"], hostname: strip_www(uri && uri.host), domain: strip_www(params["domain"]) || strip_www(uri && uri.host), - pathname: uri && escape_quote(uri.path), + pathname: uri && (uri.path || "/"), country_code: country_code, fingerprint: calculate_fingerprint(conn, params), operating_system: ua && os_name(ua), @@ -160,8 +160,6 @@ defmodule PlausibleWeb.Api.ExternalController do end end - defp escape_quote(s), do: String.replace(s, "'", "''") - defp clean_uri(uri) do uri = URI.parse(String.trim(uri)) if uri.scheme in ["http", "https"] do diff --git a/lib/plausible_web/views/error_view.ex b/lib/plausible_web/views/error_view.ex index 7ef22ebf3..3ad0ce866 100644 --- a/lib/plausible_web/views/error_view.ex +++ b/lib/plausible_web/views/error_view.ex @@ -1,16 +1,10 @@ defmodule PlausibleWeb.ErrorView do use PlausibleWeb, :view - def render("500.json", assigns) do - message = if assigns[:reason] do - assigns[:reason].message - else - "Something went wrong" - end - + def render("500.json", _assigns) do %{ status: 500, - message: message + message: "Server error" } end diff --git a/test/plausible_web/controllers/api/external_controller_test.exs b/test/plausible_web/controllers/api/external_controller_test.exs index 9c4f52a2b..48ec94f23 100644 --- a/test/plausible_web/controllers/api/external_controller_test.exs +++ b/test/plausible_web/controllers/api/external_controller_test.exs @@ -80,9 +80,7 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do test "www. is stripped from hostname", %{conn: conn} do params = %{ name: "pageview", - url: "http://www.example.com/", - uid: UUID.uuid4(), - new_visitor: true + url: "http://www.example.com/" } conn @@ -95,6 +93,22 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do assert pageview.hostname == "example.com" end + test "empty path defaults to /", %{conn: conn} do + params = %{ + name: "pageview", + url: "http://www.example.com" + } + + conn + |> put_req_header("content-type", "text/plain") + |> post("/api/event", Jason.encode!(params)) + + pageview = Repo.one(Plausible.Event) + finalize_session(pageview.fingerprint) + + assert pageview.pathname == "/" + end + test "bots and crawlers are ignored", %{conn: conn} do params = %{ name: "pageview",