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

Merge pull request #5812 from matrix-org/jryans/cancel-security-key

Browse source 
Tweak security key error handling
This commit is contained in:
J. Ryan Stinnett 2021-03-29 17:58:11 +01:00 • committed by GitHub
commit 3a09c22173
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/SecurityManager.ts
View file

@ -395,6 +395,8 @@ export async function accessSecretStorage(func = async () => { }, forceReset = f
} catch (e) { } catch (e) {
SecurityCustomisations.catchAccessSecretStorageError?.(e); SecurityCustomisations.catchAccessSecretStorageError?.(e);
console.error(e); console.error(e);
// Re-throw so that higher level logic can abort as needed
throw e;
} finally { } finally {
// Clear secret storage key cache now that work is complete // Clear secret storage key cache now that work is complete
secretStorageBeingAccessed = false; secretStorageBeingAccessed = false;

5
src/stores/SetupEncryptionStore.js
View file

@ -121,7 +121,6 @@ export class SetupEncryptionStore extends EventEmitter {
// on the first trust check, and the key backup restore will happen // on the first trust check, and the key backup restore will happen
// in the background. // in the background.
await new Promise((resolve, reject) => { await new Promise((resolve, reject) => {
try {
accessSecretStorage(async () => { accessSecretStorage(async () => {
await cli.checkOwnCrossSigningTrust(); await cli.checkOwnCrossSigningTrust();
resolve(); resolve();
@ -132,10 +131,6 @@ export class SetupEncryptionStore extends EventEmitter {
await cli.restoreKeyBackupWithSecretStorage(backupInfo); await cli.restoreKeyBackupWithSecretStorage(backupInfo);
} }
}).catch(reject); }).catch(reject);
} catch (e) {
console.error(e);
reject(e);
}
}); });
if (cli.getCrossSigningId()) { if (cli.getCrossSigningId()) {