matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-25 05:23:13 +03:00
Code Activity

Revert to previous cross-signing keys on error

Browse Source
This commit is contained in:
J. Ryan Stinnett
2019-11-27 16:11:06 +00:00
parent 5b767ae948
commit 9d91d197e4
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/crypto/index.js
View File

@@ -403,6 +403,8 @@ Crypto.prototype.resetCrossSigningKeys = async function(level, {
doInteractiveAuthFlow = async func => await func(),
} = {}) {
logger.info(`Resetting cross-signing keys at level ${level}`);
// Copy old keys (usually empty) in case we need to revert
const oldKeys = Object.assign({}, this._crossSigningInfo.keys);
try {
await this._crossSigningInfo.resetKeys(level);
await this._signObject(this._crossSigningInfo.keys.master);
@@ -427,8 +429,8 @@ Crypto.prototype.resetCrossSigningKeys = async function(level, {
} catch (e) {
// If anything failed here, remove the keys so we know to try again from the start
// next time.
logger.error("Resetting cross-signing keys failed, removing keys", e);
this._crossSigningInfo.removeKeys(level);
logger.error("Resetting cross-signing keys failed, revert to previous keys", e);
this._crossSigningInfo.keys = oldKeys;
throw e;
}
this._baseApis.emit("crossSigning.keysChanged", {});