Skip to content

Garry's Opinionated OpenClaw/Hermes Agent Brain

TypeScript

fix(access): never lower serves_derived from a stale snapshot, and re-derive a hand-edited key

garrytan40c36ea16045
diff --git a/src/core/schema-migrations/v309-requester-scope.ts b/src/core/schema-migrations/v309-requester-scope.ts
index 6c8511af23..9e08aad477 100644
--- a/src/core/schema-migrations/v309-requester-scope.ts
+++ b/src/core/schema-migrations/v309-requester-scope.ts
@@ -13,8 +13,11 @@ import type { Migration } from './types.ts';
// several), sets access.serves_since once; nothing ever clears it, so disabling
// and re-enabling a member does not restart the grace. One transaction lock
// serializes the recount, so a member added while another is disabled is
-// counted once it commits instead of leaving `one` behind. Triggers on
-// access_members and on config access.serves call it. The one call below
+// counted once it commits instead of leaving `one` behind; a transaction above
+// read committed, whose count may miss a member committed after its snapshot,
+// never lowers the value. Triggers on access_members and on config
+// access.serves and access.serves_derived call it, so a hand edit or unset of
+// the derived key is derived again at once. The one call below
// derives both keys for an existing brain (a brain that already serves several
// people starts its 14-day grace at this upgrade). reads_unscoped records when
// the brain operator let one credential read unscoped on purpose (gbrain auth
@@ -40,7 +43,7 @@ BEGIN
IF derived = 'several' THEN
INSERT INTO config (key, value) VALUES ('access.serves_derived', derived)
ON CONFLICT (key) DO UPDATE SET value = EXCLUDED.value WHERE config.value IS DISTINCT FROM EXCLUDED.value;
- ELSE
+ ELSIF current_setting('transaction_isolation') = 'read committed' THEN
UPDATE config SET value = derived WHERE key = 'access.serves_derived' AND value IS DISTINCT FROM derived;
END IF;
SELECT lower(btrim(value)) INTO explicit FROM config WHERE key = 'access.serves';
@@ -62,10 +65,10 @@ CREATE TRIGGER access_members_refresh_serves AFTER INSERT OR DELETE OR UPDATE OF
FOR EACH STATEMENT EXECUTE FUNCTION gbrain_access_refresh_serves_trigger();
DROP TRIGGER IF EXISTS config_serves_refresh ON config;
CREATE TRIGGER config_serves_refresh AFTER INSERT OR UPDATE ON config
- FOR EACH ROW WHEN (NEW.key = 'access.serves') EXECUTE FUNCTION gbrain_access_refresh_serves_trigger();
+ FOR EACH ROW WHEN (NEW.key IN ('access.serves', 'access.serves_derived')) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger();
DROP TRIGGER IF EXISTS config_serves_refresh_delete ON config;
CREATE TRIGGER config_serves_refresh_delete AFTER DELETE ON config
- FOR EACH ROW WHEN (OLD.key = 'access.serves') EXECUTE FUNCTION gbrain_access_refresh_serves_trigger();
+ FOR EACH ROW WHEN (OLD.key IN ('access.serves', 'access.serves_derived')) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger();
SELECT gbrain_access_refresh_serves();
`,
};
diff --git a/test/e2e/serves-derived-concurrency.test.ts b/test/e2e/serves-derived-concurrency.test.ts
index f0dcf40ef6..eb7ea8b021 100644
--- a/test/e2e/serves-derived-concurrency.test.ts
+++ b/test/e2e/serves-derived-concurrency.test.ts
@@ -2,7 +2,8 @@
* GST-363: config access.serves_derived (kept by v309's gbrain_access_refresh_serves) never reads `one` on a brain
* that serves several people after two transactions change members at once. Without the transaction lock, a member
* disabled while another is being added counts the brain from a snapshot that misses the new member and writes
- * `one` after the add commits, so unbound reads stop being refused.
+ * `one` after the add commits, so unbound reads stop being refused. A transaction above read committed counts from a
+ * snapshot that can miss a member committed after it, so it never lowers the value.
* Run: DATABASE_URL=... bun test test/e2e/serves-derived-concurrency.test.ts
*/
import { afterAll, beforeAll, describe, expect, test } from 'bun:test';
@@ -35,8 +36,10 @@ describeE2E('access.serves_derived under concurrent member changes (Postgres)',
await admin?.end();
}, 60_000);
+ const derived = async () => (await conn!.unsafe("SELECT value FROM config WHERE key = 'access.serves_derived'"))[0]?.value ?? null;
+ const enabled = async () => (await conn!.unsafe('SELECT count(*)::int AS n FROM access_members WHERE disabled_at IS NULL AND tombstoned_at IS NULL'))[0]!.n;
+
test('a member disabled while another is added leaves several, not one', async () => {
- const derived = async () => (await conn!.unsafe("SELECT value FROM config WHERE key = 'access.serves_derived'"))[0]?.value ?? null;
expect(await derived()).toBeNull();
await conn!.unsafe("INSERT INTO access_members (id) VALUES ('alice-example'), ('bob-example')");
expect(await derived()).toBe('several');
@@ -57,7 +60,24 @@ describeE2E('access.serves_derived under concurrent member changes (Postgres)',
adding.release();
disabling.release();
}
- expect((await conn!.unsafe('SELECT count(*)::int AS n FROM access_members WHERE disabled_at IS NULL AND tombstoned_at IS NULL'))[0]!.n).toBe(2);
+ expect(await enabled()).toBe(2);
+ expect(await derived()).toBe('several');
+ }, 60_000);
+
+ test('a repeatable-read disable whose snapshot misses a newly added member leaves several, not one', async () => {
+ expect({ enabled: await enabled(), derived: await derived() }).toEqual({ enabled: 2, derived: 'several' });
+ const disabling = await conn!.reserve();
+ try {
+ await disabling.unsafe('BEGIN ISOLATION LEVEL REPEATABLE READ');
+ await disabling.unsafe('SELECT count(*) FROM access_members');
+ await conn!.unsafe("INSERT INTO access_members (id) VALUES ('dave-example')");
+ await disabling.unsafe("UPDATE access_members SET disabled_at = now() WHERE id = 'bob-example'");
+ await disabling.unsafe('COMMIT');
+ } finally {
+ await disabling.unsafe('ROLLBACK').catch(() => {});
+ disabling.release();
+ }
+ expect(await enabled()).toBe(2);
expect(await derived()).toBe('several');
}, 60_000);
});
diff --git a/test/fixtures/goldens/catalog/pglite-engine-init-default.json b/test/fixtures/goldens/catalog/pglite-engine-init-default.json
index ccf480d72f..8d74f6a839 100644
--- a/test/fixtures/goldens/catalog/pglite-engine-init-default.json
+++ b/test/fixtures/goldens/catalog/pglite-engine-init-default.json
@@ -610,7 +610,7 @@
"gbrain_access_origin_restricted(p_id integer, p_source_id text, p_type text, fm jsonb)": "RETURNS boolean kind=f lang=plpgsql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=506a29c639348746278d0c472b43a013bf2e39a8e83de4cd3641424116160c6d",
"gbrain_access_pending_covers(p_source text, p_slug text)": "RETURNS boolean kind=f lang=sql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=57448e941169ad1e65fbdab4bbe4572cc7b6f164ef19fd61a3666640e85f253c",
"gbrain_access_readers(fm jsonb)": "RETURNS text[] kind=f lang=sql volatility=i secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=18348cb56089106aaec6470076ee652d7ed3bfbcb20e950a24abd52a21e7a380",
- "gbrain_access_refresh_serves()": "RETURNS void kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=300445289a673b3a75a86ac380a31a9f90b015a1f8ba99ad01e19c07dd03ff8a",
+ "gbrain_access_refresh_serves()": "RETURNS void kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=84f560a40c85f6b17461f0061dd93f9ccb23ece584d434e5d24faae0618780b3",
"gbrain_access_refresh_serves_trigger()": "RETURNS trigger kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=cfc246e282936cd9beb99ac87c59f8121412adf0d7bca856ee70cd939039e764",
"gbrain_access_stamp_folder_rules()": "RETURNS trigger kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=7fb49ce62f4f6153ef0c844a1816f5f5bb7d765b8610ff66fec137283469fc09",
"gbrain_access_state_unreadable()": "RETURNS boolean kind=f lang=sql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=fa6c6edac062270a2fcf9ff3e9c29f16242156e817a3710c273d8da9f5203943",
@@ -4694,8 +4694,8 @@
"access_pending_coverage.access_pending_coverage_mark_restricted": "CREATE TRIGGER access_pending_coverage_mark_restricted AFTER INSERT ON public.access_pending_coverage FOR EACH ROW EXECUTE FUNCTION gbrain_access_mark_restricted()",
"access_rules.access_rules_mark_restricted": "CREATE TRIGGER access_rules_mark_restricted AFTER INSERT ON public.access_rules FOR EACH ROW EXECUTE FUNCTION gbrain_access_mark_restricted()",
"access_tokens.trust_generation_update": "CREATE CONSTRAINT TRIGGER trust_generation_update AFTER UPDATE ON public.access_tokens DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((old.min_trust IS DISTINCT FROM new.min_trust)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
- "config.config_serves_refresh": "CREATE TRIGGER config_serves_refresh AFTER INSERT OR UPDATE ON public.config FOR EACH ROW WHEN ((new.key = 'access.serves'::text)) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
- "config.config_serves_refresh_delete": "CREATE TRIGGER config_serves_refresh_delete AFTER DELETE ON public.config FOR EACH ROW WHEN ((old.key = 'access.serves'::text)) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
+ "config.config_serves_refresh": "CREATE TRIGGER config_serves_refresh AFTER INSERT OR UPDATE ON public.config FOR EACH ROW WHEN ((new.key = ANY (ARRAY['access.serves'::text, 'access.serves_derived'::text]))) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
+ "config.config_serves_refresh_delete": "CREATE TRIGGER config_serves_refresh_delete AFTER DELETE ON public.config FOR EACH ROW WHEN ((old.key = ANY (ARRAY['access.serves'::text, 'access.serves_derived'::text]))) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
"config.trust_generation_delete": "CREATE CONSTRAINT TRIGGER trust_generation_delete AFTER DELETE ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((old.key ~~ 'trust.%'::text)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
"config.trust_generation_insert": "CREATE CONSTRAINT TRIGGER trust_generation_insert AFTER INSERT ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((new.key ~~ 'trust.%'::text)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
"config.trust_generation_update": "CREATE CONSTRAINT TRIGGER trust_generation_update AFTER UPDATE ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((((old.key ~~ 'trust.%'::text) OR (new.key ~~ 'trust.%'::text)) AND ((old.key IS DISTINCT FROM new.key) OR (old.value IS DISTINCT FROM new.value)))) EXECUTE FUNCTION gbrain_bump_trust_generation()",
diff --git a/test/fixtures/goldens/catalog/pglite-engine-init-fts-portuguese.json b/test/fixtures/goldens/catalog/pglite-engine-init-fts-portuguese.json
index 8f6950c51f..6652484a5a 100644
--- a/test/fixtures/goldens/catalog/pglite-engine-init-fts-portuguese.json
+++ b/test/fixtures/goldens/catalog/pglite-engine-init-fts-portuguese.json
@@ -610,7 +610,7 @@
"gbrain_access_origin_restricted(p_id integer, p_source_id text, p_type text, fm jsonb)": "RETURNS boolean kind=f lang=plpgsql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=506a29c639348746278d0c472b43a013bf2e39a8e83de4cd3641424116160c6d",
"gbrain_access_pending_covers(p_source text, p_slug text)": "RETURNS boolean kind=f lang=sql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=57448e941169ad1e65fbdab4bbe4572cc7b6f164ef19fd61a3666640e85f253c",
"gbrain_access_readers(fm jsonb)": "RETURNS text[] kind=f lang=sql volatility=i secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=18348cb56089106aaec6470076ee652d7ed3bfbcb20e950a24abd52a21e7a380",
- "gbrain_access_refresh_serves()": "RETURNS void kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=300445289a673b3a75a86ac380a31a9f90b015a1f8ba99ad01e19c07dd03ff8a",
+ "gbrain_access_refresh_serves()": "RETURNS void kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=84f560a40c85f6b17461f0061dd93f9ccb23ece584d434e5d24faae0618780b3",
"gbrain_access_refresh_serves_trigger()": "RETURNS trigger kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=cfc246e282936cd9beb99ac87c59f8121412adf0d7bca856ee70cd939039e764",
"gbrain_access_stamp_folder_rules()": "RETURNS trigger kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=7fb49ce62f4f6153ef0c844a1816f5f5bb7d765b8610ff66fec137283469fc09",
"gbrain_access_state_unreadable()": "RETURNS boolean kind=f lang=sql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=fa6c6edac062270a2fcf9ff3e9c29f16242156e817a3710c273d8da9f5203943",
@@ -4694,8 +4694,8 @@
"access_pending_coverage.access_pending_coverage_mark_restricted": "CREATE TRIGGER access_pending_coverage_mark_restricted AFTER INSERT ON public.access_pending_coverage FOR EACH ROW EXECUTE FUNCTION gbrain_access_mark_restricted()",
"access_rules.access_rules_mark_restricted": "CREATE TRIGGER access_rules_mark_restricted AFTER INSERT ON public.access_rules FOR EACH ROW EXECUTE FUNCTION gbrain_access_mark_restricted()",
"access_tokens.trust_generation_update": "CREATE CONSTRAINT TRIGGER trust_generation_update AFTER UPDATE ON public.access_tokens DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((old.min_trust IS DISTINCT FROM new.min_trust)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
- "config.config_serves_refresh": "CREATE TRIGGER config_serves_refresh AFTER INSERT OR UPDATE ON public.config FOR EACH ROW WHEN ((new.key = 'access.serves'::text)) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
- "config.config_serves_refresh_delete": "CREATE TRIGGER config_serves_refresh_delete AFTER DELETE ON public.config FOR EACH ROW WHEN ((old.key = 'access.serves'::text)) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
+ "config.config_serves_refresh": "CREATE TRIGGER config_serves_refresh AFTER INSERT OR UPDATE ON public.config FOR EACH ROW WHEN ((new.key = ANY (ARRAY['access.serves'::text, 'access.serves_derived'::text]))) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
+ "config.config_serves_refresh_delete": "CREATE TRIGGER config_serves_refresh_delete AFTER DELETE ON public.config FOR EACH ROW WHEN ((old.key = ANY (ARRAY['access.serves'::text, 'access.serves_derived'::text]))) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
"config.trust_generation_delete": "CREATE CONSTRAINT TRIGGER trust_generation_delete AFTER DELETE ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((old.key ~~ 'trust.%'::text)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
"config.trust_generation_insert": "CREATE CONSTRAINT TRIGGER trust_generation_insert AFTER INSERT ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((new.key ~~ 'trust.%'::text)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
"config.trust_generation_update": "CREATE CONSTRAINT TRIGGER trust_generation_update AFTER UPDATE ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((((old.key ~~ 'trust.%'::text) OR (new.key ~~ 'trust.%'::text)) AND ((old.key IS DISTINCT FROM new.key) OR (old.value IS DISTINCT FROM new.value)))) EXECUTE FUNCTION gbrain_bump_trust_generation()",
diff --git a/test/fixtures/goldens/catalog/pglite-engine-init-high-dims.json b/test/fixtures/goldens/catalog/pglite-engine-init-high-dims.json
index 93d062daf3..fd5bc2fdaf 100644
--- a/test/fixtures/goldens/catalog/pglite-engine-init-high-dims.json
+++ b/test/fixtures/goldens/catalog/pglite-engine-init-high-dims.json
@@ -610,7 +610,7 @@
"gbrain_access_origin_restricted(p_id integer, p_source_id text, p_type text, fm jsonb)": "RETURNS boolean kind=f lang=plpgsql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=506a29c639348746278d0c472b43a013bf2e39a8e83de4cd3641424116160c6d",
"gbrain_access_pending_covers(p_source text, p_slug text)": "RETURNS boolean kind=f lang=sql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=57448e941169ad1e65fbdab4bbe4572cc7b6f164ef19fd61a3666640e85f253c",
"gbrain_access_readers(fm jsonb)": "RETURNS text[] kind=f lang=sql volatility=i secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=18348cb56089106aaec6470076ee652d7ed3bfbcb20e950a24abd52a21e7a380",
- "gbrain_access_refresh_serves()": "RETURNS void kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=300445289a673b3a75a86ac380a31a9f90b015a1f8ba99ad01e19c07dd03ff8a",
+ "gbrain_access_refresh_serves()": "RETURNS void kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=84f560a40c85f6b17461f0061dd93f9ccb23ece584d434e5d24faae0618780b3",
"gbrain_access_refresh_serves_trigger()": "RETURNS trigger kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=cfc246e282936cd9beb99ac87c59f8121412adf0d7bca856ee70cd939039e764",
"gbrain_access_stamp_folder_rules()": "RETURNS trigger kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=7fb49ce62f4f6153ef0c844a1816f5f5bb7d765b8610ff66fec137283469fc09",
"gbrain_access_state_unreadable()": "RETURNS boolean kind=f lang=sql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=fa6c6edac062270a2fcf9ff3e9c29f16242156e817a3710c273d8da9f5203943",
@@ -4690,8 +4690,8 @@
"access_pending_coverage.access_pending_coverage_mark_restricted": "CREATE TRIGGER access_pending_coverage_mark_restricted AFTER INSERT ON public.access_pending_coverage FOR EACH ROW EXECUTE FUNCTION gbrain_access_mark_restricted()",
"access_rules.access_rules_mark_restricted": "CREATE TRIGGER access_rules_mark_restricted AFTER INSERT ON public.access_rules FOR EACH ROW EXECUTE FUNCTION gbrain_access_mark_restricted()",
"access_tokens.trust_generation_update": "CREATE CONSTRAINT TRIGGER trust_generation_update AFTER UPDATE ON public.access_tokens DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((old.min_trust IS DISTINCT FROM new.min_trust)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
- "config.config_serves_refresh": "CREATE TRIGGER config_serves_refresh AFTER INSERT OR UPDATE ON public.config FOR EACH ROW WHEN ((new.key = 'access.serves'::text)) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
- "config.config_serves_refresh_delete": "CREATE TRIGGER config_serves_refresh_delete AFTER DELETE ON public.config FOR EACH ROW WHEN ((old.key = 'access.serves'::text)) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
+ "config.config_serves_refresh": "CREATE TRIGGER config_serves_refresh AFTER INSERT OR UPDATE ON public.config FOR EACH ROW WHEN ((new.key = ANY (ARRAY['access.serves'::text, 'access.serves_derived'::text]))) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
+ "config.config_serves_refresh_delete": "CREATE TRIGGER config_serves_refresh_delete AFTER DELETE ON public.config FOR EACH ROW WHEN ((old.key = ANY (ARRAY['access.serves'::text, 'access.serves_derived'::text]))) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
"config.trust_generation_delete": "CREATE CONSTRAINT TRIGGER trust_generation_delete AFTER DELETE ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((old.key ~~ 'trust.%'::text)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
"config.trust_generation_insert": "CREATE CONSTRAINT TRIGGER trust_generation_insert AFTER INSERT ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((new.key ~~ 'trust.%'::text)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
"config.trust_generation_update": "CREATE CONSTRAINT TRIGGER trust_generation_update AFTER UPDATE ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((((old.key ~~ 'trust.%'::text) OR (new.key ~~ 'trust.%'::text)) AND ((old.key IS DISTINCT FROM new.key) OR (old.value IS DISTINCT FROM new.value)))) EXECUTE FUNCTION gbrain_bump_trust_generation()",
diff --git a/test/fixtures/goldens/catalog/postgres-engine-init-default.json b/test/fixtures/goldens/catalog/postgres-engine-init-default.json
index 926e78d0b8..c1b36ce7fc 100644
--- a/test/fixtures/goldens/catalog/postgres-engine-init-default.json
+++ b/test/fixtures/goldens/catalog/postgres-engine-init-default.json
@@ -614,7 +614,7 @@
"gbrain_access_origin_restricted(p_id integer, p_source_id text, p_type text, fm jsonb)": "RETURNS boolean kind=f lang=plpgsql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=506a29c639348746278d0c472b43a013bf2e39a8e83de4cd3641424116160c6d",
"gbrain_access_pending_covers(p_source text, p_slug text)": "RETURNS boolean kind=f lang=sql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=57448e941169ad1e65fbdab4bbe4572cc7b6f164ef19fd61a3666640e85f253c",
"gbrain_access_readers(fm jsonb)": "RETURNS text[] kind=f lang=sql volatility=i secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=18348cb56089106aaec6470076ee652d7ed3bfbcb20e950a24abd52a21e7a380",
- "gbrain_access_refresh_serves()": "RETURNS void kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=300445289a673b3a75a86ac380a31a9f90b015a1f8ba99ad01e19c07dd03ff8a",
+ "gbrain_access_refresh_serves()": "RETURNS void kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=84f560a40c85f6b17461f0061dd93f9ccb23ece584d434e5d24faae0618780b3",
"gbrain_access_refresh_serves_trigger()": "RETURNS trigger kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=cfc246e282936cd9beb99ac87c59f8121412adf0d7bca856ee70cd939039e764",
"gbrain_access_stamp_folder_rules()": "RETURNS trigger kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=7fb49ce62f4f6153ef0c844a1816f5f5bb7d765b8610ff66fec137283469fc09",
"gbrain_access_state_unreadable()": "RETURNS boolean kind=f lang=sql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=fa6c6edac062270a2fcf9ff3e9c29f16242156e817a3710c273d8da9f5203943",
@@ -4689,8 +4689,8 @@
"access_pending_coverage.access_pending_coverage_mark_restricted": "CREATE TRIGGER access_pending_coverage_mark_restricted AFTER INSERT ON public.access_pending_coverage FOR EACH ROW EXECUTE FUNCTION gbrain_access_mark_restricted()",
"access_rules.access_rules_mark_restricted": "CREATE TRIGGER access_rules_mark_restricted AFTER INSERT ON public.access_rules FOR EACH ROW EXECUTE FUNCTION gbrain_access_mark_restricted()",
"access_tokens.trust_generation_update": "CREATE CONSTRAINT TRIGGER trust_generation_update AFTER UPDATE ON public.access_tokens DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((old.min_trust IS DISTINCT FROM new.min_trust)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
- "config.config_serves_refresh": "CREATE TRIGGER config_serves_refresh AFTER INSERT OR UPDATE ON public.config FOR EACH ROW WHEN ((new.key = 'access.serves'::text)) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
- "config.config_serves_refresh_delete": "CREATE TRIGGER config_serves_refresh_delete AFTER DELETE ON public.config FOR EACH ROW WHEN ((old.key = 'access.serves'::text)) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
+ "config.config_serves_refresh": "CREATE TRIGGER config_serves_refresh AFTER INSERT OR UPDATE ON public.config FOR EACH ROW WHEN ((new.key = ANY (ARRAY['access.serves'::text, 'access.serves_derived'::text]))) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
+ "config.config_serves_refresh_delete": "CREATE TRIGGER config_serves_refresh_delete AFTER DELETE ON public.config FOR EACH ROW WHEN ((old.key = ANY (ARRAY['access.serves'::text, 'access.serves_derived'::text]))) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
"config.trust_generation_delete": "CREATE CONSTRAINT TRIGGER trust_generation_delete AFTER DELETE ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((old.key ~~ 'trust.%'::text)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
"config.trust_generation_insert": "CREATE CONSTRAINT TRIGGER trust_generation_insert AFTER INSERT ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((new.key ~~ 'trust.%'::text)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
"config.trust_generation_update": "CREATE CONSTRAINT TRIGGER trust_generation_update AFTER UPDATE ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((((old.key ~~ 'trust.%'::text) OR (new.key ~~ 'trust.%'::text)) AND ((old.key IS DISTINCT FROM new.key) OR (old.value IS DISTINCT FROM new.value)))) EXECUTE FUNCTION gbrain_bump_trust_generation()",
diff --git a/test/fixtures/goldens/catalog/postgres-engine-init-fts-portuguese.json b/test/fixtures/goldens/catalog/postgres-engine-init-fts-portuguese.json
index 790febc4d5..59d14c2aa7 100644
--- a/test/fixtures/goldens/catalog/postgres-engine-init-fts-portuguese.json
+++ b/test/fixtures/goldens/catalog/postgres-engine-init-fts-portuguese.json
@@ -614,7 +614,7 @@
"gbrain_access_origin_restricted(p_id integer, p_source_id text, p_type text, fm jsonb)": "RETURNS boolean kind=f lang=plpgsql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=506a29c639348746278d0c472b43a013bf2e39a8e83de4cd3641424116160c6d",
"gbrain_access_pending_covers(p_source text, p_slug text)": "RETURNS boolean kind=f lang=sql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=57448e941169ad1e65fbdab4bbe4572cc7b6f164ef19fd61a3666640e85f253c",
"gbrain_access_readers(fm jsonb)": "RETURNS text[] kind=f lang=sql volatility=i secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=18348cb56089106aaec6470076ee652d7ed3bfbcb20e950a24abd52a21e7a380",
- "gbrain_access_refresh_serves()": "RETURNS void kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=300445289a673b3a75a86ac380a31a9f90b015a1f8ba99ad01e19c07dd03ff8a",
+ "gbrain_access_refresh_serves()": "RETURNS void kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=84f560a40c85f6b17461f0061dd93f9ccb23ece584d434e5d24faae0618780b3",
"gbrain_access_refresh_serves_trigger()": "RETURNS trigger kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=cfc246e282936cd9beb99ac87c59f8121412adf0d7bca856ee70cd939039e764",
"gbrain_access_stamp_folder_rules()": "RETURNS trigger kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=7fb49ce62f4f6153ef0c844a1816f5f5bb7d765b8610ff66fec137283469fc09",
"gbrain_access_state_unreadable()": "RETURNS boolean kind=f lang=sql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=fa6c6edac062270a2fcf9ff3e9c29f16242156e817a3710c273d8da9f5203943",
@@ -4689,8 +4689,8 @@
"access_pending_coverage.access_pending_coverage_mark_restricted": "CREATE TRIGGER access_pending_coverage_mark_restricted AFTER INSERT ON public.access_pending_coverage FOR EACH ROW EXECUTE FUNCTION gbrain_access_mark_restricted()",
"access_rules.access_rules_mark_restricted": "CREATE TRIGGER access_rules_mark_restricted AFTER INSERT ON public.access_rules FOR EACH ROW EXECUTE FUNCTION gbrain_access_mark_restricted()",
"access_tokens.trust_generation_update": "CREATE CONSTRAINT TRIGGER trust_generation_update AFTER UPDATE ON public.access_tokens DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((old.min_trust IS DISTINCT FROM new.min_trust)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
- "config.config_serves_refresh": "CREATE TRIGGER config_serves_refresh AFTER INSERT OR UPDATE ON public.config FOR EACH ROW WHEN ((new.key = 'access.serves'::text)) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
- "config.config_serves_refresh_delete": "CREATE TRIGGER config_serves_refresh_delete AFTER DELETE ON public.config FOR EACH ROW WHEN ((old.key = 'access.serves'::text)) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
+ "config.config_serves_refresh": "CREATE TRIGGER config_serves_refresh AFTER INSERT OR UPDATE ON public.config FOR EACH ROW WHEN ((new.key = ANY (ARRAY['access.serves'::text, 'access.serves_derived'::text]))) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
+ "config.config_serves_refresh_delete": "CREATE TRIGGER config_serves_refresh_delete AFTER DELETE ON public.config FOR EACH ROW WHEN ((old.key = ANY (ARRAY['access.serves'::text, 'access.serves_derived'::text]))) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
"config.trust_generation_delete": "CREATE CONSTRAINT TRIGGER trust_generation_delete AFTER DELETE ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((old.key ~~ 'trust.%'::text)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
"config.trust_generation_insert": "CREATE CONSTRAINT TRIGGER trust_generation_insert AFTER INSERT ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((new.key ~~ 'trust.%'::text)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
"config.trust_generation_update": "CREATE CONSTRAINT TRIGGER trust_generation_update AFTER UPDATE ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((((old.key ~~ 'trust.%'::text) OR (new.key ~~ 'trust.%'::text)) AND ((old.key IS DISTINCT FROM new.key) OR (old.value IS DISTINCT FROM new.value)))) EXECUTE FUNCTION gbrain_bump_trust_generation()",
diff --git a/test/fixtures/goldens/catalog/postgres-engine-init-high-dims.json b/test/fixtures/goldens/catalog/postgres-engine-init-high-dims.json
index 79ad4b2d79..1c9c35f09d 100644
--- a/test/fixtures/goldens/catalog/postgres-engine-init-high-dims.json
+++ b/test/fixtures/goldens/catalog/postgres-engine-init-high-dims.json
@@ -614,7 +614,7 @@
"gbrain_access_origin_restricted(p_id integer, p_source_id text, p_type text, fm jsonb)": "RETURNS boolean kind=f lang=plpgsql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=506a29c639348746278d0c472b43a013bf2e39a8e83de4cd3641424116160c6d",
"gbrain_access_pending_covers(p_source text, p_slug text)": "RETURNS boolean kind=f lang=sql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=57448e941169ad1e65fbdab4bbe4572cc7b6f164ef19fd61a3666640e85f253c",
"gbrain_access_readers(fm jsonb)": "RETURNS text[] kind=f lang=sql volatility=i secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=18348cb56089106aaec6470076ee652d7ed3bfbcb20e950a24abd52a21e7a380",
- "gbrain_access_refresh_serves()": "RETURNS void kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=300445289a673b3a75a86ac380a31a9f90b015a1f8ba99ad01e19c07dd03ff8a",
+ "gbrain_access_refresh_serves()": "RETURNS void kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=84f560a40c85f6b17461f0061dd93f9ccb23ece584d434e5d24faae0618780b3",
"gbrain_access_refresh_serves_trigger()": "RETURNS trigger kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=cfc246e282936cd9beb99ac87c59f8121412adf0d7bca856ee70cd939039e764",
"gbrain_access_stamp_folder_rules()": "RETURNS trigger kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=7fb49ce62f4f6153ef0c844a1816f5f5bb7d765b8610ff66fec137283469fc09",
"gbrain_access_state_unreadable()": "RETURNS boolean kind=f lang=sql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=fa6c6edac062270a2fcf9ff3e9c29f16242156e817a3710c273d8da9f5203943",
@@ -4685,8 +4685,8 @@
"access_pending_coverage.access_pending_coverage_mark_restricted": "CREATE TRIGGER access_pending_coverage_mark_restricted AFTER INSERT ON public.access_pending_coverage FOR EACH ROW EXECUTE FUNCTION gbrain_access_mark_restricted()",
"access_rules.access_rules_mark_restricted": "CREATE TRIGGER access_rules_mark_restricted AFTER INSERT ON public.access_rules FOR EACH ROW EXECUTE FUNCTION gbrain_access_mark_restricted()",
"access_tokens.trust_generation_update": "CREATE CONSTRAINT TRIGGER trust_generation_update AFTER UPDATE ON public.access_tokens DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((old.min_trust IS DISTINCT FROM new.min_trust)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
- "config.config_serves_refresh": "CREATE TRIGGER config_serves_refresh AFTER INSERT OR UPDATE ON public.config FOR EACH ROW WHEN ((new.key = 'access.serves'::text)) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
- "config.config_serves_refresh_delete": "CREATE TRIGGER config_serves_refresh_delete AFTER DELETE ON public.config FOR EACH ROW WHEN ((old.key = 'access.serves'::text)) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
+ "config.config_serves_refresh": "CREATE TRIGGER config_serves_refresh AFTER INSERT OR UPDATE ON public.config FOR EACH ROW WHEN ((new.key = ANY (ARRAY['access.serves'::text, 'access.serves_derived'::text]))) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
+ "config.config_serves_refresh_delete": "CREATE TRIGGER config_serves_refresh_delete AFTER DELETE ON public.config FOR EACH ROW WHEN ((old.key = ANY (ARRAY['access.serves'::text, 'access.serves_derived'::text]))) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
"config.trust_generation_delete": "CREATE CONSTRAINT TRIGGER trust_generation_delete AFTER DELETE ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((old.key ~~ 'trust.%'::text)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
"config.trust_generation_insert": "CREATE CONSTRAINT TRIGGER trust_generation_insert AFTER INSERT ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((new.key ~~ 'trust.%'::text)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
"config.trust_generation_update": "CREATE CONSTRAINT TRIGGER trust_generation_update AFTER UPDATE ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((((old.key ~~ 'trust.%'::text) OR (new.key ~~ 'trust.%'::text)) AND ((old.key IS DISTINCT FROM new.key) OR (old.value IS DISTINCT FROM new.value)))) EXECUTE FUNCTION gbrain_bump_trust_generation()",
diff --git a/test/fixtures/goldens/pglite-upgrade-replay/catalog-after-boot.json b/test/fixtures/goldens/pglite-upgrade-replay/catalog-after-boot.json
index 60a4096ea2..647e34ca3f 100644
--- a/test/fixtures/goldens/pglite-upgrade-replay/catalog-after-boot.json
+++ b/test/fixtures/goldens/pglite-upgrade-replay/catalog-after-boot.json
@@ -610,7 +610,7 @@
"gbrain_access_origin_restricted(p_id integer, p_source_id text, p_type text, fm jsonb)": "RETURNS boolean kind=f lang=plpgsql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=506a29c639348746278d0c472b43a013bf2e39a8e83de4cd3641424116160c6d",
"gbrain_access_pending_covers(p_source text, p_slug text)": "RETURNS boolean kind=f lang=sql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=57448e941169ad1e65fbdab4bbe4572cc7b6f164ef19fd61a3666640e85f253c",
"gbrain_access_readers(fm jsonb)": "RETURNS text[] kind=f lang=sql volatility=i secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=18348cb56089106aaec6470076ee652d7ed3bfbcb20e950a24abd52a21e7a380",
- "gbrain_access_refresh_serves()": "RETURNS void kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=300445289a673b3a75a86ac380a31a9f90b015a1f8ba99ad01e19c07dd03ff8a",
+ "gbrain_access_refresh_serves()": "RETURNS void kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=84f560a40c85f6b17461f0061dd93f9ccb23ece584d434e5d24faae0618780b3",
"gbrain_access_refresh_serves_trigger()": "RETURNS trigger kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=cfc246e282936cd9beb99ac87c59f8121412adf0d7bca856ee70cd939039e764",
"gbrain_access_stamp_folder_rules()": "RETURNS trigger kind=f lang=plpgsql volatility=v secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=7fb49ce62f4f6153ef0c844a1816f5f5bb7d765b8610ff66fec137283469fc09",
"gbrain_access_state_unreadable()": "RETURNS boolean kind=f lang=sql volatility=s secdef=false config=[search_path=pg_catalog, public, pg_temp] body_sha256=fa6c6edac062270a2fcf9ff3e9c29f16242156e817a3710c273d8da9f5203943",
@@ -4694,8 +4694,8 @@
"access_pending_coverage.access_pending_coverage_mark_restricted": "CREATE TRIGGER access_pending_coverage_mark_restricted AFTER INSERT ON public.access_pending_coverage FOR EACH ROW EXECUTE FUNCTION gbrain_access_mark_restricted()",
"access_rules.access_rules_mark_restricted": "CREATE TRIGGER access_rules_mark_restricted AFTER INSERT ON public.access_rules FOR EACH ROW EXECUTE FUNCTION gbrain_access_mark_restricted()",
"access_tokens.trust_generation_update": "CREATE CONSTRAINT TRIGGER trust_generation_update AFTER UPDATE ON public.access_tokens DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((old.min_trust IS DISTINCT FROM new.min_trust)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
- "config.config_serves_refresh": "CREATE TRIGGER config_serves_refresh AFTER INSERT OR UPDATE ON public.config FOR EACH ROW WHEN ((new.key = 'access.serves'::text)) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
- "config.config_serves_refresh_delete": "CREATE TRIGGER config_serves_refresh_delete AFTER DELETE ON public.config FOR EACH ROW WHEN ((old.key = 'access.serves'::text)) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
+ "config.config_serves_refresh": "CREATE TRIGGER config_serves_refresh AFTER INSERT OR UPDATE ON public.config FOR EACH ROW WHEN ((new.key = ANY (ARRAY['access.serves'::text, 'access.serves_derived'::text]))) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
+ "config.config_serves_refresh_delete": "CREATE TRIGGER config_serves_refresh_delete AFTER DELETE ON public.config FOR EACH ROW WHEN ((old.key = ANY (ARRAY['access.serves'::text, 'access.serves_derived'::text]))) EXECUTE FUNCTION gbrain_access_refresh_serves_trigger()",
"config.trust_generation_delete": "CREATE CONSTRAINT TRIGGER trust_generation_delete AFTER DELETE ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((old.key ~~ 'trust.%'::text)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
"config.trust_generation_insert": "CREATE CONSTRAINT TRIGGER trust_generation_insert AFTER INSERT ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((new.key ~~ 'trust.%'::text)) EXECUTE FUNCTION gbrain_bump_trust_generation()",
"config.trust_generation_update": "CREATE CONSTRAINT TRIGGER trust_generation_update AFTER UPDATE ON public.config DEFERRABLE INITIALLY DEFERRED FOR EACH ROW WHEN ((((old.key ~~ 'trust.%'::text) OR (new.key ~~ 'trust.%'::text)) AND ((old.key IS DISTINCT FROM new.key) OR (old.value IS DISTINCT FROM new.value)))) EXECUTE FUNCTION gbrain_bump_trust_generation()",
diff --git a/test/requester-scope.test.ts b/test/requester-scope.test.ts
index db312503d9..8712d0af84 100644
--- a/test/requester-scope.test.ts
+++ b/test/requester-scope.test.ts
@@ -176,6 +176,15 @@ for (const kind of testBackends()) {
await engine.unsetConfig('access.serves');
}, 60_000);
+ test('the derived key unset or set to one by hand on a brain that serves several people is derived again at once', async () => {
+ expect(await engine.getConfig('access.serves_derived')).toBe('several');
+ await engine.unsetConfig('access.serves_derived');
+ expect(await engine.getConfig('access.serves_derived')).toBe('several');
+ await engine.setConfig('access.serves_derived', 'one');
+ expect(await engine.getConfig('access.serves_derived')).toBe('several');
+ expect((await brainServes(engine)).serves).toBe('several');
+ }, 60_000);
+
test('over HTTP, an old unbound key inside the grace reads with a notice naming the fix and the date', async () => {
await setSince(1);
await backdate('old-unbound', 2);