bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-01-31 00:33:33 +00:00
Code Issues Releases Wiki Activity

Attempt to fix race condition

Browse Source
This commit is contained in:
Bernd Schoolmann
2026-01-08 18:00:32 +01:00
parent 2665a29f2d
commit 9a17882da4
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/web/src/app/key-management/data-recovery/steps/cipher-step.ts
View File

@@ -5,6 +5,7 @@ import { DialogService } from "@bitwarden/components";
import { LogRecorder } from "../log-recorder";
import { RecoveryStep, RecoveryWorkingData } from "./recovery-step";
import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.service";
export class CipherStep implements RecoveryStep {
title = "recoveryStepCipherTitle";
@@ -14,7 +15,8 @@ export class CipherStep implements RecoveryStep {
constructor(
private apiService: ApiService,
private cipherService: CipherEncryptionService,
private cipherEncryptionService: CipherEncryptionService,
private cipherService: CipherService,
private dialogService: DialogService,
) {}
@@ -31,7 +33,7 @@ export class CipherStep implements RecoveryStep {
const userCiphers = workingData.ciphers.filter((c) => c.organizationId == null);
for (const cipher of userCiphers) {
try {
await this.cipherService.decrypt(cipher, workingData.userId);
await this.cipherEncryptionService.decrypt(cipher, workingData.userId);
this.decryptableCipherIds.push(cipher.id);
} catch {
logger.record(`Cipher ID ${cipher.id} was undecryptable`);
@@ -76,6 +78,7 @@ export class CipherStep implements RecoveryStep {
for (const cipherId of this.undecryptableCipherIds) {
try {
await this.apiService.deleteCipher(cipherId);
await this.cipherService.delete(cipherId, workingData.userId);
logger.record(`Deleted cipher ${cipherId}`);
} catch (error) {
const errorMessage = error instanceof Error ? error.message : String(error);

8
apps/web/src/app/key-management/data-recovery/steps/folder-step.ts
View File

@@ -6,6 +6,7 @@ import { PureCrypto } from "@bitwarden/sdk-internal";
import { LogRecorder } from "../log-recorder";
import { RecoveryStep, RecoveryWorkingData } from "./recovery-step";
import { FolderService,InternalFolderService } from "@bitwarden/common/vault/abstractions/folder/folder.service.abstraction";
export class FolderStep implements RecoveryStep {
title = "recoveryStepFoldersTitle";
@@ -14,7 +15,8 @@ export class FolderStep implements RecoveryStep {
private decryptableFolderIds: string[] = [];
constructor(
private folderService: FolderApiServiceAbstraction,
private folderApiService: FolderApiServiceAbstraction,
private internalFolderService: InternalFolderService,
private dialogService: DialogService,
) {}
@@ -85,7 +87,9 @@ export class FolderStep implements RecoveryStep {
for (const folderId of this.undecryptableFolderIds) {
try {
await this.folderService.delete(folderId, workingData.userId);
await this.folderApiService.delete(folderId, workingData.userId);
await this.internalFolderService.clearDecryptedFolderState(workingData.userId);
logger.record(`Deleted folder ${folderId}`);
} catch (error) {
logger.record(`Failed to delete folder ${folderId}: ${error}`);

7
libs/key-management/src/user-asymmetric-key-regeneration/services/default-user-asymmetric-key-regeneration.service.ts
View File

@@ -14,6 +14,7 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi
import { KeyService } from "../../abstractions/key.service";
import { UserAsymmetricKeysRegenerationApiService } from "../abstractions/user-asymmetric-key-regeneration-api.service";
import { UserAsymmetricKeysRegenerationService } from "../abstractions/user-asymmetric-key-regeneration.service";
import { AccountCryptographicStateService } from "@bitwarden/common/key-management/account-cryptography/account-cryptographic-state.service";
export class DefaultUserAsymmetricKeysRegenerationService implements UserAsymmetricKeysRegenerationService {
constructor(
@@ -24,6 +25,7 @@ export class DefaultUserAsymmetricKeysRegenerationService implements UserAsymmet
private sdkService: SdkService,
private apiService: ApiService,
private configService: ConfigService,
private accountCryptographicStateService: AccountCryptographicStateService
) {}
async regenerateIfNeeded(userId: UserId): Promise<void> {
@@ -162,6 +164,11 @@ export class DefaultUserAsymmetricKeysRegenerationService implements UserAsymmet
}
await this.keyService.setPrivateKey(makeKeyPairResponse.userKeyEncryptedPrivateKey, userId);
await this.accountCryptographicStateService.setAccountCryptographicState({
"V1": {
private_key: makeKeyPairResponse.userKeyEncryptedPrivateKey
}
}, userId);
this.logService.info(
"[UserAsymmetricKeyRegeneration] User's asymmetric keys successfully regenerated.",
);