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

fix lint

Browse Source
This commit is contained in:
Bruno Windels
2020-02-10 17:21:22 +01:00
parent f39518ef93
commit 429a4e3526
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/crypto/verification/QRCode.js
View File

@@ -79,7 +79,9 @@ export class ReciprocateQRCode extends Base {
const keys = {[masterKeyId]: masterKey}; const keys = {[masterKeyId]: masterKey};
const devices = (await this._baseApis.getStoredDevicesForUser(this.userId)) || []; const devices = (await this._baseApis.getStoredDevicesForUser(this.userId)) || [];
const targetDevice = devices.find(d => d.deviceId === this.request.estimatedTargetDevice.deviceId); const targetDevice = devices.find(d => {
return d.deviceId === this.request.estimatedTargetDevice.deviceId;
});
if (!targetDevice) throw new Error("Device not found, somehow"); if (!targetDevice) throw new Error("Device not found, somehow");
keys[`ed25519:${targetDevice.deviceId}`] = targetDevice.getFingerprint(); keys[`ed25519:${targetDevice.deviceId}`] = targetDevice.getFingerprint();
@@ -95,22 +97,10 @@ export class ReciprocateQRCode extends Base {
console.error("key ID from key info does not match"); console.error("key ID from key info does not match");
throw newKeyMismatchError(); throw newKeyMismatchError();
} }
// if (keyId !== masterKeyId) {
// console.error("key id doesn't match");
// throw newKeyMismatchError();
// }
// if (device.deviceId !== targetKey) {
// console.error("master key does not match device ID");
// throw newKeyMismatchError();
// }
for (const deviceKeyId in device.keys) { for (const deviceKeyId in device.keys) {
if (!deviceKeyId.startsWith("ed25519")) continue; if (!deviceKeyId.startsWith("ed25519")) continue;
const deviceTargetKey = keys[deviceKeyId]; const deviceTargetKey = keys[deviceKeyId];
if (!deviceTargetKey) throw newKeyMismatchError(); if (!deviceTargetKey) throw newKeyMismatchError();
// if (deviceKeyId !== masterKeyId) {
// console.error("device key ID does not match");
// throw newKeyMismatchError();
// }
if (device.keys[deviceKeyId] !== deviceTargetKey) { if (device.keys[deviceKeyId] !== deviceTargetKey) {
console.error("master key does not match"); console.error("master key does not match");
throw newKeyMismatchError(); throw newKeyMismatchError();