bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-21 02:33:46 +00:00
Code Issues Releases Wiki Activity

Ensure biometric unlock works even if popup is not in focus

Browse Source
This commit is contained in:
Hinton
2020-10-12 18:01:34 +02:00
parent 5eb0ce1e09
commit 894d245361
6 changed files with 80 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/background/main.background.ts
View File

@@ -141,8 +141,6 @@ export default class MainBackground {
private nativeMessagingBackground: NativeMessagingBackground;
constructor() {
this.nativeMessagingBackground = new NativeMessagingBackground();
// Services
this.messagingService = new BrowserMessagingService();
this.platformUtilsService = new BrowserPlatformUtilsService(this.messagingService,
@@ -150,7 +148,14 @@ export default class MainBackground {
if (this.systemService != null) {
this.systemService.clearClipboard(clipboardValue, clearMs);
}
}, this.nativeMessagingBackground);
},
() => {
if (this.nativeMessagingBackground != null) {
const promise = this.nativeMessagingBackground.await();
this.nativeMessagingBackground.send({command: 'biometricUnlock'})
return promise.then((result) => result.response === 'unlocked');
}
});
this.storageService = new BrowserStorageService(this.platformUtilsService);
this.secureStorageService = new BrowserStorageService(this.platformUtilsService);
this.i18nService = new I18nService(BrowserApi.getUILanguage(window));
@@ -228,6 +233,7 @@ export default class MainBackground {
this.platformUtilsService as BrowserPlatformUtilsService, this.storageService, this.i18nService,
this.analytics, this.notificationsService, this.systemService, this.vaultTimeoutService,
this.environmentService);
this.nativeMessagingBackground = new NativeMessagingBackground(this.storageService, this.cryptoService, this.vaultTimeoutService, this.runtimeBackground);
this.commandsBackground = new CommandsBackground(this, this.passwordGenerationService,
this.platformUtilsService, this.analytics, this.vaultTimeoutService);

44
src/background/nativeMessaging.background.ts
View File

@@ -1,4 +1,8 @@
import { CryptoService, VaultTimeoutService } from 'jslib/abstractions';
import { StorageService } from 'jslib/abstractions/storage.service';
import { ConstantsService } from 'jslib/services';
import { BrowserApi } from '../browser/browserApi';
import RuntimeBackground from './runtime.background';
export class NativeMessagingBackground {
private connected = false;
@@ -6,18 +10,16 @@ export class NativeMessagingBackground {
private resolver: any = null;
constructor(private storageService: StorageService, private cryptoService: CryptoService,
private vaultTimeoutService: VaultTimeoutService, private runtimeBackground: RuntimeBackground) {}
connect() {
this.port = BrowserApi.connectNative('com.8bit.bitwarden');
this.connected = true;
this.port.onMessage.addListener((msg: any) => {
if (this.resolver) {
this.resolver(msg);
} else {
// tslint:disable-next-line
console.error('NO RESOLVER');
}
});
this.port.onMessage.addListener((msg) => this.onMessage(msg));
this.port.onDisconnect.addListener(() => {
this.connected = false;
});
@@ -37,4 +39,30 @@ export class NativeMessagingBackground {
this.resolver = resolve;
});
}
private async onMessage(msg: any) {
switch(msg.command) {
case 'biometricUnlock': {
await this.storageService.remove(ConstantsService.biometricAwaitingAcceptance);
const enabled = await this.storageService.get(ConstantsService.biometricUnlockKey);
if (enabled === null || enabled === false) {
if (msg.response === 'unlocked') {
await this.storageService.save(ConstantsService.biometricUnlockKey, true);
}
await this.cryptoService.toggleKey();
}
if (this.vaultTimeoutService.biometricLocked) {
this.runtimeBackground.processMessage({command: 'unlocked'}, null, null);
this.vaultTimeoutService.biometricLocked = false;
}
}
}
if (this.resolver) {
this.resolver(msg);
}
}
}

1
src/background/runtime.background.ts
View File

@@ -22,6 +22,7 @@ import { VaultTimeoutService } from 'jslib/abstractions/vaultTimeout.service';
import { BrowserApi } from '../browser/browserApi';
import MainBackground from './main.background';
import { NativeMessagingBackground } from './nativeMessaging.background';
import { Analytics } from 'jslib/misc';
import { Utils } from 'jslib/misc/utils';