Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-25 12:15:18 +01:00
Code Issues Projects Releases Wiki Activity

[AC-1343] Add bool parameter to conditionally evaluate password after successful unlock (#5260)

Browse Source
This commit is contained in:
Shane Melton 2023-04-21 14:40:56 -07:00 committed by GitHub
parent 89c8c48cd4
commit e777842191
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libs/angular/src/auth/components/lock.component.ts
View File

@ -114,7 +114,7 @@ export class LockComponent implements OnInit, OnDestroy {
const success = (await this.cryptoService.getKey(KeySuffixOptions.Biometric)) != null; const success = (await this.cryptoService.getKey(KeySuffixOptions.Biometric)) != null;
if (success) { if (success) {
await this.doContinue(); await this.doContinue(false);
} }
return success; return success;
@ -251,37 +251,39 @@ export class LockComponent implements OnInit, OnDestroy {
await this.cryptoService.encrypt(key.key, pinKey) await this.cryptoService.encrypt(key.key, pinKey)
); );
} }
await this.setKeyAndContinue(key); await this.setKeyAndContinue(key, true);
} }
private async setKeyAndContinue(key: SymmetricCryptoKey) { private async setKeyAndContinue(key: SymmetricCryptoKey, evaluatePasswordAfterUnlock = false) {
await this.cryptoService.setKey(key); await this.cryptoService.setKey(key);
await this.doContinue(); await this.doContinue(evaluatePasswordAfterUnlock);
} }
private async doContinue() { private async doContinue(evaluatePasswordAfterUnlock: boolean) {
await this.stateService.setEverBeenUnlocked(true); await this.stateService.setEverBeenUnlocked(true);
const disableFavicon = await this.stateService.getDisableFavicon(); const disableFavicon = await this.stateService.getDisableFavicon();
await this.stateService.setDisableFavicon(!!disableFavicon); await this.stateService.setDisableFavicon(!!disableFavicon);
this.messagingService.send("unlocked"); this.messagingService.send("unlocked");
try { if (evaluatePasswordAfterUnlock) {
// If we do not have any saved policies, attempt to load them from the service try {
if (this.enforcedMasterPasswordOptions == undefined) { // If we do not have any saved policies, attempt to load them from the service
this.enforcedMasterPasswordOptions = await firstValueFrom( if (this.enforcedMasterPasswordOptions == undefined) {
this.policyService.masterPasswordPolicyOptions$() this.enforcedMasterPasswordOptions = await firstValueFrom(
); this.policyService.masterPasswordPolicyOptions$()
} );
}
if (this.requirePasswordChange()) { if (this.requirePasswordChange()) {
await this.stateService.setForcePasswordResetReason( await this.stateService.setForcePasswordResetReason(
ForceResetPasswordReason.WeakMasterPassword ForceResetPasswordReason.WeakMasterPassword
); );
this.router.navigate([this.forcePasswordResetRoute]); this.router.navigate([this.forcePasswordResetRoute]);
return; return;
}
} catch (e) {
// Do not prevent unlock if there is an error evaluating policies
this.logService.error(e);
} }
} catch (e) {
// Do not prevent unlock if there is an error evaluating policies
this.logService.error(e);
} }
if (this.onSuccessfulSubmit != null) { if (this.onSuccessfulSubmit != null) {