Skip to content

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

TypeScript

fix(control-api): fence stale password changes

Josuéd3a32702ddea
diff --git a/control-api/package-lock.json b/control-api/package-lock.json
index 092d6afee..e202849e8 100644
--- a/control-api/package-lock.json
+++ b/control-api/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "clerum-control-api",
- "version": "0.1.738",
+ "version": "0.1.739",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "clerum-control-api",
- "version": "0.1.738",
+ "version": "0.1.739",
"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 2b01bf382..38771b118 100644
--- a/control-api/package.json
+++ b/control-api/package.json
@@ -1,6 +1,6 @@
{
"name": "clerum-control-api",
- "version": "0.1.738",
+ "version": "0.1.739",
"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/passwordErrorResponses.ts b/control-api/src/routes/external/passwordErrorResponses.ts
new file mode 100644
index 000000000..d38e68623
--- /dev/null
+++ b/control-api/src/routes/external/passwordErrorResponses.ts
@@ -0,0 +1,9 @@
+export const PASSWORD_NOT_SET_RESPONSE = Object.freeze({
+ status: 409,
+ body: Object.freeze({ error: 'password_not_set' as const }),
+})
+
+export const PASSWORD_CREDENTIAL_CHANGED_RESPONSE = Object.freeze({
+ status: 409,
+ body: Object.freeze({ error: 'credential_changed' as const }),
+})
diff --git a/control-api/src/routes/external/users.ts b/control-api/src/routes/external/users.ts
index 7f07f440b..1498c0568 100644
--- a/control-api/src/routes/external/users.ts
+++ b/control-api/src/routes/external/users.ts
@@ -27,6 +27,10 @@ import {
updateProfile,
updateUserPassword,
} from '../../services/directory/index.js'
+import {
+ PASSWORD_CREDENTIAL_CHANGED_RESPONSE,
+ PASSWORD_NOT_SET_RESPONSE,
+} from './passwordErrorResponses.js'
const MAX_TEAM_DIRECTORY_TEAMS = 50
const TEAM_DIRECTORY_RATE_LIMIT_PER_MINUTE = 10
@@ -304,11 +308,16 @@ export function createExternalUsersRouter(gateway: K8sGateway): Router {
if ('error' in result) {
if (result.error === 'not_found') return res.status(404).json({ error: 'not_found' })
if (result.error === 'password_not_set') {
- return res.status(409).json({ error: 'password_not_set' })
+ return res.status(PASSWORD_NOT_SET_RESPONSE.status).json(PASSWORD_NOT_SET_RESPONSE.body)
}
if (result.error === 'invalid_current_password') {
return res.status(401).json({ error: 'invalid_current_password' })
}
+ if (result.error === 'credential_changed') {
+ return res
+ .status(PASSWORD_CREDENTIAL_CHANGED_RESPONSE.status)
+ .json(PASSWORD_CREDENTIAL_CHANGED_RESPONSE.body)
+ }
return res.status(400).json({ error: 'invalid_password' })
}
return res.status(200).json(result)
diff --git a/control-api/src/services/directory/membership.ts b/control-api/src/services/directory/membership.ts
index 5af83587c..63b966c98 100644
--- a/control-api/src/services/directory/membership.ts
+++ b/control-api/src/services/directory/membership.ts
@@ -2054,13 +2054,22 @@ export async function updateUserPassword(
return { error: 'invalid_current_password' as const }
}
- await pool.query(
+ const update = await pool.query(
`UPDATE users
- SET password_hash = $2,
+ SET password_hash = $3,
password_set_at = NOW(),
updated_at = NOW()
- WHERE id = $1`,
- [normalizedUserId, await bcrypt.hash(nextPassword, 12)]
+ WHERE id = $1
+ AND password_auth_generation = $2
+ AND password_hash = $4
+ RETURNING id`,
+ [
+ normalizedUserId,
+ user.password_auth_generation,
+ await bcrypt.hash(nextPassword, 12),
+ user.password_hash,
+ ]
)
+ if (update.rows.length !== 1) return { error: 'credential_changed' as const }
return { updated: true as const }
}
diff --git a/control-api/test/bug192.passwordPersistence.realPostgres.integration.test.ts b/control-api/test/bug192.passwordPersistence.realPostgres.integration.test.ts
index 8505a981d..a3ec96639 100644
--- a/control-api/test/bug192.passwordPersistence.realPostgres.integration.test.ts
+++ b/control-api/test/bug192.passwordPersistence.realPostgres.integration.test.ts
@@ -239,6 +239,57 @@ realPg('Spec 043 persistence, migration, atomicity and fencing design acceptance
expect(await completePasswordEvaluation(success, true)).toBe(false)
expect((await row()).failures).toEqual([])
})
+ it('prevents a stale authenticated password change from overwriting verified recovery', async () => {
+ const invitation = await createSilentInvitationForTeams({
+ inviteeName: 'Synthetic member',
+ email,
+ purpose: 'password_reset',
+ teamAssignments: [],
+ fallbackRole: 'member',
+ })
+ let resolveCompareEntered!: () => void
+ let releaseCompare!: () => void
+ const compareEntered = new Promise<void>(resolve => {
+ resolveCompareEntered = resolve
+ })
+ const continueCompare = new Promise<void>(resolve => {
+ releaseCompare = resolve
+ })
+ const originalCompare = bcrypt.compare.bind(bcrypt)
+ let paused = false
+ vi.spyOn(bcrypt, 'compare').mockImplementation(async (candidate, encoded) => {
+ const matches = await originalCompare(candidate, encoded)
+ if (!paused) {
+ paused = true
+ resolveCompareEntered()
+ await continueCompare
+ }
+ return matches
+ })
+
+ const stalePasswordChange = updateUserPassword(
+ userId,
+ email,
+ password,
+ 'Synthetic-BUG192-stale-password-change'
+ )
+ await compareEntered
+ const recoveryPassword = 'Synthetic-BUG192-recovered-password'
+ const recovery = await setInvitationPasswordForEmail(email, invitation.id, recoveryPassword)
+ expect(recovery).not.toHaveProperty('error')
+
+ releaseCompare()
+ await expect(stalePasswordChange).resolves.toEqual({ error: 'credential_changed' })
+ await expect(
+ verifyMemberPassword(email, recoveryPassword, { publicLogin: false, userId })
+ ).resolves.toMatchObject({ id: userId })
+ const finalHash = (
+ await holder.pool.query('SELECT password_hash FROM users WHERE id = $1', [userId])
+ ).rows[0].password_hash
+ await expect(bcrypt.compare('Synthetic-BUG192-stale-password-change', finalHash)).resolves.toBe(
+ false
+ )
+ })
it('real reset/establishment producer clears cooldown and fences old work', async () => {
const stale = await capturePasswordEvaluation(email, false)
await completedFailures()