matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +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

12
src/crypto/CrossSigning.js
View File

@@ -279,18 +279,6 @@ export class CrossSigningInfo extends EventEmitter {
} }
} }
removeKeys(level) {
if (level & CrossSigningLevel.MASTER) {
this.keys.master = null;
}
if (level & CrossSigningLevel.SELF_SIGNING) {
this.keys.self_signing = null;
}
if (level & CrossSigningLevel.USER_SIGNING) {
this.keys.user_signing = null;
}
}
async signObject(data, type) { async signObject(data, type) {
if (!this.keys[type]) { if (!this.keys[type]) {
throw new Error( throw new Error(

6
src/crypto/index.js
View File

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