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

Check the backup info against the stored private key when determining trust. (#2167)

Browse Source
This commit is contained in:
Hubert Chathi
2022-02-10 08:34:21 -05:00
committed by GitHub
parent ea0eaff212
commit 47c5c4645e
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/crypto/backup.ts
View File

@@ -313,11 +313,24 @@ export class BackupManager {
return ret; return ret;
} }
const trustedPubkey = this.baseApis.crypto.sessionStore.getLocalTrustedBackupPubKey(); const privKey = await this.baseApis.crypto.getSessionBackupPrivateKey();
if (privKey) {
let algorithm;
try {
algorithm = await BackupManager.makeAlgorithm(backupInfo, async () => privKey);
if ("public_key" in backupInfo.auth_data && backupInfo.auth_data.public_key === trustedPubkey) { if (await algorithm.keyMatches(privKey)) {
logger.info("Backup public key " + trustedPubkey + " is trusted locally"); logger.info("Backup is trusted locally");
ret.trusted_locally = true; ret.trusted_locally = true;
}
} catch {
// do nothing -- if we have an error, then we don't mark it as
// locally trusted
} finally {
if (algorithm) {
algorithm.free();
}
}
} }
const mySigs = backupInfo.auth_data.signatures[this.baseApis.getUserId()] || {}; const mySigs = backupInfo.auth_data.signatures[this.baseApis.getUserId()] || {};