Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure
TypeScript
fix: count password denials when responses are emitted
Josuéeff95fb1328c
diff --git a/control-api/package-lock.json b/control-api/package-lock.jsonindex d8f47d366..135feb7f9 100644--- a/control-api/package-lock.json+++ b/control-api/package-lock.json@@ -1,12 +1,12 @@{"name": "clerum-control-api",- "version": "0.1.769",+ "version": "0.1.770","lockfileVersion": 3,"requires": true,"packages": {"": {"name": "clerum-control-api",- "version": "0.1.769",+ "version": "0.1.770","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.jsonindex f142e1ce6..e1d977c41 100644--- a/control-api/package.json+++ b/control-api/package.json@@ -1,6 +1,6 @@{"name": "clerum-control-api",- "version": "0.1.769",+ "version": "0.1.770","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.tsindex 171497ef7..89498a8c7 100644--- a/control-api/src/middleware/passwordLoginAdmission.ts+++ b/control-api/src/middleware/passwordLoginAdmission.ts@@ -1,6 +1,7 @@import type { NextFunction, Request, Response } from 'express'import { isIP } from 'node:net'import { z } from 'zod'+import { passwordAdmissionDenialsTotal } from '../observability/metrics.js'import { PASSWORD_ADMISSION_POLICY } from '../services/auth/passwordAdmissionState.js'import { PasswordAdmissionError } from '../services/auth/passwordCredentialVerification.js'import { clearRateLimitHeaders, rateLimitMiddleware } from './rateLimitMiddleware.js'@@ -19,6 +20,7 @@ export function sendPasswordAdmissionError(error: unknown, res: Response): booleerror: error.publicError,retryAfterSeconds: error.retryAfterSeconds,})+ passwordAdmissionDenialsTotal.inc({ reason: error.reason })return true}diff --git a/control-api/src/services/auth/passwordAdmissionError.ts b/control-api/src/services/auth/passwordAdmissionError.tsindex 811a7c484..b7c3283ab 100644--- a/control-api/src/services/auth/passwordAdmissionError.ts+++ b/control-api/src/services/auth/passwordAdmissionError.ts@@ -1,7 +1,4 @@-import {- type PasswordAdmissionDenialReason,- passwordAdmissionDenialsTotal,-} from '../../observability/metrics.js'+import type { PasswordAdmissionDenialReason } from '../../observability/metrics.js'export class PasswordAdmissionError extends Error {constructor(@@ -14,6 +11,5 @@ export class PasswordAdmissionError extends Error {| 'recovery_outcome_unknown' = status === 429 ? 'rate_limited' : 'authority_unavailable') {super(status === 429 ? 'rate_limited' : 'authority_unavailable')- passwordAdmissionDenialsTotal.inc({ reason })}}diff --git a/control-api/test/passwordAdmissionError.metrics.test.ts b/control-api/test/passwordAdmissionError.metrics.test.tsnew file mode 100644index 000000000..9ebfa5603--- /dev/null+++ b/control-api/test/passwordAdmissionError.metrics.test.ts@@ -0,0 +1,37 @@+import { describe, expect, it, vi } from 'vitest'+import type { Response } from 'express'+import { sendPasswordAdmissionError } from '../src/middleware/passwordLoginAdmission.js'+import { passwordAdmissionDenialsTotal } from '../src/observability/metrics.js'+import { PasswordAdmissionError } from '../src/services/auth/passwordAdmissionError.js'++async function denialCount(reason: string): Promise<number> {+ const metric = await passwordAdmissionDenialsTotal.get()+ return metric.values.find(value => value.labels.reason === reason)?.value ?? 0+}++describe('password admission denial metric', () => {+ it('counts when the typed public denial is emitted, not when it is constructed', async () => {+ const reason = 'source_rate'+ const before = await denialCount(reason)+ const error = new PasswordAdmissionError(429, 9, reason)+ expect(await denialCount(reason)).toBe(before)++ const response = {+ removeHeader: vi.fn(),+ setHeader: vi.fn(),+ status: vi.fn().mockReturnThis(),+ json: vi.fn().mockReturnThis(),+ } as unknown as Response++ expect(sendPasswordAdmissionError(error, response)).toBe(true)+ expect(response.status).toHaveBeenCalledWith(429)+ expect(response.json).toHaveBeenCalledWith({ error: 'rate_limited', retryAfterSeconds: 9 })+ expect(await denialCount(reason)).toBe(before + 1)+ })++ it('does not count an error that is not emitted by the admission response helper', async () => {+ const before = await denialCount('source_rate')+ expect(sendPasswordAdmissionError(new Error('unrelated'), {} as Response)).toBe(false)+ expect(await denialCount('source_rate')).toBe(before)+ })+})