Skip to content

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

TypeScript

fix: classify empty recovery passwords explicitly

Josué31defacba3a7
diff --git a/control-api/package-lock.json b/control-api/package-lock.json
index 7d9c7b26a..8f596a3c1 100644
--- a/control-api/package-lock.json
+++ b/control-api/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-api",
- "version": "0.1.776",
+ "version": "0.1.777",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-api",
- "version": "0.1.776",
+ "version": "0.1.777",
"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 321c9798b..f51b98a3e 100644
--- a/control-api/package.json
+++ b/control-api/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-api",
- "version": "0.1.776",
+ "version": "0.1.777",
"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/external/invitations.ts b/control-api/src/routes/external/invitations.ts
index cfa94ff0b..37b91e28c 100644
--- a/control-api/src/routes/external/invitations.ts
+++ b/control-api/src/routes/external/invitations.ts
@@ -89,9 +89,12 @@ export function createExternalInvitationsRouter(): Router {
const token = String(req.body?.token || '').trim()
const invitationId = String(req.body?.invitationId || '').trim()
const password = String(req.body?.password || '')
- if (!email || !token || !invitationId || !password) {
+ if (!email || !token || !invitationId) {
return res.status(400).json({ error: 'invalid payload' })
}
+ if (!password) {
+ return res.status(400).json({ error: 'invalid_password' })
+ }
let validation: { email: string; invitationUuid: string }
try {
diff --git a/control-api/test/passwordRecovery.http.contract.test.ts b/control-api/test/passwordRecovery.http.contract.test.ts
index b6368eaf9..0a20368ae 100644
--- a/control-api/test/passwordRecovery.http.contract.test.ts
+++ b/control-api/test/passwordRecovery.http.contract.test.ts
@@ -342,7 +342,7 @@ describe('response-drop proxy outbound boundary', () => {
expect(result.response?.status).toBe(400)
expect(result.response && JSON.parse(result.response.body)).toEqual({
- error: 'invalid payload',
+ error: 'invalid_password',
})
expect(result.response?.headers['content-type']).toMatch(/^application\/json/)
expect(result.response?.headers['retry-after']).toBeUndefined()
@@ -558,9 +558,21 @@ describe('invitation/password producer response mappings', () => {
})
expect(producerResponse.status).toBe(400)
- expect(producerResponse.body).toEqual({ error: 'invalid payload' })
+ expect(producerResponse.body).toEqual({ error: 'invalid_password' })
expect(directory.setInvitationPasswordForEmail).not.toHaveBeenCalled()
+ const missingInvitationId = await request(producerServer)
+ .post('/api/v1/external/invitations/password-token')
+ .set('authorization', `Bearer ${internalServiceToken}`)
+ .set('x-service-token', 'external-rest-api')
+ .send({
+ token: 'r6-synthetic-reset-proof',
+ email: preview.email,
+ password: 'R6-synthetic-valid-password',
+ })
+ expect(missingInvitationId.status).toBe(400)
+ expect(missingInvitationId.body).toEqual({ error: 'invalid payload' })
+
const response = await request(await publicApp())
.post('/api/v1/invitations/password')
.set('x-forwarded-for', '198.51.100.41')
diff --git a/control-api/test/passwordResetPayload.externalRest.realPostgres.integration.test.ts b/control-api/test/passwordResetPayload.externalRest.realPostgres.integration.test.ts
index a1ada8293..d978dffb7 100644
--- a/control-api/test/passwordResetPayload.externalRest.realPostgres.integration.test.ts
+++ b/control-api/test/passwordResetPayload.externalRest.realPostgres.integration.test.ts
@@ -418,7 +418,7 @@ realProducer('R4-L1 reset password payload through the public route and real pro
expect(empty.body).toEqual({ error: 'Password must be between 8 and 256 characters' })
expect(JSON.stringify(empty.body)).not.toContain('invalid payload')
expect(empty.headers['set-cookie']).toBeUndefined()
- expect(producerResponses.at(-1)).toEqual({ status: 400, error: 'invalid payload' })
+ expect(producerResponses.at(-1)).toEqual({ status: 400, error: 'invalid_password' })
const unchanged = await observer.query(
`SELECT primary_invite.status AS reset_status,
sibling.status AS sibling_status,
diff --git a/external-rest-api/package-lock.json b/external-rest-api/package-lock.json
index 478d2b001..54f2568c5 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.124",
+ "version": "0.1.125",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-external-rest-api",
- "version": "0.1.124",
+ "version": "0.1.125",
"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 ff10368e3..89411b7bb 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.124",
+ "version": "0.1.125",
"description": "External REST API for profile, team management, and RPC token brokerage",
"main": "dist/main.js",
"engines": {
diff --git a/external-rest-api/src/releaseManifest.ts b/external-rest-api/src/releaseManifest.ts
index a04a1e5de..8e29a3241 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.11.0',
- externalRestApiVersion: '0.1.124',
+ externalRestApiVersion: '0.1.125',
rpcProxyVersion: '0.1.126',
desktopVersion: '0.11.0',
minimumDesktopVersion: '0.1.252',
diff --git a/external-rest-api/src/services/invitationPasswordService.ts b/external-rest-api/src/services/invitationPasswordService.ts
index 7cd017aa3..35faa0cb8 100644
--- a/external-rest-api/src/services/invitationPasswordService.ts
+++ b/external-rest-api/src/services/invitationPasswordService.ts
@@ -48,16 +48,9 @@ function controlApiErrorCode(error: ControlApiError): string | null {
return null
}
-function resetPasswordDomainError(
- error: ControlApiError,
- password: string
-): ResetPasswordDomainError | null {
+function resetPasswordDomainError(error: ControlApiError): ResetPasswordDomainError | null {
const code = controlApiErrorCode(error)
if (error.status === 400 && code === 'invalid_password') return 'invalid_password'
- // Keep compatibility with the current producer until its stable code is published.
- if (error.status === 400 && code === 'invalid payload' && password.length === 0) {
- return 'invalid_password'
- }
if (error.status === 400 && code === 'invalid_invitation') return 'invalid_invitation'
if (error.status === 401 && code === 'user_retired') return 'invalid_invitation'
if (error.status === 403 && code === 'forbidden') return 'forbidden'
@@ -155,7 +148,7 @@ export async function setupInvitationPasswordWithToken(
} catch (error) {
if (error instanceof ControlApiError && [429, 503].includes(error.status)) throw error
if (error instanceof ControlApiError) {
- const domainError = resetPasswordDomainError(error, password)
+ const domainError = resetPasswordDomainError(error)
if (domainError) return { error: domainError }
if (error.status < 500) throw passwordAuthorityUnavailable()
}