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

Merge branch 'master' into feature/sm-billing

Browse Source
This commit is contained in:
Thomas Rittson
2023-06-23 14:27:37 +10:00
parent 86ccff78cb d10741e994
commit 49b6519176
20 changed files with 77 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/cli/src/commands/serve.command.ts
View File

@@ -245,6 +245,10 @@ export class ServeCommand {
});
router.post("/unlock", async (ctx, next) => {
// Do not allow guessing password location through serve command
delete ctx.request.query.passwordFile;
delete ctx.request.query.passwordEnv;
const response = await this.unlockCommand.run(
ctx.request.body.password == null ? null : (ctx.request.body.password as string),
ctx.request.query

15
apps/web/src/app/vault/individual-vault/vault.component.ts
View File

@@ -38,7 +38,6 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
import { Organization } from "@bitwarden/common/admin-console/models/domain/organization";
import { TokenService } from "@bitwarden/common/auth/abstractions/token.service";
import { DEFAULT_PBKDF2_ITERATIONS, EventType, KdfType } from "@bitwarden/common/enums";
import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
import { ServiceUtils } from "@bitwarden/common/misc/serviceUtils";
import { TreeNode } from "@bitwarden/common/models/domain/tree-node";
import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
@@ -857,17 +856,9 @@ export class VaultComponent implements OnInit, OnDestroy {
}
async isLowKdfIteration() {
const showLowKdfEnabled = await this.configService.getFeatureFlagBool(
FeatureFlag.DisplayLowKdfIterationWarningFlag
);
if (showLowKdfEnabled) {
const kdfType = await this.stateService.getKdfType();
const kdfOptions = await this.stateService.getKdfConfig();
return kdfType === KdfType.PBKDF2_SHA256 && kdfOptions.iterations < DEFAULT_PBKDF2_ITERATIONS;
}
return showLowKdfEnabled;
const kdfType = await this.stateService.getKdfType();
const kdfOptions = await this.stateService.getKdfConfig();
return kdfType === KdfType.PBKDF2_SHA256 && kdfOptions.iterations < DEFAULT_PBKDF2_ITERATIONS;
}
protected async repromptCipher(ciphers: CipherView[]) {