Skip to content

Garry's Opinionated OpenClaw/Hermes Agent Brain

TypeScript

fix: pre-landing review fixes (member email race refuses email_taken; access_admin audit rows are not client usage)

garrytand687b152b13e
diff --git a/src/core/access/members.ts b/src/core/access/members.ts
index 08a23bf98b..02e0b1735f 100644
--- a/src/core/access/members.ts
+++ b/src/core/access/members.ts
@@ -132,6 +132,13 @@ async function assertEmailFree(engine: BrainEngine, email: string, memberId: str
'An email finds exactly one member, so it is unique per brain.');
}
+/** A write that lost a race for one email (23505 on access_members_email_key, both engines' error shapes) refuses as assertEmailFree does. */
+async function refuseEmailRace(engine: BrainEngine, error: unknown, email: string | null, memberId: string): Promise<never> {
+ const e = (error ?? {}) as Record<string, unknown>;
+ if (email !== null && String(e.code) === '23505' && (e.constraint_name ?? e.constraint) === 'access_members_email_key') await assertEmailFree(engine, email, memberId);
+ throw error;
+}
+
/** GST-1158: the one member whose declared email is `raw`; not_found when none, refused when several. Never creates one. */
export async function memberByEmail(engine: BrainEngine, raw: unknown): Promise<MemberRecord> {
const email = assertMemberEmail(raw);
@@ -205,7 +212,7 @@ export async function addMember(engine: BrainEngine, rawId: unknown, opts: { nam
created = await ensureGroups(tx, groups);
for (const g of groups) await tx.executeRaw('INSERT INTO access_group_members (group_id, member_id) VALUES ($1, $2) ON CONFLICT DO NOTHING', [g, id]);
if (bindTarget) await tx.executeRaw('UPDATE access_tokens SET member_id = $2 WHERE id::text = $1', [bindTarget.id, id]);
- });
+ }).catch(error => refuseEmailRace(engine, error, email, id));
return { member: (await getMember(engine, id))!, groups_created: created, bound: bindTarget };
}
@@ -226,7 +233,7 @@ export async function setMemberEmail(engine: BrainEngine, rawId: unknown, rawEma
const email = rawEmail === null ? null : assertMemberEmail(rawEmail);
if (email === member.email) return { member, changed: false };
if (email !== null) await assertEmailFree(engine, email, member.id);
- await engine.executeRaw('UPDATE access_members SET email = $2, updated_at = now() WHERE id = $1', [member.id, email]);
+ await engine.executeRaw('UPDATE access_members SET email = $2, updated_at = now() WHERE id = $1', [member.id, email]).catch(error => refuseEmailRace(engine, error, email, member.id));
return { member: (await getMember(engine, member.id))!, changed: true };
}
diff --git a/src/core/mcp-usage.ts b/src/core/mcp-usage.ts
index a526193a03..6e7cec6325 100644
--- a/src/core/mcp-usage.ts
+++ b/src/core/mcp-usage.ts
@@ -53,6 +53,8 @@ export const NON_OP_LOG_ROWS: ReadonlySet<string> = new Set([
'surface_change',
// GBRA-219 memory settings audit rows (src/core/facts/writeback-settings.ts).
'memory_setting_change',
+ // GST-1094 owner access administration audit rows (src/commands/serve-http-access.ts).
+ 'access_admin',
]);
/** Legacy bearer transport row prefix — 'tools/call:query' means op 'query'. */
diff --git a/test/access-members.test.ts b/test/access-members.test.ts
index 5f41cad560..821faee408 100644
--- a/test/access-members.test.ts
+++ b/test/access-members.test.ts
@@ -202,5 +202,17 @@ for (const kind of testBackends()) {
expect(await refusal(setMemberEmail(engine, 'hal-example', '[email protected]'))).toEqual({ code: 'access_member_id_retired' });
expect((await addMember(engine, 'hal2-example', { email: '[email protected]' })).member.email).toBe('[email protected]');
});
+
+ test('GST-1158: two concurrent declarations of one email refuse the second with email_taken, never a raw unique violation', async () => {
+ await addMember(engine, 'ivy-example');
+ await addMember(engine, 'jon-example');
+ const set = await Promise.allSettled([setMemberEmail(engine, 'ivy-example', '[email protected]'), setMemberEmail(engine, 'jon-example', '[email protected]')]);
+ expect(set.filter(r => r.status === 'fulfilled')).toHaveLength(1);
+ for (const r of set) if (r.status === 'rejected') expect(await refusal(Promise.reject(r.reason))).toEqual({ code: 'access_member_invalid', reason: 'email_taken' });
+ const add = await Promise.allSettled([addMember(engine, 'kim-example', { email: '[email protected]' }), addMember(engine, 'lee-example', { email: '[email protected]' })]);
+ expect(add.filter(r => r.status === 'fulfilled')).toHaveLength(1);
+ for (const r of add) if (r.status === 'rejected') expect(await refusal(Promise.reject(r.reason))).toEqual({ code: 'access_member_invalid', reason: 'email_taken' });
+ expect((await listMembers(engine)).filter(m => m.id === 'kim-example' || m.id === 'lee-example')).toHaveLength(1);
+ });
});
}
diff --git a/test/serve-http-access.test.ts b/test/serve-http-access.test.ts
index 35d1d0a767..b588d896f0 100644
--- a/test/serve-http-access.test.ts
+++ b/test/serve-http-access.test.ts
@@ -27,6 +27,7 @@ import { listMemberLinks } from '../src/core/access/actor.ts';
import { mountAdminAccess } from '../src/commands/serve-http-access.ts';
import { createRequireAdmin } from '../src/commands/serve-http-admin-api.ts';
import { operations } from '../src/core/operations.ts';
+import { readClientOpUsage } from '../src/core/mcp-usage.ts';
import { testBackends } from './helpers/test-backends.ts';
import { isolatedPersistencePostgres } from './helpers/persistence-postgres.ts';
@@ -189,5 +190,23 @@ for (const kind of testBackends()) {
expect((await audits()).filter(a => a.action === 'client_attest').map(a => [a.client_id, a.attest_actor]))
.toEqual([[qm.clientId, 'qm'], [qm.clientId, null]]);
});
+
+ test('GST-1113: clearing the attest right over HTTP clears attest_sources too, as auth rescope does', async () => {
+ const scope = 'scope-http-' + randomUUID().slice(0, 8);
+ await engine.executeRaw('INSERT INTO sources (id, name) VALUES ($1, $1)', [scope]);
+ const qm = await register('qm-scope', ['client_credentials']);
+ await bindCredential(engine, { kind: 'client', id: qm.clientId }, { attestActor: 'qm', attestOps: ['get_write_request', 'memory_recall', 'memory_write'], attestSources: [scope] });
+ const row = async () => (await engine.executeRaw<Record<string, unknown>>('SELECT attest_actor, attest_ops, attest_sources FROM oauth_clients WHERE client_id = $1', [qm.clientId]))[0];
+ expect((await call('POST', '/admin/api/access/attest', { clientId: qm.clientId, attestActor: null, dryRun: true })).json).toMatchObject({ applied: false, changed: true });
+ expect(await row()).toMatchObject({ attest_actor: 'qm', attest_sources: [scope] });
+ expect((await call('POST', '/admin/api/access/attest', { clientId: qm.clientId, attestActor: null })).json).toMatchObject({ applied: true, attest_actor: null });
+ expect(await row()).toEqual({ attest_actor: null, attest_ops: null, attest_sources: null });
+ });
+
+ test('the audit rows an applied change writes are never read as client usage', async () => {
+ expect((await call('POST', '/admin/api/access/members', { action: 'add', id: 'usage-example' })).json).toMatchObject({ applied: true });
+ expect((await audits()).some(a => a.action === 'member_add' && a.member === 'usage-example')).toBe(true);
+ expect((await readClientOpUsage(engine)).map(u => u.token_name)).not.toContain('admin-api');
+ });
});
}