vaultwarden
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Vault should be locked if key is not in memory (#413) 

Key is loaded on startup if auto key exists.
This commit is contained in:
Matt Gibson 2021-06-21 18:47:44 -04:00 committed by GitHub
parent f568c87289
commit 5e24a70a87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
angular/src/components/lock.component.ts
View File

@ -182,7 +182,6 @@ export class LockComponent implements OnInit {
private async doContinue() { private async doContinue() {
this.vaultTimeoutService.biometricLocked = false; this.vaultTimeoutService.biometricLocked = false;
this.vaultTimeoutService.everBeenUnlocked = true; this.vaultTimeoutService.everBeenUnlocked = true;
this.vaultTimeoutService.manuallyOrTimerLocked = false;
const disableFavicon = await this.storageService.get<boolean>(ConstantsService.disableFaviconKey); const disableFavicon = await this.storageService.get<boolean>(ConstantsService.disableFaviconKey);
await this.stateService.save(ConstantsService.disableFaviconKey, !!disableFavicon); await this.stateService.save(ConstantsService.disableFaviconKey, !!disableFavicon);
this.messagingService.send('unlocked'); this.messagingService.send('unlocked');

1
common/src/abstractions/vaultTimeout.service.ts
View File

@ -2,7 +2,6 @@ import { EncString } from '../models/domain/encString';
export abstract class VaultTimeoutService { export abstract class VaultTimeoutService {
biometricLocked: boolean; biometricLocked: boolean;
manuallyOrTimerLocked: boolean;
everBeenUnlocked: boolean; everBeenUnlocked: boolean;
pinProtectedKey: EncString; pinProtectedKey: EncString;
isLocked: () => Promise<boolean>; isLocked: () => Promise<boolean>;

13
common/src/services/vaultTimeout.service.ts
View File

@ -18,7 +18,6 @@ export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
pinProtectedKey: EncString = null; pinProtectedKey: EncString = null;
biometricLocked: boolean = true; biometricLocked: boolean = true;
everBeenUnlocked: boolean = false; everBeenUnlocked: boolean = false;
manuallyOrTimerLocked: boolean = false;
private inited = false; private inited = false;
@ -48,17 +47,12 @@ export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
// Keys aren't stored for a device that is locked or logged out. // Keys aren't stored for a device that is locked or logged out.
async isLocked(): Promise<boolean> { async isLocked(): Promise<boolean> {
// Handle never lock startup situation
if (await this.cryptoService.hasKeyStored('auto') && !this.everBeenUnlocked) { if (await this.cryptoService.hasKeyStored('auto') && !this.everBeenUnlocked) {
await this.cryptoService.getKey('auto'); await this.cryptoService.getKey('auto');
} }
const hasKey = await this.cryptoService.hasKey(); return !this.cryptoService.hasKeyInMemory();
if (hasKey) {
if ((await this.isBiometricLockSet() && this.biometricLocked) || this.manuallyOrTimerLocked) {
return true;
}
}
return !hasKey;
} }
async checkVaultTimeout(): Promise<void> { async checkVaultTimeout(): Promise<void> {
@ -108,7 +102,7 @@ export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
} }
this.biometricLocked = true; this.biometricLocked = true;
this.manuallyOrTimerLocked = true; this.everBeenUnlocked = true;
await this.cryptoService.clearKey(false); await this.cryptoService.clearKey(false);
await this.cryptoService.clearOrgKeys(true); await this.cryptoService.clearOrgKeys(true);
await this.cryptoService.clearKeyPair(true); await this.cryptoService.clearKeyPair(true);
@ -149,7 +143,6 @@ export class VaultTimeoutService implements VaultTimeoutServiceAbstraction {
clear(): Promise<any> { clear(): Promise<any> {
this.everBeenUnlocked = false; this.everBeenUnlocked = false;
this.manuallyOrTimerLocked = false;
this.pinProtectedKey = null; this.pinProtectedKey = null;
return this.storageService.remove(ConstantsService.protectedPin); return this.storageService.remove(ConstantsService.protectedPin);
} }