Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Escape pipes in goal names (#2814)
Uku Taht71e4d228c086
diff --git a/assets/js/dashboard/stats/conversions/index.js b/assets/js/dashboard/stats/conversions/index.jsindex 3a18fcd1db..4b09768039 100644--- a/assets/js/dashboard/stats/conversions/index.js+++ b/assets/js/dashboard/stats/conversions/index.js@@ -8,6 +8,7 @@ import PropBreakdown from './prop-breakdown'import numberFormatter from '../../util/number-formatter'import * as api from '../../api'import * as url from '../../util/url'+import { escapeFilterValue } from '../../util/filters'import LazyLoader from '../../components/lazy-loader'const MOBILE_UPPER_WIDTH = 767@@ -79,7 +80,7 @@ export default class Conversions extends React.Component {maxWidthDeduction={this.getBarMaxWidth()}plot="unique_conversions">- <Link to={url.setQuery('goal', goal.name)} className="block px-2 py-1.5 hover:underline relative z-9 break-all lg:truncate dark:text-gray-200">{goal.name}</Link>+ <Link to={url.setQuery('goal', escapeFilterValue(goal.name))} className="block px-2 py-1.5 hover:underline relative z-9 break-all lg:truncate dark:text-gray-200">{goal.name}</Link></Bar><div className="dark:text-gray-200"><span className="inline-block w-20 font-medium text-right">{numberFormatter(goal.unique_conversions)}</span>diff --git a/assets/js/dashboard/util/filters.js b/assets/js/dashboard/util/filters.jsindex 300d14493c..64bff909f8 100644--- a/assets/js/dashboard/util/filters.js+++ b/assets/js/dashboard/util/filters.js@@ -33,7 +33,7 @@ try {const ESCAPED_PIPE = '\\|'-function escapeFilterValue(value) {+export function escapeFilterValue(value) {return value.replaceAll(NON_ESCAPED_PIPE_REGEX, ESCAPED_PIPE)}diff --git a/lib/plausible/stats/filters.ex b/lib/plausible/stats/filters.exindex 5ac7a8585a..1ea60e736d 100644--- a/lib/plausible/stats/filters.ex+++ b/lib/plausible/stats/filters.ex@@ -57,7 +57,7 @@ defmodule Plausible.Stats.Filters do{is_contains, val} = parse_contains_prefix(val)is_list = Regex.match?(@non_escaped_pipe_regex, val)is_wildcard = String.contains?(key, ["page", "goal"]) && String.match?(val, ~r/\*/)- val = if is_list, do: parse_member_list(val), else: val+ val = if is_list, do: parse_member_list(val), else: remove_escape_chars(val)val = if key == "goal", do: wrap_goal_value(val), else: valcond dodiff --git a/test/plausible/stats/filters_test.exs b/test/plausible/stats/filters_test.exsindex 69fe6d4dfb..356074a6fa 100644--- a/test/plausible/stats/filters_test.exs+++ b/test/plausible/stats/filters_test.exs@@ -74,6 +74,18 @@ defmodule Plausible.Stats.FiltersTest doendend+ describe "escaping pipe character" do+ test "in simple is filter" do+ %{"goal" => ~S(Foo \| Bar)}+ |> assert_parsed(%{"event:goal" => {:is, {:event, "Foo | Bar"}}})+ end++ test "in member filter" do+ %{"page" => ~S(/|\|)}+ |> assert_parsed(%{"event:page" => {:member, ["/", "|"]}})+ end+ end+describe "is not filter type" dotest "simple is not filter" do%{"page" => "!/"}