From a722d02e638424c8114cab34f1493b395b998fce Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Fri, 24 Sep 2021 13:28:10 +0200 Subject: [PATCH] Return 400 when domain is missing --- .../controllers/api/external_controller.ex | 4 +++- .../api/external_controller_test.exs | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex index 0632713b3..69e13f80a 100644 --- a/lib/plausible_web/controllers/api/external_controller.ex +++ b/lib/plausible_web/controllers/api/external_controller.ex @@ -56,6 +56,8 @@ defmodule PlausibleWeb.Api.ExternalController do end end + @no_domain_error {:error, %{domain: ["can't be blank"]}} + defp create_event(conn, params) do params = %{ "name" => params["n"] || params["name"], @@ -100,7 +102,7 @@ defmodule PlausibleWeb.Api.ExternalController do "meta.value": Map.values(params["meta"]) |> Enum.map(&Kernel.to_string/1) } - Enum.reduce_while(get_domains(params, uri), :error, fn domain, _res -> + Enum.reduce_while(get_domains(params, uri), @no_domain_error, fn domain, _res -> user_id = generate_user_id(conn, domain, event_attrs[:hostname], salts[:current]) previous_user_id = diff --git a/test/plausible_web/controllers/api/external_controller_test.exs b/test/plausible_web/controllers/api/external_controller_test.exs index 93b85ef7d..3627015a0 100644 --- a/test/plausible_web/controllers/api/external_controller_test.exs +++ b/test/plausible_web/controllers/api/external_controller_test.exs @@ -705,6 +705,25 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do } } end + + test "responds 400 with errors when domain is missing", %{conn: conn} do + params = %{ + domain: nil, + url: "about:config", + name: "pageview" + } + + conn = + conn + |> put_req_header("user-agent", @user_agent) + |> post("/api/event", params) + + assert json_response(conn, 400) == %{ + "errors" => %{ + "domain" => ["can't be blank"] + } + } + end end describe "user_id generation" do