Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-23 11:56:00 +01:00
Code Issues Projects 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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.git-blame-ignore-revs
View File

@ -1,2 +1,5 @@
# Apply Prettier https://github.com/bitwarden/cli/pull/426 # Apply Prettier https://github.com/bitwarden/cli/pull/426
910b4a24e649f21acbf4da5b2d422b121d514bd5 910b4a24e649f21acbf4da5b2d422b121d514bd5
# jslib Apply Prettier https://github.com/bitwarden/jslib/pull/581
193434461dbd9c48fe5dcbad95693470aec422ac

2
src/bw.ts
View File

@ -120,7 +120,7 @@ export class Main {
(level) => process.env.BITWARDENCLI_DEBUG !== "true" && level <= LogLevelType.Info (level) => process.env.BITWARDENCLI_DEBUG !== "true" && level <= LogLevelType.Info
); );
this.cryptoFunctionService = new NodeCryptoFunctionService(); this.cryptoFunctionService = new NodeCryptoFunctionService();
this.storageService = new LowdbStorageService(this.logService, null, p, true); this.storageService = new LowdbStorageService(this.logService, null, p, false);
this.secureStorageService = new NodeEnvSecureStorageService( this.secureStorageService = new NodeEnvSecureStorageService(
this.storageService, this.storageService,
this.logService, this.logService,

20
src/program.ts
View File

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

6
src/services/nodeEnvSecureStorage.service.ts
View File

@ -26,7 +26,11 @@ export class NodeEnvSecureStorageService implements StorageService {
} }
async save(key: string, obj: any): Promise<any> { async save(key: string, obj: any): Promise<any> {
if (typeof obj !== "string") { if (obj == null) {
return this.remove(key);
}
if (obj !== null && typeof obj !== "string") {
throw new Error("Only string storage is allowed."); throw new Error("Only string storage is allowed.");
} }
const protectedObj = await this.encrypt(obj); const protectedObj = await this.encrypt(obj);