Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

fix(security): harden rollback reissue

Alfredo Lopezfadd179ca006
diff --git a/control-api/package-lock.json b/control-api/package-lock.json
index b912e773f..6af284eaa 100644
--- a/control-api/package-lock.json
+++ b/control-api/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-api",
- "version": "0.1.509",
+ "version": "0.1.510",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-api",
- "version": "0.1.509",
+ "version": "0.1.510",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/image-policy": "file:../packages/image-policy",
diff --git a/control-api/package.json b/control-api/package.json
index 3b32a33e1..60fc209af 100644
--- a/control-api/package.json
+++ b/control-api/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-api",
- "version": "0.1.509",
+ "version": "0.1.510",
"description": "Internal Clerum control plane REST API + UI for managing CRDs and secrets",
"main": "dist/main.js",
"engines": {
diff --git a/control-api/src/services/mcpSecretRollbackPermitService.ts b/control-api/src/services/mcpSecretRollbackPermitService.ts
index d83783e29..8e4be0391 100644
--- a/control-api/src/services/mcpSecretRollbackPermitService.ts
+++ b/control-api/src/services/mcpSecretRollbackPermitService.ts
@@ -74,7 +74,9 @@ export async function issueMcpSecretRollbackPermit(
uid = EXCLUDED.uid,
resource_version = EXCLUDED.resource_version,
expires_at = EXCLUDED.expires_at,
- created_at = statement_timestamp()`,
+ created_at = statement_timestamp(),
+ claim_token = NULL,
+ claim_expires_at = NULL`,
params
)
}
diff --git a/control-api/src/services/registryClient.ts b/control-api/src/services/registryClient.ts
index 0873a7231..af5e957a9 100644
--- a/control-api/src/services/registryClient.ts
+++ b/control-api/src/services/registryClient.ts
@@ -536,6 +536,7 @@ export async function downloadBundle(name: string, version: string): Promise<Buf
{ timeoutMs: BUNDLE_TIMEOUT_MS }
)
if (!res.ok) {
+ await discardResponseBody(res)
throw new Error(`Registry ${res.status}`)
}
const arrayBuffer = await res.arrayBuffer()
diff --git a/control-api/test/registryClient.test.ts b/control-api/test/registryClient.test.ts
index 653996c58..24ce2f792 100644
--- a/control-api/test/registryClient.test.ts
+++ b/control-api/test/registryClient.test.ts
@@ -184,7 +184,7 @@ describe('registryClient — mintToken cache behavior', () => {
describe('registryClient — bundle response lifecycle', () => {
it('cancels a non-OK bundle response body before throwing', async () => {
- const response = new Response('bundle unavailable', { status: 502 })
+ const response = new Response('bundle missing', { status: 404 })
const cancel = vi.spyOn(response.body!, 'cancel')
vi.stubGlobal(
'fetch',
diff --git a/control-api/test/services.mcpSecretRollbackPermit.realPostgres.integration.test.ts b/control-api/test/services.mcpSecretRollbackPermit.realPostgres.integration.test.ts
index ae0207fc3..7ede25132 100644
--- a/control-api/test/services.mcpSecretRollbackPermit.realPostgres.integration.test.ts
+++ b/control-api/test/services.mcpSecretRollbackPermit.realPostgres.integration.test.ts
@@ -215,4 +215,37 @@ describeRealPostgres('MCP Secret rollback permits on real PostgreSQL', () => {
expect(reclaimed).not.toBeNull()
expect(reclaimed!.claimToken).not.toBe(first!.claimToken)
})
+
+ it('prevents an old claim from finalizing a reissued permit for a new identity', async () => {
+ const original = { ...basePermit, name: `${basePermit.name}-reissue` }
+ await issueMcpSecretRollbackPermit(original, pool)
+ const oldClaim = await claimMcpSecretRollbackPermit(
+ { sessionJti: original.sessionJti, namespace: original.namespace, name: original.name },
+ pool
+ )
+ expect(oldClaim).not.toBeNull()
+
+ const replacement = { ...original, uid: `${original.uid}-replacement`, resourceVersion: '1' }
+ await issueMcpSecretRollbackPermit(replacement, pool)
+ await finalizeMcpSecretRollbackPermitClaim(
+ {
+ sessionJti: original.sessionJti,
+ namespace: original.namespace,
+ name: original.name,
+ claimToken: oldClaim!.claimToken,
+ },
+ pool
+ )
+
+ await expect(
+ claimMcpSecretRollbackPermit(
+ {
+ sessionJti: replacement.sessionJti,
+ namespace: replacement.namespace,
+ name: replacement.name,
+ },
+ pool
+ )
+ ).resolves.toMatchObject({ uid: replacement.uid, resourceVersion: '1' })
+ })
})
diff --git a/control-api/test/services.mcpSecretRollbackPermit.test.ts b/control-api/test/services.mcpSecretRollbackPermit.test.ts
index 406d8f4aa..acb4e37a2 100644
--- a/control-api/test/services.mcpSecretRollbackPermit.test.ts
+++ b/control-api/test/services.mcpSecretRollbackPermit.test.ts
@@ -49,6 +49,8 @@ describe('mcpSecretRollbackPermitService', () => {
expect((insert?.[1] as unknown[])[0]).toHaveLength(32)
const cleanupSql = String(query.mock.calls[0]?.[0])
expect(cleanupSql).toContain('LIMIT 100')
+ expect(String(insert?.[0])).toContain('claim_token = NULL')
+ expect(String(insert?.[0])).toContain('claim_expires_at = NULL')
expect(JSON.stringify(query.mock.calls)).not.toContain(permit.sessionJti)
})