Skip to content

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

TypeScript

fix(control-api): resolve CodeQL alerts on F4 test harness

Alfredo Lopez4345d6845d5a
diff --git a/control-api/package-lock.json b/control-api/package-lock.json
index 96d3badce..a96253c29 100644
--- a/control-api/package-lock.json
+++ b/control-api/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-api",
- "version": "0.1.477",
+ "version": "0.1.478",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-api",
- "version": "0.1.477",
+ "version": "0.1.478",
"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 b1393ab58..37d7af3a5 100644
--- a/control-api/package.json
+++ b/control-api/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-api",
- "version": "0.1.477",
+ "version": "0.1.478",
"description": "Internal Clerum control plane REST API + UI for managing CRDs and secrets",
"main": "dist/main.js",
"engines": {
diff --git a/control-api/test/middleware.controlUIAuth.test.ts b/control-api/test/middleware.controlUIAuth.test.ts
index 2fa918111..0c8fbe163 100644
--- a/control-api/test/middleware.controlUIAuth.test.ts
+++ b/control-api/test/middleware.controlUIAuth.test.ts
@@ -3,6 +3,7 @@ import express from 'express'
import request from 'supertest'
import type { UiAuthedRequest } from '../src/middleware/controlUIAuth.js'
import { requireAuthForControlUI } from '../src/middleware/controlUIAuth.js'
+import { rateLimitMiddleware } from '../src/middleware/rateLimitMiddleware.js'
const adminTokenMock = vi.hoisted(() => ({
verifyAdminToken: vi.fn(),
@@ -13,8 +14,22 @@ const adminSvcMock = vi.hoisted(() => ({
isAdminTokenRevoked: vi.fn(),
}))
+const mockCheckAndIncrement = vi.hoisted(() => vi.fn())
+
vi.mock('../src/utils/auth/adminAuthToken.js', () => adminTokenMock)
vi.mock('../src/services/adminAuthService.js', () => adminSvcMock)
+vi.mock('../src/services/rateLimiterService.js', () => ({
+ checkAndIncrement: (...args: unknown[]) => mockCheckAndIncrement(...args),
+}))
+vi.mock('../src/observability/metrics.js', () => ({
+ rateLimitHitsTotal: { inc: vi.fn() },
+}))
+
+const testAuthRateLimit = rateLimitMiddleware({
+ bucketType: 'control_ui_auth_test',
+ maxPerMinute: 100,
+ getBucketKey: () => 'control-ui-auth-test',
+})
const BASE_CLAIMS = {
sub: 'admin-id',
@@ -27,7 +42,7 @@ const BASE_CLAIMS = {
function makeProtectedApp() {
const app = express()
- app.get('/protected', requireAuthForControlUI, (req: UiAuthedRequest, res) => {
+ app.get('/protected', testAuthRateLimit, requireAuthForControlUI, (req: UiAuthedRequest, res) => {
res.status(200).json({ adminId: req.adminAuth?.sub })
})
return app
@@ -38,6 +53,14 @@ describe('middleware/controlUIAuth', () => {
adminTokenMock.verifyAdminToken.mockReset()
adminSvcMock.findAdminById.mockReset()
adminSvcMock.isAdminTokenRevoked.mockReset()
+ mockCheckAndIncrement.mockReset()
+ mockCheckAndIncrement.mockResolvedValue({
+ allowed: true,
+ remaining: 99,
+ resetMs: Date.now() + 60_000,
+ windowStartMs: Date.now(),
+ count: 1,
+ })
})
it('accepts the HttpOnly admin session cookie as the UI auth token', async () => {
@@ -115,7 +138,7 @@ describe('middleware/controlUIAuth', () => {
adminSvcMock.findAdminById.mockRejectedValue(new Error('pg connection terminated'))
const app = express()
- app.get('/protected', requireAuthForControlUI, (_req, res) => {
+ app.get('/protected', testAuthRateLimit, requireAuthForControlUI, (_req, res) => {
res.status(200).json({ ok: true })
})
app.use(
diff --git a/control-api/test/routes.adminWorkflows.test.ts b/control-api/test/routes.adminWorkflows.test.ts
index 035c6fbe9..81d7c7cb4 100644
--- a/control-api/test/routes.adminWorkflows.test.ts
+++ b/control-api/test/routes.adminWorkflows.test.ts
@@ -2468,7 +2468,6 @@ describe('routes/admin/workflows', () => {
describe('live administrator session enforcement (F4)', () => {
const VALID_TEAM_UUID = '11111111-2222-4333-8444-555555555555'
- const VALID_GRANT_UUID = 'aaaaaaaa-bbbb-4ccc-8ddd-eeeeeeeeeeee'
const RUN_ID = '00000000-0000-4000-8000-000000000456'
async function seedRecipe(): Promise<void> {