Merge pull request #239 from matrix-org/rav/olm_decryption_info

Expose EncryptionInfo on decrypted to-device events

Author: richvdh

CHANGELOG.md

@@ -1,6 +1,6 @@
 # UNRELEASED
 
--   Update matrix-rusk-sdk to `022068996`, which includes:
+-   Update matrix-rusk-sdk to `0f73ffde6`, which includes:
 
     -   Send stable identifier `sender_device_keys` for MSC4147 (Including device
         keys with Olm-encrypted events).

Cargo.lock

@@ -65,9 +65,9 @@ futures-util = "0.3.27"
 getrandom = { version = "0.3.0", features = ["wasm_js"] }
 http = "1.1.0"
 js-sys = "0.3.49"
-matrix-sdk-common = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "022068996", features = ["js"] }
-matrix-sdk-indexeddb = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "022068996", default-features = false, features = ["e2e-encryption"] }
-matrix-sdk-qrcode = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "022068996", optional = true }
+matrix-sdk-common = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "0f73ffde6", features = ["js"] }
+matrix-sdk-indexeddb = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "0f73ffde6", default-features = false, features = ["e2e-encryption"] }
+matrix-sdk-qrcode = { git = "https://github.com/matrix-org/matrix-rust-sdk", rev = "0f73ffde6", optional = true }
 serde = "1.0.91"
 serde_json = "1.0.91"
 serde-wasm-bindgen = "0.6.5"
@@ -84,7 +84,7 @@ vergen-gitcl = { version = "1.0.0", features = ["build"] }
 
 [dependencies.matrix-sdk-crypto]
 git = "https://github.com/matrix-org/matrix-rust-sdk"
-rev = "022068996"
+rev = "0f73ffde6"
 default-features = false
 features = ["js", "automatic-room-key-forwarding"]
 

Cargo.toml

@@ -362,7 +362,7 @@ impl OlmMachine {
 
             Ok(processed_to_device_events
                 .into_iter()
-                .map(processed_to_device_event_to_js_value)
+                .filter_map(processed_to_device_event_to_js_value)
                 .collect::<Vec<_>>())
         }))
     }
@@ -512,7 +512,14 @@ impl OlmMachine {
                 .await
                 .map_err(MegolmDecryptionError::from)?
                 .into();
-            Ok(responses::DecryptedRoomEvent::from(room_event))
+
+            responses::DecryptedRoomEvent::try_from(room_event).map_err(|e: anyhow::Error| {
+                // This happens if we somehow encounter a room event whose encryption info we
+                // don't understand (e.g., it is encrypted with Olm rather than
+                // Megolm). That seems pretty unlikely. If it happens, let's
+                // just treat it as a generic UTD.
+                MegolmDecryptionError::unable_to_decrypt(format!("{e:#}"))
+            })
         }))
     }
 
@@ -545,7 +552,7 @@ impl OlmMachine {
         Ok(future_to_promise(async move {
             let encryption_info =
                 me.get_room_event_encryption_info(&event, room_id.as_ref()).await?;
-            Ok(responses::EncryptionInfo::from(encryption_info))
+            Ok(responses::EncryptionInfo::try_from(encryption_info)?)
         }))
     }