From 0edf4765d41b97f8eae57d0fae93ad96447cad13 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Thu, 18 Nov 2021 10:28:20 +0200 Subject: [PATCH] Ignore maps in prop values --- .../controllers/api/external_controller.ex | 2 +- .../api/external_controller_test.exs | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex index 65cec40c7..d3f8a1bd5 100644 --- a/lib/plausible_web/controllers/api/external_controller.ex +++ b/lib/plausible_web/controllers/api/external_controller.ex @@ -168,7 +168,7 @@ defmodule PlausibleWeb.Api.ExternalController do defp validate_custom_props(props) do is_valid = Enum.all?(props, fn {_key, val} -> - !is_list(val) + !is_list(val) && !is_map(val) end) if is_valid, do: :ok, else: :invalid_props diff --git a/test/plausible_web/controllers/api/external_controller_test.exs b/test/plausible_web/controllers/api/external_controller_test.exs index a1089d02f..659c8aecb 100644 --- a/test/plausible_web/controllers/api/external_controller_test.exs +++ b/test/plausible_web/controllers/api/external_controller_test.exs @@ -495,6 +495,24 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do assert Map.get(event, :"meta.value") == [] end + test "ignores custom prop with map value", %{conn: conn} do + params = %{ + name: "Signup", + url: "http://gigride.live/", + domain: "custom-prop-test-5.com", + props: Jason.encode!(%{foo: %{bar: "baz"}}) + } + + conn = post(conn, "/api/event", params) + + assert conn.status == 202 + + event = get_event("custom-prop-test-5.com") + + assert Map.get(event, :"meta.key") == [] + assert Map.get(event, :"meta.value") == [] + end + test "ignores a malformed referrer URL", %{conn: conn} do params = %{ name: "pageview",