vaultwarden
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Filter out invalid encrypted keys state (#8408)

This commit is contained in:
Justin Baur 2024-03-20 13:56:37 -05:00 committed by GitHub
parent 72402852bb
commit 7b40c21798
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/common/src/platform/services/crypto.service.ts
View File

@ -1,5 +1,5 @@
import * as bigInt from "big-integer"; import * as bigInt from "big-integer";
import { Observable, firstValueFrom, map } from "rxjs"; import { Observable, filter, firstValueFrom, map } from "rxjs";
import { EncryptedOrganizationKeyData } from "../../admin-console/models/data/encrypted-organization-key.data"; import { EncryptedOrganizationKeyData } from "../../admin-console/models/data/encrypted-organization-key.data";
import { ProfileOrganizationResponse } from "../../admin-console/models/response/profile-organization.response"; import { ProfileOrganizationResponse } from "../../admin-console/models/response/profile-organization.response";
@ -100,7 +100,9 @@ export class CryptoService implements CryptoServiceAbstraction {
// User Asymmetric Key Pair // User Asymmetric Key Pair
this.activeUserEncryptedPrivateKeyState = stateProvider.getActive(USER_ENCRYPTED_PRIVATE_KEY); this.activeUserEncryptedPrivateKeyState = stateProvider.getActive(USER_ENCRYPTED_PRIVATE_KEY);
this.activeUserPrivateKeyState = stateProvider.getDerived( this.activeUserPrivateKeyState = stateProvider.getDerived(
this.activeUserEncryptedPrivateKeyState.combinedState$, this.activeUserEncryptedPrivateKeyState.combinedState$.pipe(
filter(([_userId, key]) => key != null),
),
USER_PRIVATE_KEY, USER_PRIVATE_KEY,
{ {
encryptService: this.encryptService, encryptService: this.encryptService,
@ -109,7 +111,7 @@ export class CryptoService implements CryptoServiceAbstraction {
); );
this.activeUserPrivateKey$ = this.activeUserPrivateKeyState.state$; // may be null this.activeUserPrivateKey$ = this.activeUserPrivateKeyState.state$; // may be null
this.activeUserPublicKeyState = stateProvider.getDerived( this.activeUserPublicKeyState = stateProvider.getDerived(
this.activeUserPrivateKey$, this.activeUserPrivateKey$.pipe(filter((key) => key != null)),
USER_PUBLIC_KEY, USER_PUBLIC_KEY,
{ {
cryptoFunctionService: this.cryptoFunctionService, cryptoFunctionService: this.cryptoFunctionService,
@ -122,7 +124,7 @@ export class CryptoService implements CryptoServiceAbstraction {
USER_ENCRYPTED_ORGANIZATION_KEYS, USER_ENCRYPTED_ORGANIZATION_KEYS,
); );
this.activeUserOrgKeysState = stateProvider.getDerived( this.activeUserOrgKeysState = stateProvider.getDerived(
this.activeUserEncryptedOrgKeysState.state$, this.activeUserEncryptedOrgKeysState.state$.pipe(filter((keys) => keys != null)),
USER_ORGANIZATION_KEYS, USER_ORGANIZATION_KEYS,
{ cryptoService: this }, { cryptoService: this },
); );
@ -133,7 +135,7 @@ export class CryptoService implements CryptoServiceAbstraction {
USER_ENCRYPTED_PROVIDER_KEYS, USER_ENCRYPTED_PROVIDER_KEYS,
); );
this.activeUserProviderKeysState = stateProvider.getDerived( this.activeUserProviderKeysState = stateProvider.getDerived(
this.activeUserEncryptedProviderKeysState.state$, this.activeUserEncryptedProviderKeysState.state$.pipe(filter((keys) => keys != null)),
USER_PROVIDER_KEYS, USER_PROVIDER_KEYS,
{ encryptService: this.encryptService, cryptoService: this }, { encryptService: this.encryptService, cryptoService: this },
); );