matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-29 16:43:09 +03:00
Code Activity

Merge pull request #1259 from matrix-org/jryans/verified-to-bool

Browse Source 
Force `is_verified` for key backups to bool and fix computation
This commit is contained in:
J. Ryan Stinnett
2020-03-12 15:39:26 +00:00
committed by GitHub
parent 1e503261f2 3b7def880f
commit c204812d9c
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/crypto/DeviceList.js
View File

@@ -379,6 +379,26 @@ export class DeviceList extends EventEmitter {
return DeviceInfo.fromStorage(devs[deviceId], deviceId); return DeviceInfo.fromStorage(devs[deviceId], deviceId);
} }
/**
* Get a user ID by one of their device's curve25519 identity key
*
* @param {string} algorithm encryption algorithm
* @param {string} senderKey curve25519 key to match
*
* @return {string} user ID
*/
getUserByIdentityKey(algorithm, senderKey) {
if (
algorithm !== olmlib.OLM_ALGORITHM &&
algorithm !== olmlib.MEGOLM_ALGORITHM
) {
// we only deal in olm keys
return null;
}
return this._userByIdentityKey[senderKey];
}
/** /**
* Find a device by curve25519 identity key * Find a device by curve25519 identity key
* *
@@ -388,19 +408,11 @@ export class DeviceList extends EventEmitter {
* @return {module:crypto/deviceinfo?} * @return {module:crypto/deviceinfo?}
*/ */
getDeviceByIdentityKey(algorithm, senderKey) { getDeviceByIdentityKey(algorithm, senderKey) {
const userId = this._userByIdentityKey[senderKey]; const userId = this.getUserByIdentityKey(algorithm, senderKey);
if (!userId) { if (!userId) {
return null; return null;
} }
if (
algorithm !== olmlib.OLM_ALGORITHM &&
algorithm !== olmlib.MEGOLM_ALGORITHM
) {
// we only deal in olm keys
return null;
}
const devices = this._devices[userId]; const devices = this._devices[userId];
if (!devices) { if (!devices) {
return null; return null;

7
src/crypto/index.js
View File

@@ -842,7 +842,7 @@ Crypto.prototype.checkDeviceTrust = function(userId, deviceId) {
* @returns {DeviceTrustLevel} * @returns {DeviceTrustLevel}
*/ */
Crypto.prototype._checkDeviceInfoTrust = function(userId, device) { Crypto.prototype._checkDeviceInfoTrust = function(userId, device) {
const trustedLocally = device && device.isVerified(); const trustedLocally = !!(device && device.isVerified());
const userCrossSigning = this._deviceList.getStoredCrossSigningForUser(userId); const userCrossSigning = this._deviceList.getStoredCrossSigningForUser(userId);
if (device && userCrossSigning) { if (device && userCrossSigning) {
@@ -2189,10 +2189,13 @@ Crypto.prototype._backupPendingKeys = async function(limit) {
const forwardedCount = const forwardedCount =
(sessionData.forwarding_curve25519_key_chain || []).length; (sessionData.forwarding_curve25519_key_chain || []).length;
const userId = this._deviceList.getUserByIdentityKey(
olmlib.MEGOLM_ALGORITHM, session.senderKey,
);
const device = this._deviceList.getDeviceByIdentityKey( const device = this._deviceList.getDeviceByIdentityKey(
olmlib.MEGOLM_ALGORITHM, session.senderKey, olmlib.MEGOLM_ALGORITHM, session.senderKey,
); );
const verified = this._checkDeviceInfoTrust(this._userId, device).isVerified(); const verified = this._checkDeviceInfoTrust(userId, device).isVerified();
data[roomId]['sessions'][session.sessionId] = { data[roomId]['sessions'][session.sessionId] = {
first_message_index: firstKnownIndex, first_message_index: firstKnownIndex,