Skip to content

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

fix rls trigger (#41776)

Saxon Fletcher54a968312788
diff --git a/apps/studio/components/interfaces/Database/Triggers/EventTriggersList/EventTriggers.constants.ts b/apps/studio/components/interfaces/Database/Triggers/EventTriggersList/EventTriggers.constants.ts
index ae795eeb7ab..5998f04f99c 100644
--- a/apps/studio/components/interfaces/Database/Triggers/EventTriggersList/EventTriggers.constants.ts
+++ b/apps/studio/components/interfaces/Database/Triggers/EventTriggersList/EventTriggers.constants.ts
@@ -13,11 +13,48 @@ ON ddl_command_end
EXECUTE FUNCTION event_trigger_fn();
`
+export const AUTO_ENABLE_RLS_EVENT_TRIGGER_SQL = `
+CREATE OR REPLACE FUNCTION rls_auto_enable()
+RETURNS EVENT_TRIGGER
+LANGUAGE plpgsql
+SECURITY DEFINER
+SET search_path = pg_catalog
+AS $$
+DECLARE
+ cmd record;
+BEGIN
+ FOR cmd IN
+ SELECT *
+ FROM pg_event_trigger_ddl_commands()
+ WHERE command_tag IN ('CREATE TABLE', 'CREATE TABLE AS', 'SELECT INTO')
+ AND object_type IN ('table','partitioned table')
+ LOOP
+ IF cmd.schema_name IS NOT NULL AND cmd.schema_name IN ('public') AND cmd.schema_name NOT IN ('pg_catalog','information_schema') AND cmd.schema_name NOT LIKE 'pg_toast%' AND cmd.schema_name NOT LIKE 'pg_temp%' THEN
+ BEGIN
+ EXECUTE format('alter table if exists %s enable row level security', cmd.object_identity);
+ RAISE LOG 'rls_auto_enable: enabled RLS on %', cmd.object_identity;
+ EXCEPTION
+ WHEN OTHERS THEN
+ RAISE LOG 'rls_auto_enable: failed to enable RLS on %', cmd.object_identity;
+ END;
+ ELSE
+ RAISE LOG 'rls_auto_enable: skip % (either system schema or not in enforced list: %.)', cmd.object_identity, cmd.schema_name;
+ END IF;
+ END LOOP;
+END;
+$$;
+
+DROP EVENT TRIGGER IF EXISTS ensure_rls;
+CREATE EVENT TRIGGER ensure_rls
+ON ddl_command_end
+WHEN TAG IN ('CREATE TABLE', 'CREATE TABLE AS', 'SELECT INTO')
+EXECUTE FUNCTION rls_auto_enable();`
+
export const EVENT_TRIGGER_TEMPLATES = [
{
name: 'Auto enable RLS',
description: 'Enable RLS automatically on new tables in selected schemas.',
- content: DEFAULT_EVENT_TRIGGER_SQL,
+ content: AUTO_ENABLE_RLS_EVENT_TRIGGER_SQL,
},
{
name: 'Prevent table drops',
diff --git a/apps/studio/components/ui/BannerStack/Banners/BannerRlsEventTrigger.tsx b/apps/studio/components/ui/BannerStack/Banners/BannerRlsEventTrigger.tsx
index 4cf2e3352d4..9f4295b844c 100644
--- a/apps/studio/components/ui/BannerStack/Banners/BannerRlsEventTrigger.tsx
+++ b/apps/studio/components/ui/BannerStack/Banners/BannerRlsEventTrigger.tsx
@@ -1,11 +1,10 @@
import { ShieldCheck } from 'lucide-react'
import { useEffect, useMemo, useState } from 'react'
-import { EMPTY_ARR } from '@/lib/void'
import { PermissionAction } from '@supabase/shared-types/out/constants'
import { LOCAL_STORAGE_KEYS } from 'common'
import { useParams } from 'common/hooks'
-import { DEFAULT_EVENT_TRIGGER_SQL } from 'components/interfaces/Database/Triggers/EventTriggersList/EventTriggers.constants'
+import { AUTO_ENABLE_RLS_EVENT_TRIGGER_SQL } from 'components/interfaces/Database/Triggers/EventTriggersList/EventTriggers.constants'
import { ButtonTooltip } from 'components/ui/ButtonTooltip'
import { useDatabaseEventTriggerCreateMutation } from 'data/database-event-triggers/database-event-trigger-create-mutation'
import { useDatabaseEventTriggersQuery } from 'data/database-event-triggers/database-event-triggers-query'
@@ -35,7 +34,7 @@ export const BannerRlsEventTrigger = () => {
'triggers'
)
- const { data: eventTriggers = EMPTY_ARR, isLoading: isLoadingEventTriggers } =
+ const { data: eventTriggers = [], isLoading: isLoadingEventTriggers } =
useDatabaseEventTriggersQuery({
projectRef: project?.ref,
connectionString: project?.connectionString,
@@ -66,7 +65,7 @@ export const BannerRlsEventTrigger = () => {
createEventTrigger({
projectRef: project.ref,
connectionString: project.connectionString,
- sql: DEFAULT_EVENT_TRIGGER_SQL,
+ sql: AUTO_ENABLE_RLS_EVENT_TRIGGER_SQL,
})
}