imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup tasks in SecurityManager/SetupEncryptionStore (#12764)

Browse source 
* Remove call to no-op `checkOwnCrossSigningTrust`

this is a no-op on rust crypto

* inline `SecurityManager.isCachingAllowed`

Since https://github.com/matrix-org/matrix-react-sdk/pull/4789, this has just
been an obscure way to write a test of a local variable.

* Remove unused `CreateSecretStorageOpts.getKeyBackupPassphrase` parameter

This is unused on rust crypto (cf https://github.com/matrix-org/matrix-js-sdk/pull/4313)
This commit is contained in:
Richard van der Hoff 2024-07-13 11:27:59 +01:00 • committed by GitHub
parent db95f26ffa
commit 348000100a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/SecurityManager.ts
View file

@ -25,7 +25,6 @@ import { MatrixClientPeg } from "./MatrixClientPeg";
import { _t } from "./languageHandler";
import { isSecureBackupRequired } from "./utils/WellKnownUtils";
import AccessSecretStorageDialog, { KeyParams } from "./components/views/dialogs/security/AccessSecretStorageDialog";
import RestoreKeyBackupDialog from "./components/views/dialogs/security/RestoreKeyBackupDialog";
import SettingsStore from "./settings/SettingsStore";
import { ModuleRunner } from "./modules/ModuleRunner";
import QuestionDialog from "./components/views/dialogs/QuestionDialog";
@ -45,10 +44,6 @@ let dehydrationCache: {
keyInfo?: SecretStorage.SecretStorageKeyDescription;
} = {};
function isCachingAllowed(): boolean {
return secretStorageBeingAccessed;
}
/**
* This can be used by other components to check if secret storage access is in
* progress, so that we can e.g. avoid intermittently showing toasts during
@ -118,7 +113,7 @@ async function getSecretStorageKey({
}
// Check the in-memory cache
if (isCachingAllowed() && secretStorageKeys[keyId]) {
if (secretStorageBeingAccessed && secretStorageKeys[keyId]) {
return [keyId, secretStorageKeys[keyId]];
}
@ -226,7 +221,7 @@ function cacheSecretStorageKey(
keyInfo: SecretStorage.SecretStorageKeyDescription,
key: Uint8Array,
): void {
if (isCachingAllowed()) {
if (secretStorageBeingAccessed) {
secretStorageKeys[keyId] = key;
secretStorageKeyInfo[keyId] = keyInfo;
}
@ -278,26 +273,6 @@ export const crossSigningCallbacks: ICryptoCallbacks = {
getDehydrationKey,
};
export async function promptForBackupPassphrase(): Promise<Uint8Array> {
let key!: Uint8Array;
const { finished } = Modal.createDialog(
RestoreKeyBackupDialog,
{
showSummary: false,
keyCallback: (k: Uint8Array) => (key = k),
},
undefined,
/* priority = */ false,
/* static = */ true,
);
const success = await finished;
if (!success) throw new Error("Key backup prompt cancelled");
return key;
}
/**
* Carry out an operation that may require multiple accesses to secret storage, caching the key.
*
@ -313,10 +288,8 @@ export async function withSecretStorageKeyCache<T>(func: () => Promise<T>): Prom
} finally {
// Clear secret storage key cache now that work is complete
secretStorageBeingAccessed = false;
if (!isCachingAllowed()) {
secretStorageKeys = {};
secretStorageKeyInfo = {};
}
secretStorageKeys = {};
secretStorageKeyInfo = {};
}
}
@ -395,9 +368,7 @@ async function doAccessSecretStorage(func: () => Promise<void>, forceReset: bool
}
},
});
await crypto.bootstrapSecretStorage({
getKeyBackupPassphrase: promptForBackupPassphrase,
});
await crypto.bootstrapSecretStorage({});
const keyId = Object.keys(secretStorageKeys)[0];
if (keyId && SettingsStore.getValue("feature_dehydration")) {