matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-05 17:02:07 +03:00
Code Activity

Fix an instance of failed to decrypt error when an in flight /keys/query fails. (#3486)

Browse Source 
* Fix an instance of failed to decrypt error

Specifically, when checking the event sender matches who sent us the
session keys we skip waiting for pending device list updates if we
already know who owns the session key.

* Apply suggestions from code review

Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>

* Update src/crypto/algorithms/olm.ts

Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>

* Fix line wrapping

* Update src/crypto/algorithms/olm.ts

* Fix null check

---------

Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
This commit is contained in:
Erik Johnston
2023-07-04 12:31:03 +01:00
committed by GitHub
parent 09de76bd43
commit 5be4548b3d
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/crypto/algorithms/olm.ts
View File

@@ -194,9 +194,10 @@ class OlmDecryption extends DecryptionAlgorithm {
// check that the device that encrypted the event belongs to the user that the event claims it's from. // check that the device that encrypted the event belongs to the user that the event claims it's from.
// //
// To do this, we need to make sure that our device list is up-to-date. If the device is unknown, we can only // If the device is unknown then we check that we don't have any pending key-query requests for the sender. If
// assume that the device logged out and accept it anyway. Some event handlers, such as secret sharing, may be // after that the device is still unknown, then we can only assume that the device logged out and accept it
// more strict and reject events that come from unknown devices. // anyway. Some event handlers, such as secret sharing, may be more strict and reject events that come from
// unknown devices.
// //
// This is a defence against the following scenario: // This is a defence against the following scenario:
// //
@@ -204,14 +205,26 @@ class OlmDecryption extends DecryptionAlgorithm {
// * Mallory gets control of Alice's server, and sends a megolm session to Alice using her (Mallory's) // * Mallory gets control of Alice's server, and sends a megolm session to Alice using her (Mallory's)
// senderkey, but claiming to be from Bob. // senderkey, but claiming to be from Bob.
// * Mallory sends more events using that session, claiming to be from Bob. // * Mallory sends more events using that session, claiming to be from Bob.
// * Alice sees that the senderkey is verified (since she verified Mallory) so marks events those // * Alice sees that the senderkey is verified (since she verified Mallory) so marks events those events as
// events as verified even though the sender is forged. // verified even though the sender is forged.
// //
// In practice, it's not clear that the js-sdk would behave that way, so this may be only a defence in depth. // In practice, it's not clear that the js-sdk would behave that way, so this may be only a defence in depth.
let senderKeyUser = this.crypto.deviceList.getUserByIdentityKey(olmlib.OLM_ALGORITHM, deviceKey);
if (senderKeyUser === undefined || senderKeyUser === null) {
// Wait for any pending key query fetches for the user to complete before trying the lookup again.
try {
await this.crypto.deviceList.downloadKeys([event.getSender()!], false); await this.crypto.deviceList.downloadKeys([event.getSender()!], false);
const senderKeyUser = this.crypto.deviceList.getUserByIdentityKey(olmlib.OLM_ALGORITHM, deviceKey); } catch (e) {
if (senderKeyUser !== event.getSender() && senderKeyUser != undefined) { throw new DecryptionError("OLM_BAD_SENDER_CHECK_FAILED", "Could not verify sender identity", {
sender: deviceKey,
err: e as Error,
});
}
senderKeyUser = this.crypto.deviceList.getUserByIdentityKey(olmlib.OLM_ALGORITHM, deviceKey);
}
if (senderKeyUser !== event.getSender() && senderKeyUser !== undefined && senderKeyUser !== null) {
throw new DecryptionError("OLM_BAD_SENDER", "Message claimed to be from " + event.getSender(), { throw new DecryptionError("OLM_BAD_SENDER", "Message claimed to be from " + event.getSender(), {
real_sender: senderKeyUser, real_sender: senderKeyUser,
}); });