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

cleanup old TODOs, add missing crypto service parameters

Browse Source
This commit is contained in:
Jacob Fink
2023-06-20 11:22:32 -04:00
parent 8f225bf541
commit 690e9ffc4a
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/common/src/platform/services/crypto.service.ts
View File

@@ -51,7 +51,7 @@ export class CryptoService implements CryptoServiceAbstraction {
// Legacy support: encryption used to be done with the master key (derived from master password). // Legacy support: encryption used to be done with the master key (derived from master password).
// Users who have not migrated will have a null user key and must use the master key instead. // Users who have not migrated will have a null user key and must use the master key instead.
return await this.stateService.getCryptoMasterKey(); return await this.getMasterKey();
} }
async setUserKey(key: UserSymKey, userId?: string): Promise<void> { async setUserKey(key: UserSymKey, userId?: string): Promise<void> {
@@ -126,7 +126,6 @@ export class CryptoService implements CryptoServiceAbstraction {
} }
async setUserSymKeyMasterKey(userSymKeyMasterKey: string, userId?: string): Promise<void> { async setUserSymKeyMasterKey(userSymKeyMasterKey: string, userId?: string): Promise<void> {
// TODO(Jake): is this the best way to handle this from the identity token?
await this.stateService.setUserSymKeyMasterKey(userSymKeyMasterKey, { userId: userId }); await this.stateService.setUserSymKeyMasterKey(userSymKeyMasterKey, { userId: userId });
} }
@@ -135,7 +134,9 @@ export class CryptoService implements CryptoServiceAbstraction {
} }
async getMasterKey(userId?: string): Promise<MasterKey> { async getMasterKey(userId?: string): Promise<MasterKey> {
return await this.stateService.getMasterKey({ userId: userId }); let masterKey = await this.stateService.getMasterKey({ userId: userId });
masterKey ||= (await this.stateService.getCryptoMasterKey({ userId: userId })) as MasterKey;
return masterKey;
} }
async makeMasterKey( async makeMasterKey(
@@ -192,7 +193,6 @@ export class CryptoService implements CryptoServiceAbstraction {
return null; return null;
} }
// TODO(Jake): Do we want to set the user key here?
return new SymmetricCryptoKey(decUserKey) as UserSymKey; return new SymmetricCryptoKey(decUserKey) as UserSymKey;
} }
@@ -724,10 +724,12 @@ export class CryptoService implements CryptoServiceAbstraction {
break; break;
} }
case KeySuffixOptions.Pin: { case KeySuffixOptions.Pin: {
const protectedPin = await this.stateService.getProtectedPin(); const protectedPin = await this.stateService.getProtectedPin({ userId: userId });
// This could cause a possible timing issue. Need to make sure the ephemeral key is set before // This could cause a possible timing issue. Need to make sure the ephemeral key is set before
// we set our user key // we set our user key
const userSymKeyPinEphemeral = await this.stateService.getUserSymKeyPinEphemeral(); const userSymKeyPinEphemeral = await this.stateService.getUserSymKeyPinEphemeral({
userId: userId,
});
shouldStoreKey = !!protectedPin && !userSymKeyPinEphemeral; shouldStoreKey = !!protectedPin && !userSymKeyPinEphemeral;
break; break;
} }

2
libs/common/src/platform/services/state.service.ts
View File

@@ -620,7 +620,6 @@ export class StateService<
* so we can unlock with MP offline * so we can unlock with MP offline
*/ */
async getUserSymKeyMasterKey(options?: StorageOptions): Promise<string> { async getUserSymKeyMasterKey(options?: StorageOptions): Promise<string> {
// TODO(Jake): defaultOnDiskOptions? Other's are saved in secure storage
return ( return (
await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskOptions())) await this.getAccount(this.reconcileOptions(options, await this.defaultOnDiskOptions()))
)?.keys.userSymKeyMasterKey; )?.keys.userSymKeyMasterKey;
@@ -631,7 +630,6 @@ export class StateService<
* so we can unlock with MP offline * so we can unlock with MP offline
*/ */
async setUserSymKeyMasterKey(value: string, options?: StorageOptions): Promise<void> { async setUserSymKeyMasterKey(value: string, options?: StorageOptions): Promise<void> {
// TODO(Jake): defaultOnDiskOptions? Other's are saved in secure storage
const account = await this.getAccount( const account = await this.getAccount(
this.reconcileOptions(options, await this.defaultOnDiskOptions()) this.reconcileOptions(options, await this.defaultOnDiskOptions())
); );