Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

Added safeDecodeURI method. Closes #848.

Mike Cao65d409409545
diff --git a/components/metrics/PagesTable.js b/components/metrics/PagesTable.js
index c137589f9..b500e270a 100644
--- a/components/metrics/PagesTable.js
+++ b/components/metrics/PagesTable.js
@@ -4,6 +4,7 @@ import classNames from 'classnames';
import Link from 'next/link';
import FilterButtons from 'components/common/FilterButtons';
import { urlFilter } from 'lib/filters';
+import { safeDecodeURI } from 'lib/url';
import usePageQuery from 'hooks/usePageQuery';
import MetricsTable from './MetricsTable';
import styles from './PagesTable.module.css';
@@ -35,7 +36,7 @@ export default function PagesTable({ websiteId, websiteDomain, showFilters, ...p
[styles.active]: x === url,
})}
>
- {decodeURI(x)}
+ {safeDecodeURI(x)}
</a>
</Link>
);
diff --git a/components/metrics/ReferrersTable.js b/components/metrics/ReferrersTable.js
index cbd4c9ba9..4dad86557 100644
--- a/components/metrics/ReferrersTable.js
+++ b/components/metrics/ReferrersTable.js
@@ -3,6 +3,7 @@ import { FormattedMessage } from 'react-intl';
import MetricsTable from './MetricsTable';
import FilterButtons from 'components/common/FilterButtons';
import { refFilter } from 'lib/filters';
+import { safeDecodeURI } from 'lib/url';
export const FILTER_DOMAIN_ONLY = 0;
export const FILTER_COMBINED = 1;
@@ -26,10 +27,10 @@ export default function ReferrersTable({ websiteId, websiteDomain, showFilters,
const renderLink = ({ w: href, x: url }) => {
return (href || url).startsWith('http') ? (
<a href={href || url} target="_blank" rel="noreferrer">
- {decodeURI(url)}
+ {safeDecodeURI(url)}
</a>
) : (
- decodeURI(url)
+ safeDecodeURI(url)
);
};
diff --git a/lib/url.js b/lib/url.js
index deec7fe1d..9bd8a3abf 100644
--- a/lib/url.js
+++ b/lib/url.js
@@ -32,3 +32,12 @@ export function getQueryString(params = {}) {
export function makeUrl(url, params) {
return `${url}${getQueryString(params)}`;
}
+
+export function safeDecodeURI(s) {
+ try {
+ return decodeURI(s);
+ } catch (e) {
+ console.error(e);
+ }
+ return s;
+}