The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
fix(studio): guard Auth Performance allocation strategy select against invalid values (#47896)
Ali Waseem652311feb503
diff --git a/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.test.tsx b/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.test.tsxnew file mode 100644index 00000000000..0aaed1efefe--- /dev/null+++ b/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.test.tsx@@ -0,0 +1,70 @@+import { screen } from '@testing-library/react'+import { HttpResponse } from 'msw'+import { describe, expect, test, vi } from 'vitest'++import { PerformanceSettingsForm } from './PerformanceSettingsForm'+import { customRender } from '@/tests/lib/custom-render'+import { addAPIMock } from '@/tests/lib/msw'++vi.mock('@/lib/constants', async (importOriginal) => {+ const actual = await importOriginal<typeof import('@/lib/constants')>()+ return { ...actual, IS_PLATFORM: true }+})++vi.mock('@/hooks/misc/useSelectedProject', () => ({+ useSelectedProjectQuery: () => ({ data: { ref: 'default', connectionString: null } }),+}))++vi.mock('@/hooks/misc/useCheckEntitlements', () => ({+ useCheckEntitlements: () => ({ hasAccess: true, isLoading: false }),+}))++vi.mock('@/hooks/misc/useCheckPermissions', () => ({+ useAsyncCheckPermissions: () => ({ can: true, isLoading: false, isSuccess: true }),+}))++function mockAuthConfig(overrides: Record<string, unknown>) {+ addAPIMock({+ method: 'get',+ path: '/platform/auth/:ref/config',+ response: () =>+ HttpResponse.json<any>({+ API_MAX_REQUEST_DURATION: 10,+ DB_MAX_POOL_SIZE: 10,+ DB_MAX_POOL_SIZE_UNIT: 'connections',+ ...overrides,+ }),+ })+}++function mockMaxConnections(maxConnections: number) {+ addAPIMock({+ method: 'post',+ path: '/platform/pg-meta/:ref/query',+ response: () => HttpResponse.json<any>([{ max_connections: maxConnections }]),+ })+}++describe('PerformanceSettingsForm', () => {+ test('reflects a persisted percentage allocation strategy after loading', async () => {+ mockAuthConfig({ DB_MAX_POOL_SIZE: 15, DB_MAX_POOL_SIZE_UNIT: 'percent' })+ mockMaxConnections(60)++ customRender(<PerformanceSettingsForm />)++ expect(await screen.findByText('Percentage')).toBeInTheDocument()+ expect(screen.getByDisplayValue('15')).toBeInTheDocument()+ expect(screen.getByText('%')).toBeInTheDocument()+ })++ test('reflects a persisted absolute allocation strategy after loading', async () => {+ mockAuthConfig({ DB_MAX_POOL_SIZE: 12, DB_MAX_POOL_SIZE_UNIT: 'connections' })+ mockMaxConnections(60)++ customRender(<PerformanceSettingsForm />)++ expect(await screen.findByText('Absolute')).toBeInTheDocument()+ expect(screen.getByDisplayValue('12')).toBeInTheDocument()+ expect(screen.getByText('connections')).toBeInTheDocument()+ })+})diff --git a/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.tsx b/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.tsxindex 1b08af1dce1..9f4982269d2 100644--- a/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.tsx+++ b/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.tsx@@ -25,6 +25,7 @@ import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { GenericSkeletonLoader, ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'import * as z from 'zod'+import { convertPoolSize, isAllocationUnit } from './PerformanceSettingsForm.utils'import { ScaffoldSection, ScaffoldSectionTitle } from '@/components/layouts/Scaffold'import { AlertError } from '@/components/ui/AlertError'import { NoPermission } from '@/components/ui/NoPermission'@@ -103,7 +104,7 @@ export const PerformanceSettingsForm = () => {defaultValues: { API_MAX_REQUEST_DURATION: 10 },})- const databaseForm = useForm({+ const databaseForm = useForm<z.infer<typeof DatabaseFormSchema>>({resolver: zodResolver(DatabaseFormSchema),defaultValues: {DB_MAX_POOL_SIZE: 10,@@ -315,28 +316,22 @@ export const PerformanceSettingsForm = () => {<Selectvalue={field.value}onValueChange={(value) => {+ if (!isAllocationUnit(value)) return+const values = databaseForm.getValues()+ const currentUnit = values.DB_MAX_POOL_SIZE_UNITfield.onChange(value)- if (values.DB_MAX_POOL_SIZE_UNIT !== value) {- const currentValue = values.DB_MAX_POOL_SIZE!-- let preservedPoolSize: number- if (value === 'percent') {- // convert from absolute number to roughly the same percentage- preservedPoolSize = Math.ceil(- (Math.min(maxConnectionLimit, currentValue) /- maxConnectionLimit) *- 100- )- } else {- // convert from percentage to roughly the same connection number- preservedPoolSize = Math.floor(- maxConnectionLimit * (Math.min(100, currentValue) / 100)- )- }-- databaseForm.setValue('DB_MAX_POOL_SIZE', preservedPoolSize)+ if (currentUnit !== value) {+ databaseForm.setValue(+ 'DB_MAX_POOL_SIZE',+ convertPoolSize({+ fromUnit: currentUnit,+ toUnit: value,+ currentValue: values.DB_MAX_POOL_SIZE!,+ maxConnectionLimit,+ })+ )}}}>diff --git a/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.utils.test.ts b/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.utils.test.tsnew file mode 100644index 00000000000..0cbbf4cf9ca--- /dev/null+++ b/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.utils.test.ts@@ -0,0 +1,103 @@+import { describe, expect, it } from 'vitest'++import { convertPoolSize, isAllocationUnit } from './PerformanceSettingsForm.utils'++describe('isAllocationUnit', () => {+ it('accepts "percent"', () => {+ expect(isAllocationUnit('percent')).toBe(true)+ })++ it('accepts "connections"', () => {+ expect(isAllocationUnit('connections')).toBe(true)+ })++ it('rejects an empty string', () => {+ expect(isAllocationUnit('')).toBe(false)+ })++ it('rejects undefined', () => {+ expect(isAllocationUnit(undefined)).toBe(false)+ })++ it('rejects null', () => {+ expect(isAllocationUnit(null)).toBe(false)+ })++ it('rejects an unrelated string', () => {+ expect(isAllocationUnit('bytes')).toBe(false)+ })++ it('rejects a non-string value', () => {+ expect(isAllocationUnit(15)).toBe(false)+ })+})++describe('convertPoolSize', () => {+ it('returns the value unchanged when the unit does not change', () => {+ expect(+ convertPoolSize({+ fromUnit: 'percent',+ toUnit: 'percent',+ currentValue: 15,+ maxConnectionLimit: 60,+ })+ ).toBe(15)+ })++ it('converts connections to percent, rounding up', () => {+ // Matches the original customer report: 10 connections out of 60 -> 17%+ expect(+ convertPoolSize({+ fromUnit: 'connections',+ toUnit: 'percent',+ currentValue: 10,+ maxConnectionLimit: 60,+ })+ ).toBe(17)+ })++ it('converts percent to connections, rounding down', () => {+ // Matches the reproduction: 15% of 60 -> 9 connections+ expect(+ convertPoolSize({+ fromUnit: 'percent',+ toUnit: 'connections',+ currentValue: 15,+ maxConnectionLimit: 60,+ })+ ).toBe(9)+ })++ it('clamps a connections value above the max when converting to percent', () => {+ expect(+ convertPoolSize({+ fromUnit: 'connections',+ toUnit: 'percent',+ currentValue: 100,+ maxConnectionLimit: 60,+ })+ ).toBe(100)+ })++ it('clamps a percent value above 100 when converting to connections', () => {+ expect(+ convertPoolSize({+ fromUnit: 'percent',+ toUnit: 'connections',+ currentValue: 150,+ maxConnectionLimit: 60,+ })+ ).toBe(60)+ })++ it('handles a zero value', () => {+ expect(+ convertPoolSize({+ fromUnit: 'connections',+ toUnit: 'percent',+ currentValue: 0,+ maxConnectionLimit: 60,+ })+ ).toBe(0)+ })+})diff --git a/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.utils.ts b/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.utils.tsnew file mode 100644index 00000000000..de4df0d229d--- /dev/null+++ b/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.utils.ts@@ -0,0 +1,27 @@+export type AllocationUnit = 'percent' | 'connections'++export function isAllocationUnit(value: unknown): value is AllocationUnit {+ return value === 'percent' || value === 'connections'+}++// Converts a pool size between units when the allocation strategy changes,+// preserving roughly the same effective connection budget.+export function convertPoolSize({+ fromUnit,+ toUnit,+ currentValue,+ maxConnectionLimit,+}: {+ fromUnit: AllocationUnit+ toUnit: AllocationUnit+ currentValue: number+ maxConnectionLimit: number+}): number {+ if (fromUnit === toUnit) return currentValue++ if (toUnit === 'percent') {+ return Math.ceil((Math.min(maxConnectionLimit, currentValue) / maxConnectionLimit) * 100)+ }++ return Math.floor(maxConnectionLimit * (Math.min(100, currentValue) / 100))+}