From 00d05b2edd3c91f99d0287d350cdac4dc924f3f5 Mon Sep 17 00:00:00 2001 From: RobertJoonas <56999674+RobertJoonas@users.noreply.github.com> Date: Wed, 17 May 2023 14:26:39 +0200 Subject: [PATCH] Fix a bug with query bindings (#2932) --- lib/plausible/stats/custom_props.ex | 2 +- .../api/stats_controller/conversions_test.exs | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/lib/plausible/stats/custom_props.ex b/lib/plausible/stats/custom_props.ex index 306bfa5fc..d03620cf6 100644 --- a/lib/plausible/stats/custom_props.ex +++ b/lib/plausible/stats/custom_props.ex @@ -51,7 +51,7 @@ defmodule Plausible.Stats.CustomProps do end def maybe_allowed_props_only(q, allowed_props) when is_list(allowed_props) do - from [_e, m] in q, where: m.key in ^allowed_props + from [..., m] in q, where: m.key in ^allowed_props end def maybe_allowed_props_only(q, nil), do: q diff --git a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs index 102e6d757..b0f15dff2 100644 --- a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs @@ -367,6 +367,45 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do assert [%{"prop_names" => ["author"]}] = json_response(conn, 200) end + test "filters out garbage prop_names when session filters are applied", + %{ + conn: conn, + site: site + } do + site = + site + |> Plausible.Site.set_allowed_event_props(["author", "logged_in"]) + |> Plausible.Repo.update!() + + populate_stats(site, [ + build(:event, + name: "Payment", + pathname: "/", + "meta.key": ["author"], + "meta.value": ["Valdis"] + ), + build(:event, + name: "Payment", + pathname: "/ignore", + "meta.key": ["logged_in"], + "meta.value": ["true"] + ), + build(:event, + name: "Payment", + pathname: "/", + "meta.key": ["garbage"], + "meta.value": ["123"] + ) + ]) + + insert(:goal, %{site: site, event_name: "Payment"}) + + filters = Jason.encode!(%{goal: "Payment", entry_page: "/"}) + conn = get(conn, "/api/stats/#{site.domain}/conversions?period=day&filters=#{filters}") + + assert [%{"prop_names" => ["author"]}] = json_response(conn, 200) + end + test "does not filter any prop names by default (when site.allowed_event_props is nil)", %{ conn: conn,