Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.
Improve incorrect PIN handling (#2469)
Leendert de Borst11fecd9b6bc1
diff --git a/apps/browser-extension/src/entrypoints/background/AuthHandler.ts b/apps/browser-extension/src/entrypoints/background/AuthHandler.tsindex d8db48c06..6d7060797 100644--- a/apps/browser-extension/src/entrypoints/background/AuthHandler.ts+++ b/apps/browser-extension/src/entrypoints/background/AuthHandler.ts@@ -16,7 +16,7 @@ import { logExpected, logFailure } from '@/utils/Diagnostics';import { convertLegacyPinKey } from '@/utils/LegacyKeyConversion';import { LocalPreferencesService } from '@/utils/LocalPreferencesService';import { sendMessage } from '@/utils/messaging/ExtensionMessaging';-import { IncorrectPinError, InvalidPinFormatError, PinLockedError, resetFailedAttempts, unlockWithPin } from '@/utils/PinUnlockService';+import { IncorrectPinError, InvalidPinFormatError, PinLockedError, removeAndDisablePin, resetFailedAttempts, unlockWithPin } from '@/utils/PinUnlockService';import type { BackgroundAuthResult } from '@/utils/types/messaging/BackgroundAuthResult';import type { UnlockKeyDerivationParams } from '@aliasvault/models/metadata';@@ -211,9 +211,13 @@ export function handleUnlockWithPin(data: { pin: string }): Promise<BackgroundAuconst message = await describeAuthError(err, { fallback: 'common.errors.unknownErrorTryAgain' });if (message.wrongPassword) {- // The key the PIN restored does not open the key chain, treat as an incorrect PIN.- logExpected('[Unlock] The entered PIN did not decrypt the vault', err);- return { status: 'pinFailed', reason: 'incorrect', attemptsRemaining: 3 };+ /*+ * The PIN was right (AES-GCM decrypted), but the key it holds no longer opens the chain: a legacy PIN still+ * holding the unlock key of a password that has since changed. It can never work again, so disable it.+ */+ logExpected('[Unlock] The key restored by the PIN no longer opens the key chain, disabling PIN unlock', err);+ await removeAndDisablePin();+ return { status: 'pinFailed', reason: 'locked' };}return failureResult('PIN unlock failed', err, { fallback: 'common.errors.unknownErrorTryAgain' });}