Garry's Opinionated OpenClaw/Hermes Agent Brain
TypeScript
fix(v276): move guard triggers before making guards definers; a raising guard whose trigger still fires BEFORE ROW stays an invoker (mixed-ownership e2e case 15)
garrytan5f656c6b3709
diff --git a/src/core/guard-definer.ts b/src/core/guard-definer.tsindex 04b89ae821..559a25b30d 100644--- a/src/core/guard-definer.ts+++ b/src/core/guard-definer.ts@@ -59,13 +59,13 @@ ${revokeExecuteSql(fn)}`;/** The raising guards, AFTER ROW so RLS WITH CHECK runs first. Same events and columns as before. */export const AFTER_ROW_PURGE_TRIGGERS = [- { table: 'facts', trigger: 'facts_refuse_purged', sql: `DROP TRIGGER IF EXISTS facts_refuse_purged ON facts;+ { table: 'facts', trigger: 'facts_refuse_purged', fn: 'gbrain_refuse_purged_fact', sql: `DROP TRIGGER IF EXISTS facts_refuse_purged ON facts;CREATE TRIGGER facts_refuse_purged AFTER UPDATE OF fact, source_id, visibility, entity_slug ON factsFOR EACH ROW EXECUTE FUNCTION gbrain_refuse_purged_fact();` },- { table: 'takes', trigger: 'takes_refuse_purged', sql: `DROP TRIGGER IF EXISTS takes_refuse_purged ON takes;+ { table: 'takes', trigger: 'takes_refuse_purged', fn: 'gbrain_refuse_purged_take', sql: `DROP TRIGGER IF EXISTS takes_refuse_purged ON takes;CREATE TRIGGER takes_refuse_purged AFTER INSERT OR UPDATE OF claim, page_id ON takesFOR EACH ROW EXECUTE FUNCTION gbrain_refuse_purged_take();` },- { table: 'pages', trigger: 'pages_refuse_purged', sql: `DROP TRIGGER IF EXISTS pages_refuse_purged ON pages;+ { table: 'pages', trigger: 'pages_refuse_purged', fn: 'gbrain_refuse_purged_page', sql: `DROP TRIGGER IF EXISTS pages_refuse_purged ON pages;CREATE TRIGGER pages_refuse_purged AFTER INSERT OR UPDATE ON pagesFOR EACH ROW EXECUTE FUNCTION gbrain_refuse_purged_page();` },] as const;diff --git a/src/core/schema-migrations/v276-guard-triggers-security-definer.ts b/src/core/schema-migrations/v276-guard-triggers-security-definer.tsindex fd95ba79a1..43dfa047b2 100644--- a/src/core/schema-migrations/v276-guard-triggers-security-definer.ts+++ b/src/core/schema-migrations/v276-guard-triggers-security-definer.ts@@ -19,9 +19,12 @@ import { DERIVATION_GUARD_GATE_SQL, DERIVATION_GUARD_TRIGGER_SQL } from '../page// RLS refuses. ALTER and trigger DDL need the owner: a function or table the role does not own is skipped and named// on stderr, as v275 does, and doctor's guard_functions check keeps failing with the fix until it is done. Each// function and each table is its own short transaction with the migration's statement and lock timeouts.-const TRIGGERS: ReadonlyArray<{ table: string; trigger: string; sql: string }> = [+const TRIGGERS: ReadonlyArray<{ table: string; trigger: string; fn: string; sql: string }> = [...AFTER_ROW_PURGE_TRIGGERS,- { table: 'page_segment_derivations', trigger: 'page_segment_derivations_refuse_purging', sql: `${DERIVATION_GUARD_GATE_SQL}\n${DERIVATION_GUARD_TRIGGER_SQL}` },+ {+ table: 'page_segment_derivations', trigger: 'page_segment_derivations_refuse_purging', fn: 'gbrain_refuse_purging_derivation',+ sql: `${DERIVATION_GUARD_GATE_SQL}\n${DERIVATION_GUARD_TRIGGER_SQL}`,+ },];async function inShortTransaction(engine: BrainEngine, step: string, sql: string): Promise<void> {@@ -41,19 +44,12 @@ async function inShortTransaction(engine: BrainEngine, step: string, sql: string}/**- * Makes the purge and withdrawal guards definers, moves their triggers, and appends pg_temp to every gbrain function's- * search_path, for what the role owns. Names on stderr what it could not change and returns those names.+ * Moves the guards' triggers, then makes the purge and withdrawal guards definers, and appends pg_temp to every gbrain+ * function's search_path, for what the role owns. A raising guard whose trigger still fires BEFORE ROW ungated stays+ * an invoker, so a definer never answers before RLS. Names on stderr what it could not change and returns those names.*/export async function hardenGuards(engine: BrainEngine, label: string): Promise<string[]> {const skipped: string[] = [];- const functions = await engine.executeRaw<{ fn: string; owned: boolean | null }>(- `SELECT f.fn, pg_has_role(current_user, p.proowner, 'USAGE') AS owned- FROM unnest($1::text[]) AS f(fn) JOIN pg_proc p ON p.oid = to_regprocedure(f.fn || '()') ORDER BY f.fn`,- [DEFINER_GUARDS.map(g => g.fn)]);- for (const { fn, owned } of functions) {- if (owned) await inShortTransaction(engine, `${label} on ${fn}()`, definerGuardSql(fn));- else skipped.push(`${fn}()`);- }const tables = await engine.executeRaw<{ name: string; owned: boolean | null }>(`SELECT t.name, pg_has_role(current_user, c.relowner, 'USAGE') AS ownedFROM unnest($1::text[]) AS t(name) JOIN pg_class c ON c.oid = to_regclass(t.name)`,@@ -64,6 +60,19 @@ export async function hardenGuards(engine: BrainEngine, label: string): Promise<if (ownedTables.has(t.table)) await inShortTransaction(engine, `${label} on ${t.table}`, t.sql);else skipped.push(`${t.trigger} on ${t.table}`);}+ const exposed = new Set((await engine.executeRaw<{ fn: string }>(+ `SELECT DISTINCT p.proname AS fn FROM pg_trigger t JOIN pg_proc p ON p.oid = t.tgfoid+ WHERE NOT t.tgisinternal AND p.proname = ANY($1::text[]) AND (t.tgtype & 2) <> 0+ AND pg_get_triggerdef(t.oid) NOT LIKE '%gbrain_caller_sees_page(%'`,+ [TRIGGERS.map(t => t.fn)])).map(r => r.fn));+ const functions = await engine.executeRaw<{ fn: string; owned: boolean | null }>(+ `SELECT f.fn, pg_has_role(current_user, p.proowner, 'USAGE') AS owned+ FROM unnest($1::text[]) AS f(fn) JOIN pg_proc p ON p.oid = to_regprocedure(f.fn || '()') ORDER BY f.fn`,+ [DEFINER_GUARDS.map(g => g.fn)]);+ for (const { fn, owned } of functions) {+ if (owned && !exposed.has(fn)) await inShortTransaction(engine, `${label} on ${fn}()`, definerGuardSql(fn));+ else skipped.push(`${fn}()`);+ }await inShortTransaction(engine, `${label} search_path`, FUNCTION_SEARCH_PATH_HARDENING_SQL);const unhardened = await engine.executeRaw<{ sig: string }>(`SELECT p.oid::regprocedure::text AS sig FROM pg_proc p JOIN pg_namespace n ON n.oid = p.pronamespacediff --git a/test/e2e/guard-definer-postgres.test.ts b/test/e2e/guard-definer-postgres.test.tsindex 80aef08619..d3ff991573 100644--- a/test/e2e/guard-definer-postgres.test.ts+++ b/test/e2e/guard-definer-postgres.test.ts@@ -463,4 +463,31 @@ describeE2E('purge and withdrawal guards under a scoped write role (#7632)', ()await engine.disconnect();}}, 300_000);++ test('15. a migrating role that owns the guards but not their tables leaves each raising guard an invoker while its trigger fires BEFORE ROW', async () => {+ const brain = await supabaseShapedBrain();+ const migrator = `gbrain_test_guard_fn_owner_${suffix}`;+ await admin!.unsafe(`CREATE ROLE ${migrator} LOGIN PASSWORD 'migrator' NOSUPERUSER BYPASSRLS`);+ createdRoles.push(migrator);+ const engine = new PostgresEngine();+ const exposed = ['gbrain_refuse_purged_fact', 'gbrain_refuse_purged_page', 'gbrain_refuse_purged_take', 'gbrain_refuse_purging_derivation'];+ try {+ await rewind(brain.conn);+ await brain.conn.unsafe(`GRANT USAGE, CREATE ON SCHEMA public TO ${migrator}; GRANT SELECT, INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA public TO ${migrator};+ ${GUARDS.map(fn => `ALTER FUNCTION ${fn}() OWNER TO ${migrator};`).join('\n')}`);+ const asMigrator = new URL(brain.url);+ asMigrator.username = migrator;+ asMigrator.password = 'migrator';+ await engine.connect({ database_url: asMigrator.toString() });+ const { value, stderr } = await capturingStderr(() => runMigrations(engine));+ expect(value.current).toBe(LATEST_VERSION);+ for (const fn of exposed) expect(stderr).toContain(`${fn}()`);+ const after = await catalog(brain.conn);+ expect(after.guards.map(g => [g.fn, g.secdef])).toEqual(GUARDS.map(fn => [fn, !exposed.includes(fn)]));+ expect(after.triggers.every(t => t.timing === 'BEFORE' && !t.gated)).toBe(true);+ } finally {+ await engine.disconnect().catch(() => {});+ await brain.conn.end();+ }+ }, 300_000);});diff --git a/test/fixtures/goldens/migrations/records.json b/test/fixtures/goldens/migrations/records.jsonindex 68573032d6..7164210a8f 100644--- a/test/fixtures/goldens/migrations/records.json+++ b/test/fixtures/goldens/migrations/records.json@@ -8,7 +8,7 @@100],"helpers": {- "AFTER_ROW_PURGE_TRIGGERS": "c8d5dd61330e1b7e188de730b3206f225748eee32eef7fa71fe4c8df9add02fe",+ "AFTER_ROW_PURGE_TRIGGERS": "d662c13baa69343f298168a7b23ab32622a04c23061abb6321c8dc0f74e3f39f","ALIAS_TABLES": "cddd37c636af42d862c08ca7754a57dfe9d12576b769fa8f74a5f02c803f67a0","BELIEF_FACTS_STREAM_INDEX": "9e4491eb9e0b94924a58deea3feff1b315ec0efd25a77a4e6515b362beffbc92","BOUNDED_TIMELINE_CHECKPOINT": "385c4da3e28732343148795d6e9a86670813a7a7cfa1e52f8a5bb494680a3c0d",@@ -52,7 +52,7 @@"TABLES": "3fc77a0fccb525f9b791098f9eae27b19adaa3f5dadbabcff2a719137cbc3ef8","TOKEN_TTL_MAX_SECONDS": "f4a45bec6ec0bacc859dc57732ceb76cec7eb72f242b5a6c89d47190d0525ab4","TOKEN_TTL_MIN_SECONDS": "441d8ce6bd21f753de90abd3013eaa9992a469ea60c590f1005533618199aa25",- "TRIGGERS": "ed893c636a118b76b34e893de87097f996c78fea34de76c6f4bcb1494d553931",+ "TRIGGERS": "0582df7f12b7baa3f675d8459d2ed809880a7a8fa65658c7b625e3973194a8f3","analyzeAfterIndexBuild": "8d627df6b496e1c197a244f8519aeaf3aebcd23e3f7cf514576d453a4270e33a","analyzeDeferred": "e627ca5e77ce0b79cf5eae7c749a0c9275f04bc186704e3f3a6e05121bb78442","analyzeYieldingToVacuum": "edba1beff1547ea5c2e9f902efe44ab24e8d7016b2253603dcbba92d4137ca9a",@@ -69,7 +69,7 @@"ensureFactsFtsIndex": "95e723314ac30cea2db48e0e167c554ef1fa06df80cae765faa2a080a3a655c2","getFtsLanguage": "0d790b4c4af1f67a2a1bbd59470beb13f434917b381931baf8404a41c5d903db","grantFromRow": "2d0603bb0f964d7e45e04aa76bac54cd4f6f63c91a8d9f028b60b4792bc1695e",- "hardenGuards": "a64af9927e0ba047d9d2655a82ef9958ba980e31b32bec6c6a35574b7daa684b",+ "hardenGuards": "e4320bb6e10670023d441b4c9357305b20ed422fdfcfcadfc4e836ba8941e442","hnswMaxDimsForType": "a187cdcc520f813b7c39da97ce53da58509232ed9f851627ef41abfe1b68bd26","inShortTransaction": "366c67944d8aeb6b71450da05259a0fa5005fa8f6ec6091671f3c78a682db216","isLockTimeoutError": "52a3720e1ffb74ce381cc3269f78130c38a89c807e308283ec3d557bae2b89b1",