Added safeDecodeURI method. Closes umami-software#848.

aabedraba · Nov 22, 2021 · 65d4094 · 65d4094
1 parent b6ab8c3
commit 65d4094
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;
+}