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

Use default PBKDF2 iteratinos instead of custom threshold

Browse Source
This commit is contained in:
Bernd Schoolmann
2025-10-30 11:00:32 +01:00
parent 87570a8032
commit eaad30f98a
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libs/common/src/key-management/encrypted-migrator/migrations/minimum-kdf-migration.ts
View File

@@ -1,11 +1,6 @@
import { UserId } from "@bitwarden/common/types/guid";
// eslint-disable-next-line no-restricted-imports
import {
KdfConfigService,
KdfType,
MINIMUM_PBKDF2_ITERATIONS_FOR_UPGRADE,
PBKDF2KdfConfig,
} from "@bitwarden/key-management";
import { KdfConfigService, KdfType, PBKDF2KdfConfig } from "@bitwarden/key-management";
import { LogService } from "@bitwarden/logging";
import { assertNonNullish } from "../../../auth/utils";
@@ -35,16 +30,16 @@ export class MinimumKdfMigration implements EncryptedMigration {
assertNonNullish(masterPassword, "masterPassword");
this.logService.info(
`[MinimumKdfMigration] Updating user ${userId} to minimum PBKDF2 iteration count ${MINIMUM_PBKDF2_ITERATIONS_FOR_UPGRADE}`,
`[MinimumKdfMigration] Updating user ${userId} to minimum PBKDF2 iteration count ${PBKDF2KdfConfig.ITERATIONS.defaultValue}`,
);
await this.changeKdfService.updateUserKdfParams(
masterPassword!,
new PBKDF2KdfConfig(MINIMUM_PBKDF2_ITERATIONS_FOR_UPGRADE),
new PBKDF2KdfConfig(PBKDF2KdfConfig.ITERATIONS.defaultValue),
userId,
);
await this.kdfConfigService.setKdfConfig(
userId,
new PBKDF2KdfConfig(MINIMUM_PBKDF2_ITERATIONS_FOR_UPGRADE),
new PBKDF2KdfConfig(PBKDF2KdfConfig.ITERATIONS.defaultValue),
);
}
@@ -59,7 +54,7 @@ export class MinimumKdfMigration implements EncryptedMigration {
const kdfConfig = await this.kdfConfigService.getKdfConfig(userId);
if (
kdfConfig.kdfType !== KdfType.PBKDF2_SHA256 ||
kdfConfig.iterations >= MINIMUM_PBKDF2_ITERATIONS_FOR_UPGRADE
kdfConfig.iterations >= PBKDF2KdfConfig.ITERATIONS.defaultValue
) {
return "noMigrationNeeded";
}

1
libs/key-management/src/models/kdf-config.ts
View File

@@ -160,4 +160,3 @@ export function fromSdkKdfConfig(sdkKdf: Kdf): KdfConfig {
}
export const DEFAULT_KDF_CONFIG = new PBKDF2KdfConfig(PBKDF2KdfConfig.ITERATIONS.defaultValue);
export const MINIMUM_PBKDF2_ITERATIONS_FOR_UPGRADE = 600_000;