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

keep a copy of the master/device key and mode, for use in reciprocate

Browse Source
This commit is contained in:
Bruno Windels
2020-03-31 15:06:57 +02:00
parent 725976d472
commit b642030a34
1 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -121,7 +121,17 @@ const MODE_VERIFY_SELF_UNTRUSTED = 0x02; // We do not trust the master key
export class QRCodeData { export class QRCodeData {
constructor(request, client) { constructor(request, client) {
const qrData = QRCodeData._generateQrData(request, client); this._mode = QRCodeData._determineMode(request, client);
this._otherUserMasterKey = null;
this._otherDeviceKey = null;
if (this._mode === MODE_VERIFY_OTHER_USER) {
const otherUserCrossSigningInfo =
client.getStoredCrossSigningForUser(request.otherUserId);
this._otherUserMasterKey = otherUserCrossSigningInfo.getId("master");
} else if (this._mode === MODE_VERIFY_SELF_TRUSTED) {
this._otherDeviceKey = QRCodeData._getOtherDeviceKey(request, client);
}
const qrData = QRCodeData._generateQrData(request, client, this._mode);
this._buffer = QRCodeData._generateBuffer(qrData); this._buffer = QRCodeData._generateBuffer(qrData);
} }
@@ -129,7 +139,28 @@ export class QRCodeData {
return this._buffer; return this._buffer;
} }
static _generateQrData(request, client) { get mode() {
return this._mode;
}
get otherDeviceKey() {
return this._otherDeviceKey;
}
get otherUserMasterKey() {
return this._otherUserMasterKey;
}
static _getOtherDeviceKey(request, client) {
const myUserId = client.getUserId();
const myDevices = client.getStoredDevicesForUser(myUserId) || [];
const otherDevice = request.targetDevice;
const otherDeviceId = otherDevice ? otherDevice.deviceId : null;
const device = myDevices.find(d => d.deviceId === otherDeviceId);
return device.getFingerprint();
}
static _determineMode(request, client) {
const myUserId = client.getUserId(); const myUserId = client.getUserId();
const otherUserId = request.otherUserId; const otherUserId = request.otherUserId;
@@ -143,9 +174,12 @@ export class QRCodeData {
mode = MODE_VERIFY_SELF_UNTRUSTED; mode = MODE_VERIFY_SELF_UNTRUSTED;
} }
} }
return mode;
}
static _generateQrData(request, client, mode) {
const myUserId = client.getUserId();
const transactionId = request.channel.transactionId; const transactionId = request.channel.transactionId;
const qrData = { const qrData = {
prefix: BINARY_PREFIX, prefix: BINARY_PREFIX,
version: CODE_VERSION, version: CODE_VERSION,
@@ -157,31 +191,22 @@ export class QRCodeData {
}; };
const myCrossSigningInfo = client.getStoredCrossSigningForUser(myUserId); const myCrossSigningInfo = client.getStoredCrossSigningForUser(myUserId);
const myDevices = client.getStoredDevicesForUser(myUserId) || []; const myMasterKey = myCrossSigningInfo.getId("master");
if (mode === MODE_VERIFY_OTHER_USER) { if (mode === MODE_VERIFY_OTHER_USER) {
// First key is our master cross signing key // First key is our master cross signing key
qrData.firstKeyB64 = myCrossSigningInfo.getId("master"); qrData.firstKeyB64 = myMasterKey;
// Second key is the other user's master cross signing key // Second key is the other user's master cross signing key
const otherUserCrossSigningInfo = qrData.secondKeyB64 = this._otherUserMasterKey;
client.getStoredCrossSigningForUser(otherUserId);
qrData.secondKeyB64 = otherUserCrossSigningInfo.getId("master");
} else if (mode === MODE_VERIFY_SELF_TRUSTED) { } else if (mode === MODE_VERIFY_SELF_TRUSTED) {
// First key is our master cross signing key // First key is our master cross signing key
qrData.firstKeyB64 = myCrossSigningInfo.getId("master"); qrData.firstKeyB64 = myMasterKey;
qrData.secondKeyB64 = this._otherDeviceKey;
// Second key is the other device's device key
const otherDevice = request.targetDevice;
const otherDeviceId = otherDevice ? otherDevice.deviceId : null;
const device = myDevices.find(d => d.deviceId === otherDeviceId);
qrData.secondKeyB64 = device.getFingerprint();
} else if (mode === MODE_VERIFY_SELF_UNTRUSTED) { } else if (mode === MODE_VERIFY_SELF_UNTRUSTED) {
// First key is our device's key // First key is our device's key
qrData.firstKeyB64 = client.getDeviceEd25519Key(); qrData.firstKeyB64 = client.getDeviceEd25519Key();
// Second key is what we think our master cross signing key is // Second key is what we think our master cross signing key is
qrData.secondKeyB64 = myCrossSigningInfo.getId("master"); qrData.secondKeyB64 = myMasterKey;
} }
return qrData; return qrData;