Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-29 22:31:29 +01:00
Code Issues Projects Releases Wiki Activity

Fix userkey typing in background biometrics service

Browse Source
This commit is contained in:
Bernd Schoolmann 2025-01-13 18:47:56 +01:00
parent e141a1a438
commit 0daad18ffe
No known key found for this signature in database
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/browser/src/background/runtime.background.ts
View File

@ -195,7 +195,8 @@ export default class RuntimeBackground {
return await this.main.biometricsService.getBiometricsStatus();
}
case BiometricsCommands.UnlockWithBiometricsForUser: {
return await this.main.biometricsService.unlockWithBiometricsForUser(msg.userId);
const userKey = await this.main.biometricsService.unlockWithBiometricsForUser(msg.userId);
return userKey.keyB64;
}
case BiometricsCommands.GetBiometricsStatusForUser: {
return await this.main.biometricsService.getBiometricsStatusForUser(msg.userId);

9
apps/browser/src/key-management/biometrics/background-browser-biometrics.service.ts
View File

@ -80,7 +80,7 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
}
}
async unlockWithBiometricsForUser(userId: UserId): Promise<UserKey | null | undefined> {
async unlockWithBiometricsForUser(userId: UserId): Promise<UserKey | null> {
try {
await this.ensureConnected();
@ -96,7 +96,7 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
await this.biometricStateService.setBiometricUnlockEnabled(true);
await this.biometricStateService.setFingerprintValidated(true);
this.keyService.setUserKey(userKey, userId);
return response.userKeyB64;
return userKey;
}
} else {
return null;
@ -107,13 +107,14 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
userId: userId,
});
if (response.response) {
// In case the requesting foreground context dies (popup), the userkey should still be set, so the user is unlocked / the setting should be enabled
const decodedUserkey = Utils.fromB64ToArray(response.userKeyB64);
const userKey = new SymmetricCryptoKey(decodedUserkey) as UserKey;
if (await this.keyService.validateUserKey(userKey, userId)) {
await this.biometricStateService.setBiometricUnlockEnabled(true);
await this.biometricStateService.setFingerprintValidated(true);
this.keyService.setUserKey(userKey, userId);
return response.userKeyB64;
return userKey;
}
} else {
return null;
@ -123,6 +124,8 @@ export class BackgroundBrowserBiometricsService extends BiometricsService {
this.logService.info("Biometric unlock for user failed", e);
throw new Error("Biometric unlock failed");
}
return null;
}
async getBiometricsStatusForUser(id: UserId): Promise<BiometricsStatus> {