Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

ensure /keys/query devices have the keys we need

Browse source
This commit is contained in:
Bruno Windels 2020-09-08 10:51:01 +02:00
parent c32ac2c764
commit 3e100ff5ec
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/matrix/e2ee/DeviceTracker.js
View file

@ -26,8 +26,8 @@ function deviceKeysAsDeviceIdentity(deviceSection) {
return { return {
userId, userId,
deviceId, deviceId,
ed25519Key: deviceSection.keys?.[`ed25519:${deviceId}`], ed25519Key: deviceSection.keys[`ed25519:${deviceId}`],
curve25519Key: deviceSection.keys?.[`curve25519:${deviceId}`], curve25519Key: deviceSection.keys[`curve25519:${deviceId}`],
algorithms: deviceSection.algorithms, algorithms: deviceSection.algorithms,
displayName: deviceSection.unsigned?.device_display_name, displayName: deviceSection.unsigned?.device_display_name,
}; };
@ -200,6 +200,11 @@ export class DeviceTracker {
if (deviceIdOnKeys !== deviceId) { if (deviceIdOnKeys !== deviceId) {
return false; return false;
} }
const ed25519Key = deviceKeys.keys?.[`ed25519:${deviceId}`];
const curve25519Key = deviceKeys.keys?.[`curve25519:${deviceId}`];
if (typeof ed25519Key !== "string" || typeof curve25519Key !== "string") {
return false;
}
// don't store our own device // don't store our own device
if (userId === this._ownUserId && deviceId === this._ownDeviceId) { if (userId === this._ownUserId && deviceId === this._ownDeviceId) {
return false; return false;