bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-08 20:50:28 +00:00
Code Issues Releases Wiki Activity

Fix/lowdb no cache (#443)

Browse Source 
* Add jslib prettier commit to client ignore hashes

* Remove lowdb caching

* Fix state service remove being set to null

* Await in-memory key retrieval

* Fix key loading and unlock requests.

* Linter fixes

* linter fixes

* linter fixes
This commit is contained in:
Matt Gibson
2022-01-13 12:03:19 -05:00
committed by GitHub
parent b962af303a
commit 3b1ccb409e
4 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/program.ts
View File

@@ -25,6 +25,8 @@ import { CliUtils } from "./utils";
import { BaseProgram } from "jslib-node/cli/baseProgram";
import { KeySuffixOptions } from "jslib-common/enums/keySuffixOptions";
const writeLn = CliUtils.writeLn;
export class Program extends BaseProgram {
@@ -473,36 +475,34 @@ export class Program extends BaseProgram {
protected async exitIfLocked() {
await this.exitIfNotAuthed();
const hasKey = await this.main.cryptoService.hasKey();
if (!hasKey) {
const canInteract = process.env.BW_NOINTERACTION !== "true";
if (canInteract) {
const usesKeyConnector = await this.main.keyConnectorService.getUsesKeyConnector();
if (usesKeyConnector) {
const response = Response.error(
"Your vault is locked. You must unlock your vault using your session key.\n" +
"If you do not have your session key, you can get a new one by logging out and logging in again."
);
this.processResponse(response, true);
} else {
const command = new UnlockCommand(
this.main.cryptoService,
this.main.stateService,
this.main.cryptoFunctionService,
this.main.apiService,
this.main.logService
);
const response = await command.run(null, null);
if (!response.success) {
this.processResponse(response, true);
}
}
} else {
this.processResponse(Response.error("Vault is locked."), true);
}
} else if (!this.main.cryptoService.hasKeyInMemory()) {
if (await this.main.cryptoService.hasKeyInMemory()) {
return;
} else if (await this.main.cryptoService.hasKeyStored(KeySuffixOptions.Auto)) {
// load key into memory
await this.main.cryptoService.getKey();
} else if (process.env.BW_NOINTERACTION !== "true") {
// must unlock
if (await this.main.keyConnectorService.getUsesKeyConnector()) {
const response = Response.error(
"Your vault is locked. You must unlock your vault using your session key.\n" +
"If you do not have your session key, you can get a new one by logging out and logging in again."
);
this.processResponse(response, true);
} else {
const command = new UnlockCommand(
this.main.cryptoService,
this.main.stateService,
this.main.cryptoFunctionService,
this.main.apiService,
this.main.logService
);
const response = await command.run(null, null);
if (!response.success) {
this.processResponse(response, true);
}
}
} else {
this.processResponse(Response.error("Vault is locked."), true);
}
}
}