Skip to content

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

TypeScript

fix(auth): clear complete password quota metadata (RP-003)

Josué5c3b59745d3e
diff --git a/control-api/package-lock.json b/control-api/package-lock.json
index b3f1d2c97..758392154 100644
--- a/control-api/package-lock.json
+++ b/control-api/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-api",
- "version": "0.1.729",
+ "version": "0.1.730",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-api",
- "version": "0.1.729",
+ "version": "0.1.730",
"dependencies": {
"@clerum/display-field": "file:../packages/display-field",
"@clerum/grok-provider-attempt-contract": "file:../packages/grok-provider-attempt-contract",
diff --git a/control-api/package.json b/control-api/package.json
index f14702c93..36fddb2cd 100644
--- a/control-api/package.json
+++ b/control-api/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-api",
- "version": "0.1.729",
+ "version": "0.1.730",
"description": "Internal Clerum control plane REST API + UI for managing CRDs and secrets",
"main": "dist/main.js",
"engines": {
diff --git a/control-api/src/middleware/passwordLoginAdmission.ts b/control-api/src/middleware/passwordLoginAdmission.ts
index aab5842fa..27a80a628 100644
--- a/control-api/src/middleware/passwordLoginAdmission.ts
+++ b/control-api/src/middleware/passwordLoginAdmission.ts
@@ -3,7 +3,7 @@ import { isIP } from 'node:net'
import { z } from 'zod'
import { PASSWORD_ADMISSION_POLICY } from '../services/auth/passwordAdmissionState.js'
import { PasswordAdmissionError } from '../services/auth/passwordCredentialVerification.js'
-import { rateLimitMiddleware } from './rateLimitMiddleware.js'
+import { clearRateLimitHeaders, rateLimitMiddleware } from './rateLimitMiddleware.js'
const credentials = z.object({
email: z.string().trim().min(1).max(320),
@@ -12,14 +12,7 @@ const credentials = z.object({
export function sendPasswordAdmissionError(error: unknown, res: Response): boolean {
if (!(error instanceof PasswordAdmissionError)) return false
- for (const name of [
- 'X-RateLimit-Limit',
- 'X-RateLimit-Remaining',
- 'X-RateLimit-Reset',
- 'RateLimit',
- 'RateLimit-Policy',
- ])
- res.removeHeader(name)
+ clearRateLimitHeaders(res)
res.setHeader('Cache-Control', 'no-store')
res.setHeader('Retry-After', String(error.retryAfterSeconds))
res.status(error.status).json({
diff --git a/control-api/src/middleware/rateLimitMiddleware.ts b/control-api/src/middleware/rateLimitMiddleware.ts
index 2848047f3..9a466a1d6 100644
--- a/control-api/src/middleware/rateLimitMiddleware.ts
+++ b/control-api/src/middleware/rateLimitMiddleware.ts
@@ -125,6 +125,18 @@ export function rateLimitMiddleware(
}
}
+/** Remove every quota family when no authoritative count may be advertised. */
+export function clearRateLimitHeaders(res: Response): void {
+ res.removeHeader('X-RateLimit-Limit')
+ res.removeHeader('X-RateLimit-Remaining')
+ res.removeHeader('X-RateLimit-Reset')
+ res.removeHeader('RateLimit')
+ res.removeHeader('RateLimit-Policy')
+ res.removeHeader('RateLimit-Limit')
+ res.removeHeader('RateLimit-Remaining')
+ res.removeHeader('RateLimit-Reset')
+}
+
/**
* The limiter behind `rateLimitMiddleware`, for a route that can only derive
* its key inside the handler (after authenticating the caller). Create it once
@@ -149,14 +161,7 @@ export function createRateLimitEnforcer(opts: RateLimitEnforcerOptions): RateLim
'rate limit backend unavailable'
)
}
- res.removeHeader('X-RateLimit-Limit')
- res.removeHeader('X-RateLimit-Remaining')
- res.removeHeader('X-RateLimit-Reset')
- res.removeHeader('RateLimit')
- res.removeHeader('RateLimit-Policy')
- res.removeHeader('RateLimit-Limit')
- res.removeHeader('RateLimit-Remaining')
- res.removeHeader('RateLimit-Reset')
+ clearRateLimitHeaders(res)
res.setHeader('Retry-After', String(RATE_LIMIT_BACKEND_RETRY_AFTER_SECONDS))
res.setHeader('Cache-Control', 'no-store')
res.status(503).json({
diff --git a/control-api/test/rp003.passwordHeaders.realPostgres.integration.test.ts b/control-api/test/rp003.passwordHeaders.realPostgres.integration.test.ts
new file mode 100644
index 000000000..c93fd9e94
--- /dev/null
+++ b/control-api/test/rp003.passwordHeaders.realPostgres.integration.test.ts
@@ -0,0 +1,141 @@
+import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
+import express from 'express'
+import { createPublicKey, randomBytes } from 'node:crypto'
+import type { Server } from 'node:http'
+import { Pool } from 'pg'
+import request from 'supertest'
+import { endPoolAndWaitForClients } from './helpers/realPostgresTeardown.js'
+
+const quotaHeaders = [
+ 'x-ratelimit-limit',
+ 'x-ratelimit-remaining',
+ 'x-ratelimit-reset',
+ 'ratelimit',
+ 'ratelimit-policy',
+ 'ratelimit-limit',
+ 'ratelimit-remaining',
+ 'ratelimit-reset',
+]
+const adminUrl = process.env.CONTROL_API_REAL_PG_ADMIN_URL
+const realPg = adminUrl ? describe : describe.skip
+realPg('RP-003 complete password admission response metadata', () => {
+ const database = `rp003_${randomBytes(6).toString('hex')}`
+ const email = '[email protected]'
+ const serviceToken = `synthetic-${randomBytes(16).toString('hex')}`
+ let admin: Pool
+ let db: typeof import('../src/db.js')
+ let engine: typeof import('../src/services/auth/passwordCredentialVerification.js')
+ let app: express.Express, edge: express.Express, server: Server
+ let externalConfig: (typeof import('../../external-rest-api/src/config.js'))['config']
+ let previousUrl: string, previousToken: string
+ beforeAll(async () => {
+ admin = new Pool({ connectionString: adminUrl })
+ await admin.query(`CREATE DATABASE "${database}"`)
+ const url = new URL(adminUrl!)
+ url.pathname = `/${database}`
+ vi.stubEnv('CONTROL_API_PG_CONNECTION_STRING', url.toString())
+ vi.stubEnv('CONTROL_API_INTERNAL_SERVICE_TOKENS', `external-rest-api=${serviceToken}`)
+ vi.stubEnv(
+ 'EXTERNAL_REST_API_JWT_PUBLIC_KEY',
+ createPublicKey(process.env.CONTROL_API_SESSION_JWT_PRIVATE_KEY!)
+ .export({ type: 'spki', format: 'pem' })
+ .toString()
+ )
+ vi.resetModules()
+ db = await import('../src/db.js')
+ await db.initDb()
+ engine = await import('../src/services/auth/passwordCredentialVerification.js')
+ const { requireInternalToken } = await import('../src/middleware/internalServiceAuth.js')
+ const { createExternalAuthRouter } = await import('../src/routes/external/auth.js')
+ app = express()
+ app.use(express.json())
+ app.use(requireInternalToken)
+ app.use(createExternalAuthRouter({} as Parameters<typeof createExternalAuthRouter>[0]))
+ server = app.listen(0, '127.0.0.1')
+ await new Promise<void>(resolve => server.once('listening', resolve))
+ externalConfig = (await import('../../external-rest-api/src/config.js')).config
+ previousUrl = externalConfig.controlApiBaseUrl
+ previousToken = externalConfig.controlApiServiceToken
+ externalConfig.controlApiBaseUrl = `http://127.0.0.1:${(server.address() as { port: number }).port}`
+ externalConfig.controlApiServiceToken = serviceToken
+ const { withExternalRequestContext } =
+ await import('../../external-rest-api/src/requestContext.js')
+ const { createAuthRouter } = await import('../../external-rest-api/src/routes/auth.js')
+ edge = express()
+ edge.set('trust proxy', 1)
+ edge.use(express.json())
+ edge.use(withExternalRequestContext)
+ edge.use('/api/v1', createAuthRouter())
+ }, 60_000)
+ beforeEach(async () => {
+ vi.restoreAllMocks()
+ await db.pool.query(
+ 'TRUNCATE password_identifier_state, password_verification_pace, rate_limit_buckets'
+ )
+ })
+ afterAll(async () => {
+ try {
+ vi.restoreAllMocks()
+ if (externalConfig) {
+ externalConfig.controlApiBaseUrl = previousUrl
+ externalConfig.controlApiServiceToken = previousToken
+ }
+ if (server)
+ await new Promise<void>((resolve, reject) =>
+ server.close(error => (error ? reject(error) : resolve()))
+ )
+ if (db) {
+ await endPoolAndWaitForClients(db.pool)
+ await endPoolAndWaitForClients(db.rateLimitPool)
+ }
+ if (admin) await admin.query(`DROP DATABASE "${database}"`)
+ } finally {
+ await admin?.end()
+ vi.unstubAllEnvs()
+ }
+ })
+ async function cooldown() {
+ for (let i = 0; i < 5; i++)
+ await engine.completePasswordEvaluation(
+ await engine.capturePasswordEvaluation(email, false),
+ false
+ )
+ }
+ function assertDenial(response: request.Response, status: number) {
+ expect(response.status).toBe(status)
+ for (const header of quotaHeaders) expect(response.headers[header], header).toBeUndefined()
+ expect(response.body.retryAfterSeconds).toBe(Number(response.headers['retry-after']))
+ expect(response.headers['cache-control']).toBe('no-store')
+ }
+ function internalLogin() {
+ return request(app)
+ .post('/external/auth/password-login')
+ .set('Authorization', `Bearer ${serviceToken}`)
+ .set('x-service-token', 'external-rest-api')
+ .set('x-external-client-ip', '192.0.2.18')
+ .send({ email, password: 'synthetic-wrong' })
+ }
+ it('removes every source quota family when identifier cooldown denies internally', async () => {
+ await cooldown()
+ assertDenial(await internalLogin(), 429)
+ })
+ it('preserves sanitized retry metadata through the authenticated two-service seam', async () => {
+ await cooldown()
+ assertDenial(
+ await request(edge)
+ .post('/api/v1/auth/password-login')
+ .set('X-Forwarded-For', '192.0.2.19')
+ .send({ email, password: 'synthetic-wrong' }),
+ 429
+ )
+ })
+ it('removes every source quota family on credential authority unavailability', async () => {
+ const query = db.pool.query.bind(db.pool)
+ vi.spyOn(db.pool, 'query').mockImplementation((...args: unknown[]) => {
+ if (String(args[0]).includes('FROM users WHERE email'))
+ return Promise.reject(new Error('synthetic backend failure'))
+ return (query as Function)(...args)
+ })
+ assertDenial(await internalLogin(), 503)
+ })
+})
diff --git a/external-rest-api/package-lock.json b/external-rest-api/package-lock.json
index 2c315b439..a2e4bc4f5 100644
--- a/external-rest-api/package-lock.json
+++ b/external-rest-api/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-external-rest-api",
- "version": "0.1.99",
+ "version": "0.1.100",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-external-rest-api",
- "version": "0.1.99",
+ "version": "0.1.100",
"dependencies": {
"@clerum/jwt-key-policy": "file:../packages/jwt-key-policy",
"cors": "^2.8.5",
diff --git a/external-rest-api/package.json b/external-rest-api/package.json
index 52ee1ee83..88323b742 100644
--- a/external-rest-api/package.json
+++ b/external-rest-api/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-external-rest-api",
- "version": "0.1.99",
+ "version": "0.1.100",
"description": "External REST API for profile, team management, and RPC token brokerage",
"main": "dist/main.js",
"engines": {
diff --git a/external-rest-api/src/http/passwordAdmissionError.ts b/external-rest-api/src/http/passwordAdmissionError.ts
index 180cfbdb6..ee04946e3 100644
--- a/external-rest-api/src/http/passwordAdmissionError.ts
+++ b/external-rest-api/src/http/passwordAdmissionError.ts
@@ -13,6 +13,9 @@ export function sendPasswordAuthorityError(error: unknown, res: Response): boole
'X-RateLimit-Reset',
'RateLimit',
'RateLimit-Policy',
+ 'RateLimit-Limit',
+ 'RateLimit-Remaining',
+ 'RateLimit-Reset',
])
res.removeHeader(name)
res.setHeader('Retry-After', String(retryAfterSeconds))
diff --git a/external-rest-api/src/releaseManifest.ts b/external-rest-api/src/releaseManifest.ts
index 8c379c4d1..80c275744 100644
--- a/external-rest-api/src/releaseManifest.ts
+++ b/external-rest-api/src/releaseManifest.ts
@@ -8,7 +8,7 @@ export type ReleaseManifest = {
export const releaseManifest: ReleaseManifest = {
releaseId: 'v0.10.0',
- externalRestApiVersion: '0.1.99',
+ externalRestApiVersion: '0.1.100',
rpcProxyVersion: '0.1.120',
desktopVersion: '0.10.0',
minimumDesktopVersion: '0.1.252',