fix(auth): keep recovery code valid after password change

gertjan commented

2026-07-10 11:41:26 +00:00

Owner

change-password rotated dek_salt but left recovery_encrypted_dek
untouched, while reset-password derived the recovery KEK from the
current dek_salt. Any password change therefore permanently broke the
recovery code: the derived KEK could never match the one that wrapped
recovery_encrypted_dek, and reset-password always failed InvalidToken.

Fix: give the recovery wrap its own salt.

register derives the recovery KEK from a new recovery_dek_salt field
that never rotates; dek_salt remains free to rotate on password change
reset-password derives the recovery KEK from recovery_dek_salt
legacy docs without the field fall back to dek_salt on read (their
recovery KEK was derived from it), and change-password materializes
that fallback before rotating the salt out from under it
regression test drives register -> change-password -> reset-password
through a stateful repo mock that actually persists credential updates

Co-Authored-By: Claude Fable 5 noreply@anthropic.com

change-password rotated dek_salt but left recovery_encrypted_dek untouched, while reset-password derived the recovery KEK from the current dek_salt. Any password change therefore permanently broke the recovery code: the derived KEK could never match the one that wrapped recovery_encrypted_dek, and reset-password always failed InvalidToken. Fix: give the recovery wrap its own salt. - register derives the recovery KEK from a new recovery_dek_salt field that never rotates; dek_salt remains free to rotate on password change - reset-password derives the recovery KEK from recovery_dek_salt - legacy docs without the field fall back to dek_salt on read (their recovery KEK was derived from it), and change-password materializes that fallback before rotating the salt out from under it - regression test drives register -> change-password -> reset-password through a stateful repo mock that actually persists credential updates Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

gertjan added 1 commit

2026-07-10 11:41:27 +00:00

fix(auth): keep recovery code valid after password change

Deploy / check (pull_request) Successful in 5m4s

Details

Deploy / deploy (pull_request) Has been skipped

Details

c28241629a

change-password rotated dek_salt but left recovery_encrypted_dek
untouched, while reset-password derived the recovery KEK from the
current dek_salt. Any password change therefore permanently broke the
recovery code: the derived KEK could never match the one that wrapped
recovery_encrypted_dek, and reset-password always failed InvalidToken.

Fix: give the recovery wrap its own salt.

- register derives the recovery KEK from a new recovery_dek_salt field
  that never rotates; dek_salt remains free to rotate on password change
- reset-password derives the recovery KEK from recovery_dek_salt
- legacy docs without the field fall back to dek_salt on read (their
  recovery KEK was derived from it), and change-password materializes
  that fallback before rotating the salt out from under it
- regression test drives register -> change-password -> reset-password
  through a stateful repo mock that actually persists credential updates

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

gertjan merged commit 90e2f5ef85 into main

2026-07-10 11:51:38 +00:00

gertjan referenced this pull request from a commit

2026-07-10 11:51:39 +00:00

fix(auth): keep recovery code valid after password change (#82)

gertjan deleted branch claude/wonderful-perlman-083ccd

2026-07-10 11:51:39 +00:00

Rows
Columns

fix(auth): keep recovery code valid after password change #82