Skip to content

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

TypeScript

fix(control-ui): serialize approval-team writes and cover read edge 429s (F4)

Alfredo Lopezcd6fab899683
diff --git a/control-api/package-lock.json b/control-api/package-lock.json
index 0db0d5b9e..5e0e3ce8a 100644
--- a/control-api/package-lock.json
+++ b/control-api/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-api",
- "version": "0.1.485",
+ "version": "0.1.486",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-api",
- "version": "0.1.485",
+ "version": "0.1.486",
"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 ff8164e83..34f2cf676 100644
--- a/control-api/package.json
+++ b/control-api/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-api",
- "version": "0.1.485",
+ "version": "0.1.486",
"description": "Internal Clerum control plane REST API + UI for managing CRDs and secrets",
"main": "dist/main.js",
"engines": {
diff --git a/control-api/src/routes/workflows/shared/rateLimit.ts b/control-api/src/routes/workflows/shared/rateLimit.ts
index a02a0992f..305d7c377 100644
--- a/control-api/src/routes/workflows/shared/rateLimit.ts
+++ b/control-api/src/routes/workflows/shared/rateLimit.ts
@@ -70,33 +70,28 @@ function workflowGrantEdgeRateLimitHandler(_req: Request, res: Response): void {
res.status(429).json({ error: 'Too Many Requests', retryAfterSeconds })
}
-/**
- * CodeQL-visible edge backstop for admin workflow grant reads. The PG-backed
- * workflowGrantReadRateLimit() remains the cross-replica source of truth.
- */
-export function workflowGrantReadEdgeRateLimit() {
+function createWorkflowEdgeRateLimit(prefix: string, limit: number) {
return rateLimit({
windowMs: 60_000,
- limit: WORKFLOW_GRANT_READ_PER_MINUTE,
+ limit,
standardHeaders: 'draft-7',
legacyHeaders: false,
skip: shouldSkipWorkflowGrantEdgeRateLimit,
- keyGenerator: workflowGrantEdgeRateKey('workflow_grants_read_edge'),
+ keyGenerator: workflowGrantEdgeRateKey(prefix),
handler: workflowGrantEdgeRateLimitHandler,
})
}
-/** CodeQL-visible edge backstop paired with workflowGrantWriteRateLimit(). */
+/**
+ * Fresh stack per call so route tests stay isolated. Shared MemoryStore
+ * across grant-write registrations is a follow-up (Low 1), not this PR.
+ */
+export function workflowGrantReadEdgeRateLimit() {
+ return createWorkflowEdgeRateLimit('workflow_grants_read_edge', WORKFLOW_GRANT_READ_PER_MINUTE)
+}
+
export function workflowGrantWriteEdgeRateLimit() {
- return rateLimit({
- windowMs: 60_000,
- limit: WORKFLOW_GRANT_WRITE_PER_MINUTE,
- standardHeaders: 'draft-7',
- legacyHeaders: false,
- skip: shouldSkipWorkflowGrantEdgeRateLimit,
- keyGenerator: workflowGrantEdgeRateKey('workflow_grants_write_edge'),
- handler: workflowGrantEdgeRateLimitHandler,
- })
+ return createWorkflowEdgeRateLimit('workflow_grants_write_edge', WORKFLOW_GRANT_WRITE_PER_MINUTE)
}
export function workflowGrantReadRateLimits() {
@@ -108,27 +103,11 @@ export function workflowGrantWriteRateLimits() {
}
function workflowAdminReadEdgeRateLimit() {
- return rateLimit({
- windowMs: 60_000,
- limit: WORKFLOW_ADMIN_READ_PER_MINUTE,
- standardHeaders: 'draft-7',
- legacyHeaders: false,
- skip: shouldSkipWorkflowGrantEdgeRateLimit,
- keyGenerator: workflowGrantEdgeRateKey('workflow_admin_read_edge'),
- handler: workflowGrantEdgeRateLimitHandler,
- })
+ return createWorkflowEdgeRateLimit('workflow_admin_read_edge', WORKFLOW_ADMIN_READ_PER_MINUTE)
}
function adminOutputsReadEdgeRateLimit() {
- return rateLimit({
- windowMs: 60_000,
- limit: ADMIN_OUTPUTS_READ_PER_MINUTE,
- standardHeaders: 'draft-7',
- legacyHeaders: false,
- skip: shouldSkipWorkflowGrantEdgeRateLimit,
- keyGenerator: workflowGrantEdgeRateKey('admin_outputs_read_edge'),
- handler: workflowGrantEdgeRateLimitHandler,
- })
+ return createWorkflowEdgeRateLimit('admin_outputs_read_edge', ADMIN_OUTPUTS_READ_PER_MINUTE)
}
export function workflowAdminReadRateLimits() {
diff --git a/control-api/test/workflows.shared.rateLimit.test.ts b/control-api/test/workflows.shared.rateLimit.test.ts
index fc9978e08..f7dda53cb 100644
--- a/control-api/test/workflows.shared.rateLimit.test.ts
+++ b/control-api/test/workflows.shared.rateLimit.test.ts
@@ -2,10 +2,13 @@ import { describe, expect, it, vi } from 'vitest'
import express from 'express'
import request from 'supertest'
import {
+ adminOutputsReadRateLimits,
adminWorkflowRateLimitCredential,
shouldSkipWorkflowGrantEdgeRateLimit,
+ workflowAdminReadRateLimits,
workflowGrantEdgeRateLimitKey,
workflowGrantReadRateLimit,
+ workflowGrantReadRateLimits,
workflowGrantWriteRateLimits,
} from '../src/routes/workflows/shared/rateLimit.js'
@@ -42,6 +45,13 @@ describe('routes/workflows/shared/rateLimit', () => {
expect(adminWorkflowRateLimitCredential(req)).toBe('admin-cookie-token')
})
+ it('rate-limit factories pair an edge backstop with the PG limiter', () => {
+ expect(workflowGrantReadRateLimits()).toHaveLength(2)
+ expect(workflowGrantWriteRateLimits()).toHaveLength(2)
+ expect(workflowAdminReadRateLimits()).toHaveLength(2)
+ expect(adminOutputsReadRateLimits()).toHaveLength(2)
+ })
+
it('shouldSkipWorkflowGrantEdgeRateLimit skips anonymous callers', () => {
const req = { header: () => undefined, ip: '203.0.113.10' } as express.Request
expect(shouldSkipWorkflowGrantEdgeRateLimit(req)).toBe(true)
@@ -79,35 +89,80 @@ describe('routes/workflows/shared/rateLimit', () => {
)
})
- it('workflowGrantWriteRateLimits returns 429 from the real edge factory on the 21st cookie request', async () => {
- mockCheckAndIncrement.mockReset()
- pgAllows()
-
- const app = express()
- app.put('/grants', ...workflowGrantWriteRateLimits(), (_req, res) => {
- res.status(200).json({ ok: true })
- })
+ it.each([
+ {
+ label: 'workflowGrantWriteRateLimits',
+ method: 'put' as const,
+ limit: 20,
+ cookie: 'write-edge-cookie',
+ mount: (app: express.Express) => {
+ app.put('/probe', ...workflowGrantWriteRateLimits(), (_req, res) => {
+ res.status(200).json({ ok: true })
+ })
+ },
+ },
+ {
+ label: 'workflowGrantReadRateLimits',
+ method: 'get' as const,
+ limit: 60,
+ cookie: 'grant-read-edge-cookie',
+ mount: (app: express.Express) => {
+ app.get('/probe', ...workflowGrantReadRateLimits(), (_req, res) => {
+ res.status(200).json({ ok: true })
+ })
+ },
+ },
+ {
+ label: 'workflowAdminReadRateLimits',
+ method: 'get' as const,
+ limit: 60,
+ cookie: 'admin-read-edge-cookie',
+ mount: (app: express.Express) => {
+ app.get('/probe', ...workflowAdminReadRateLimits(), (_req, res) => {
+ res.status(200).json({ ok: true })
+ })
+ },
+ },
+ {
+ label: 'adminOutputsReadRateLimits',
+ method: 'get' as const,
+ limit: 30,
+ cookie: 'outputs-read-edge-cookie',
+ mount: (app: express.Express) => {
+ app.get('/probe', ...adminOutputsReadRateLimits(), (_req, res) => {
+ res.status(200).json({ ok: true })
+ })
+ },
+ },
+ ])(
+ '$label returns 429 from the real edge factory after the quota',
+ async ({ method, limit, cookie, mount }) => {
+ mockCheckAndIncrement.mockReset()
+
+ const app = express()
+ mount(app)
+
+ for (let i = 0; i < limit; i++) {
+ pgAllows()
+ await request(app)
+ [method]('/probe')
+ .set('Cookie', `control_ui_admin_session=${cookie}`)
+ .expect(200)
+ }
- for (let i = 0; i < 20; i++) {
pgAllows()
- await request(app)
- .put('/grants')
- .set('Cookie', 'control_ui_admin_session=admin-cookie-token')
- .expect(200)
+ const res = await request(app)
+ [method]('/probe')
+ .set('Cookie', `control_ui_admin_session=${cookie}`)
+ .expect(429)
+
+ expect(res.body).toMatchObject({
+ error: 'Too Many Requests',
+ retryAfterSeconds: expect.any(Number),
+ })
+ expect(res.headers['retry-after']).toBeDefined()
}
-
- pgAllows()
- const res = await request(app)
- .put('/grants')
- .set('Cookie', 'control_ui_admin_session=admin-cookie-token')
- .expect(429)
-
- expect(res.body).toMatchObject({
- error: 'Too Many Requests',
- retryAfterSeconds: expect.any(Number),
- })
- expect(res.headers['retry-after']).toBeDefined()
- })
+ )
it('workflowGrantWriteRateLimits does not edge-limit anonymous callers', async () => {
mockCheckAndIncrement.mockReset()
diff --git a/control-ui/components/WorkflowAccessPanel/index.tsx b/control-ui/components/WorkflowAccessPanel/index.tsx
index 731077785..59430b77d 100644
--- a/control-ui/components/WorkflowAccessPanel/index.tsx
+++ b/control-ui/components/WorkflowAccessPanel/index.tsx
@@ -296,12 +296,28 @@ export function WorkflowAccessPanel(props: WorkflowAccessPanelProps): React.JSX.
const added = nextTeamIds.filter(id => !current.includes(id))
const removed = current.filter(id => !nextTeamIds.includes(id))
setSectionPatch('approval-target-teams', { mutating: true, mutateError: null })
+ const errors: string[] = []
try {
- await Promise.all([
- ...added.map(teamId => allowWorkflowApprovalTeam(namespace, recipeName, teamId)),
- ...removed.map(teamId => revokeWorkflowApprovalTeam(namespace, recipeName, teamId)),
- ])
+ // Serialize allow/revoke so a shared 20/min grant-write bucket cannot
+ // leave a partial write behind a Promise.all rejection.
+ for (const teamId of added) {
+ try {
+ await allowWorkflowApprovalTeam(namespace, recipeName, teamId)
+ } catch (error) {
+ errors.push(error instanceof Error ? error.message : String(error))
+ }
+ }
+ for (const teamId of removed) {
+ try {
+ await revokeWorkflowApprovalTeam(namespace, recipeName, teamId)
+ } catch (error) {
+ errors.push(error instanceof Error ? error.message : String(error))
+ }
+ }
await loadApprovalTeams()
+ if (errors.length > 0) {
+ throw new Error(errors.join('; '))
+ }
if (added.length > 0) {
showToast('Approval target team allowed.', { tone: 'success' })
} else if (removed.length > 0) {
diff --git a/control-ui/package-lock.json b/control-ui/package-lock.json
index 875b41811..f82798ed4 100644
--- a/control-ui/package-lock.json
+++ b/control-ui/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-ui",
- "version": "0.1.442",
+ "version": "0.1.443",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-ui",
- "version": "0.1.442",
+ "version": "0.1.443",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/llm-providers": "file:../packages/llm-providers",
diff --git a/control-ui/package.json b/control-ui/package.json
index 903f97ff5..930743b63 100644
--- a/control-ui/package.json
+++ b/control-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-ui",
- "version": "0.1.442",
+ "version": "0.1.443",
"private": true,
"scripts": {
"dev": "NEXT_IGNORE_INCORRECT_LOCKFILE=1 next dev",