bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 15:53:27 +00:00
Code Issues Releases Wiki Activity

[PM-22611] Require userid for masterKey methods on the key service (#15663)

Browse Source 
* Require userId on targeted methods.

* update method consumers

* unit tests
This commit is contained in:
Thomas Avery
2025-07-25 09:37:04 -05:00
committed by GitHub
parent b358d5663d
commit 2db31d1228
6 changed files with 233 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
libs/key-management/src/key.service.ts
View File

@@ -259,28 +259,28 @@ export class DefaultKeyService implements KeyServiceAbstraction {
}
}
// TODO: Move to MasterPasswordService
async getOrDeriveMasterKey(password: string, userId?: UserId) {
const [resolvedUserId, email] = await firstValueFrom(
combineLatest([this.accountService.activeAccount$, this.accountService.accounts$]).pipe(
map(([activeAccount, accounts]) => {
userId ??= activeAccount?.id;
if (userId == null || accounts[userId] == null) {
throw new Error("No user found");
}
return [userId, accounts[userId].email];
}),
),
);
const masterKey = await firstValueFrom(this.masterPasswordService.masterKey$(resolvedUserId));
async getOrDeriveMasterKey(password: string, userId: UserId): Promise<MasterKey> {
if (userId == null) {
throw new Error("User ID is required.");
}
const masterKey = await firstValueFrom(this.masterPasswordService.masterKey$(userId));
if (masterKey != null) {
return masterKey;
}
const kdf = await firstValueFrom(this.kdfConfigService.getKdfConfig$(resolvedUserId));
if (kdf == null) {
throw new Error("No kdf found for user");
const email = await firstValueFrom(
this.accountService.accounts$.pipe(map((accounts) => accounts[userId]?.email)),
);
if (email == null) {
throw new Error("No email found for user " + userId);
}
const kdf = await firstValueFrom(this.kdfConfigService.getKdfConfig$(userId));
if (kdf == null) {
throw new Error("No kdf found for user " + userId);
}
return await this.makeMasterKey(password, email, kdf);
}
@@ -289,14 +289,14 @@ export class DefaultKeyService implements KeyServiceAbstraction {
*
* @remarks
* Does not validate the kdf config to ensure it satisfies the minimum requirements for the given kdf type.
* TODO: Move to MasterPasswordService
*/
async makeMasterKey(password: string, email: string, KdfConfig: KdfConfig): Promise<MasterKey> {
async makeMasterKey(password: string, email: string, kdfConfig: KdfConfig): Promise<MasterKey> {
const start = new Date().getTime();
email = email.trim().toLowerCase();
const masterKey = (await this.keyGenerationService.deriveKeyFromPassword(
password,
email,
KdfConfig,
kdfConfig,
)) as MasterKey;
const end = new Date().getTime();
this.logService.info(`[KeyService] Deriving master key took ${end - start}ms`);
@@ -312,23 +312,16 @@ export class DefaultKeyService implements KeyServiceAbstraction {
return await this.buildProtectedSymmetricKey(masterKey, userKey);
}
// TODO: move to MasterPasswordService
async hashMasterKey(
password: string,
key: MasterKey | null,
key: MasterKey,
hashPurpose?: HashPurpose,
): Promise<string> {
if (key == null) {
const userId = await firstValueFrom(this.stateProvider.activeUserId$);
if (userId == null) {
throw new Error("No active user found.");
}
key = await firstValueFrom(this.masterPasswordService.masterKey$(userId));
if (password == null) {
throw new Error("password is required.");
}
if (password == null || key == null) {
throw new Error("Invalid parameters.");
if (key == null) {
throw new Error("key is required.");
}
const iterations = hashPurpose === HashPurpose.LocalAuthorization ? 2 : 1;
@@ -341,9 +334,8 @@ export class DefaultKeyService implements KeyServiceAbstraction {
return Utils.fromBufferToB64(hash);
}
// TODO: move to MasterPasswordService
async compareKeyHash(
masterPassword: string | null,
masterPassword: string,
masterKey: MasterKey,
userId: UserId,
): Promise<boolean> {