Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

fix(studio): apply literal() escaping to remaining queue mutation files (#44555)

oniani178fbed1d5c37
diff --git a/apps/studio/data/database-queues/database-queue-messages-read-mutation.ts b/apps/studio/data/database-queues/database-queue-messages-read-mutation.ts
index 480a1df3315..f51bca283b7 100644
--- a/apps/studio/data/database-queues/database-queue-messages-read-mutation.ts
+++ b/apps/studio/data/database-queues/database-queue-messages-read-mutation.ts
@@ -1,3 +1,4 @@
+import { literal } from '@supabase/pg-meta/src/pg-format'
import { useMutation, useQueryClient } from '@tanstack/react-query'
import { toast } from 'sonner'
@@ -30,7 +31,7 @@ export async function readDatabaseQueueMessage({
const { result } = await executeSql({
projectRef,
connectionString,
- sql: `select * from pgmq.set_vt('${queueName}', ${messageId}, ${duration})`,
+ sql: `select * from pgmq.set_vt(${literal(queueName)}, ${literal(messageId)}, ${literal(duration)})`,
queryKey: databaseQueuesKeys.create(),
})
diff --git a/apps/studio/data/database-queues/database-queues-create-mutation.ts b/apps/studio/data/database-queues/database-queues-create-mutation.ts
index fc968ea3fd1..c5c02394c3d 100644
--- a/apps/studio/data/database-queues/database-queues-create-mutation.ts
+++ b/apps/studio/data/database-queues/database-queues-create-mutation.ts
@@ -1,7 +1,9 @@
+import { ident, literal } from '@supabase/pg-meta/src/pg-format'
import { useMutation, useQueryClient } from '@tanstack/react-query'
import { toast } from 'sonner'
import { databaseQueuesKeys } from './keys'
+import { isQueueNameValid } from '@/components/interfaces/Integrations/Queues/Queues.utils'
import { executeSql } from '@/data/sql/execute-sql-query'
import { tableKeys } from '@/data/tables/keys'
import type { ResponseError, UseCustomMutationOptions } from '@/types'
@@ -26,19 +28,25 @@ export async function createDatabaseQueue({
enableRls,
configuration,
}: DatabaseQueueCreateVariables) {
+ if (!isQueueNameValid(name)) {
+ throw new Error(
+ 'Invalid queue name: must contain only alphanumeric characters, underscores, and hyphens'
+ )
+ }
+
const { partitionInterval, retentionInterval } = configuration ?? {}
const query =
type === 'partitioned'
- ? `select from pgmq.create_partitioned('${name}', '${partitionInterval}', '${retentionInterval}');`
+ ? `select from pgmq.create_partitioned(${literal(name)}, ${literal(partitionInterval)}, ${literal(retentionInterval)});`
: type === 'unlogged'
- ? `SELECT pgmq.create_unlogged('${name}');`
- : `SELECT pgmq.create('${name}');`
+ ? `SELECT pgmq.create_unlogged(${literal(name)});`
+ : `SELECT pgmq.create(${literal(name)});`
const { result } = await executeSql({
projectRef,
connectionString,
- sql: `${query} ${enableRls ? `alter table pgmq."q_${name}" enable row level security;` : ''}`.trim(),
+ sql: `${query} ${enableRls ? `alter table pgmq.${ident('q_' + name)} enable row level security;` : ''}`.trim(),
queryKey: databaseQueuesKeys.create(),
})
diff --git a/apps/studio/data/database-queues/database-queues-delete-mutation.ts b/apps/studio/data/database-queues/database-queues-delete-mutation.ts
index 178dbff86b7..97bac6182e2 100644
--- a/apps/studio/data/database-queues/database-queues-delete-mutation.ts
+++ b/apps/studio/data/database-queues/database-queues-delete-mutation.ts
@@ -1,3 +1,4 @@
+import { literal } from '@supabase/pg-meta/src/pg-format'
import { useMutation, useQueryClient } from '@tanstack/react-query'
import { toast } from 'sonner'
@@ -26,7 +27,7 @@ export async function deleteDatabaseQueue({
const { result } = await executeSql({
projectRef,
connectionString,
- sql: `select * from pgmq.drop_queue('${queueName}');`,
+ sql: `select * from pgmq.drop_queue(${literal(queueName)});`,
queryKey: databaseQueuesKeys.delete(queueName),
})
diff --git a/apps/studio/data/database-queues/database-queues-metrics-query.ts b/apps/studio/data/database-queues/database-queues-metrics-query.ts
index dd0548e2a82..82dbe4c5f0f 100644
--- a/apps/studio/data/database-queues/database-queues-metrics-query.ts
+++ b/apps/studio/data/database-queues/database-queues-metrics-query.ts
@@ -1,3 +1,4 @@
+import { ident, literal } from '@supabase/pg-meta/src/pg-format'
import { useQuery } from '@tanstack/react-query'
import { databaseQueuesKeys } from './keys'
@@ -23,7 +24,7 @@ const preciseMetricsSqlQuery = (queueName: string) => {
SELECT
COUNT(*) AS row_count
FROM
- "pgmq"."q_${queueName}";
+ "pgmq".${ident('q_' + queueName)};
`
}
@@ -34,7 +35,7 @@ const estimateMetricsSqlQuery = (queueName: string) => {
from
pg_class
where
- relname = 'q_${queueName}'
+ relname = ${literal('q_' + queueName)}
and relnamespace = 'pgmq'::regnamespace;
`
}
diff --git a/apps/studio/data/database-queues/database-queues-purge-mutation.ts b/apps/studio/data/database-queues/database-queues-purge-mutation.ts
index 983a0fe4a72..4d42427dd34 100644
--- a/apps/studio/data/database-queues/database-queues-purge-mutation.ts
+++ b/apps/studio/data/database-queues/database-queues-purge-mutation.ts
@@ -1,3 +1,4 @@
+import { literal } from '@supabase/pg-meta/src/pg-format'
import { useMutation, useQueryClient } from '@tanstack/react-query'
import { toast } from 'sonner'
@@ -26,7 +27,7 @@ export async function purgeDatabaseQueue({
const { result } = await executeSql({
projectRef,
connectionString,
- sql: `select * from pgmq.purge_queue('${queueName}');`,
+ sql: `select * from pgmq.purge_queue(${literal(queueName)});`,
queryKey: databaseQueuesKeys.purge(queueName),
})