The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
fix(reports): guard against malformed URI in route renderer (#46729)
Jordi Enricfaa6d46e8ba8
diff --git a/apps/studio/components/interfaces/Reports/Reports.utils.test.ts b/apps/studio/components/interfaces/Reports/Reports.utils.test.tsindex 20fe9aba5b0..0164000cc7e 100644--- a/apps/studio/components/interfaces/Reports/Reports.utils.test.ts+++ b/apps/studio/components/interfaces/Reports/Reports.utils.test.ts@@ -2,10 +2,24 @@ import dayjs from 'dayjs'import utc from 'dayjs/plugin/utc'import { describe, expect, it } from 'vitest'-import { formatTimestamp } from './Reports.utils'+import { formatTimestamp, safeDecodeURIComponent } from './Reports.utils'dayjs.extend(utc)+describe('safeDecodeURIComponent', () => {+ it('decodes a valid percent-encoded string', () => {+ expect(safeDecodeURIComponent('a%20b')).toBe('a b')+ })++ it('returns the original string when percent-encoding is malformed', () => {+ expect(safeDecodeURIComponent('?discount=100%')).toBe('?discount=100%')+ })++ it('handles an empty string', () => {+ expect(safeDecodeURIComponent('')).toBe('')+ })+})+describe('formatTimestamp', () => {it('formats milliseconds timestamp correctly', () => {const timestamp = 1640995200000 // 2022-01-01 00:00:00 UTC in millisecondsdiff --git a/apps/studio/components/interfaces/Reports/Reports.utils.tsx b/apps/studio/components/interfaces/Reports/Reports.utils.tsxindex 46ab235753e..f27ee797ef5 100644--- a/apps/studio/components/interfaces/Reports/Reports.utils.tsx+++ b/apps/studio/components/interfaces/Reports/Reports.utils.tsx@@ -23,6 +23,21 @@ export const queryParamsToObject = (params: string) => {return Object.fromEntries(new URLSearchParams(params))}+/**+ * Decodes a URI component, returning the original string if it is malformed.+ *+ * `decodeURIComponent` throws a `URIError` on invalid percent-encoding (e.g. a+ * literal `%` such as `?discount=100%`). Request paths are user-controlled, so+ * decoding inline during render can crash the page.+ */+export const safeDecodeURIComponent = (value: string) => {+ try {+ return decodeURIComponent(value)+ } catch {+ return value+ }+}+export type PresetHookResult = LogsQueryHook | DbQueryHooktype PresetHooks = Record<keyof PresetConfig['queries'], () => PresetHookResult>/**diff --git a/apps/studio/components/interfaces/Reports/renderers/ApiRenderers.tsx b/apps/studio/components/interfaces/Reports/renderers/ApiRenderers.tsxindex 1605756437f..f5fdaf149e4 100644--- a/apps/studio/components/interfaces/Reports/renderers/ApiRenderers.tsx+++ b/apps/studio/components/interfaces/Reports/renderers/ApiRenderers.tsx@@ -16,7 +16,7 @@ import {} from 'ui'import * as z from 'zod'-import { queryParamsToObject } from '../Reports.utils'+import { queryParamsToObject, safeDecodeURIComponent } from '../Reports.utils'import { ReportWidgetProps, ReportWidgetRendererProps } from '../ReportWidget'import { COUNTRY_LAT_LON } from '@/components/interfaces/ProjectCreation/ProjectCreation.constants'import {@@ -372,7 +372,7 @@ const RouteTdContent = (datum: RouteTdContentProps) => (<TextFormatter className="text-foreground-light" value={datum.path} /><TextFormatterclassName="max-w-sm text-foreground-lighter truncate "- value={decodeURIComponent(datum.search || '')}+ value={safeDecodeURIComponent(datum.search || '')}/></div></div>diff --git a/apps/studio/components/interfaces/Reports/renderers/StorageRenderers.tsx b/apps/studio/components/interfaces/Reports/renderers/StorageRenderers.tsxindex db27d752f99..3659b64a2a4 100644--- a/apps/studio/components/interfaces/Reports/renderers/StorageRenderers.tsx+++ b/apps/studio/components/interfaces/Reports/renderers/StorageRenderers.tsx@@ -1,5 +1,6 @@import { Fragment } from 'react'+import { safeDecodeURIComponent } from '../Reports.utils'import { ReportWidgetProps, ReportWidgetRendererProps } from '../ReportWidget'import { TextFormatter } from '@/components/interfaces/Settings/Logs/LogsFormatters'import Table from '@/components/to-be-cleaned/Table'@@ -70,7 +71,7 @@ export const TopCacheMissesRenderer = (<TextFormatter className="text-foreground-light" value={datum.path} /><TextFormatterclassName="max-w-sm text-foreground-lighter truncate "- value={decodeURIComponent(datum.search || '')}+ value={safeDecodeURIComponent(datum.search || '')}/></div></Table.td>