From 0799138622178795126bafe4c877dbdd77a52efe Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Mon, 3 May 2021 17:06:36 +0300 Subject: [PATCH] Add nil check to hashing --- lib/plausible_web/controllers/api/external_controller.ex | 4 +++- .../controllers/api/external_controller_test.exs | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex index bdc6e8ab2..c9a87c977 100644 --- a/lib/plausible_web/controllers/api/external_controller.ex +++ b/lib/plausible_web/controllers/api/external_controller.ex @@ -196,7 +196,9 @@ defmodule PlausibleWeb.Api.ExternalController do user_agent = List.first(Plug.Conn.get_req_header(conn, "user-agent")) || "" ip_address = PlausibleWeb.RemoteIp.get(conn) - SipHash.hash!(salt, user_agent <> ip_address <> domain <> hostname) + if domain && hostname do + SipHash.hash!(salt, user_agent <> ip_address <> domain <> hostname) + end end defp calculate_screen_size(nil), do: nil diff --git a/test/plausible_web/controllers/api/external_controller_test.exs b/test/plausible_web/controllers/api/external_controller_test.exs index 638728528..96c8dfaec 100644 --- a/test/plausible_web/controllers/api/external_controller_test.exs +++ b/test/plausible_web/controllers/api/external_controller_test.exs @@ -587,7 +587,10 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do end test "responds 400 when required fields are missing", %{conn: conn} do - params = %{} + params = %{ + domain: "some-domain.com", + name: "pageview" + } conn = conn