Bump SDK to 0f73ffde

This includes matrix-org/matrix-rust-sdk#5074, which
adds an `OlmV1Curve25519AesSha2` variant to `AlgorithmInfo`, meaning some
conversions are now fallible.

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

@@ -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)?)
         }))
     }
 

src/machine.rs

@@ -2,6 +2,7 @@
 
 use std::sync::Arc;
 
+use anyhow::anyhow;
 use js_sys::{Array, JsString};
 pub(crate) use matrix_sdk_common::ruma::api::client::{
     backup::add_backup_keys::v3::Response as KeysBackupResponse,
@@ -214,12 +215,18 @@ impl DecryptedRoomEvent {
     }
 }
 
-impl From<matrix_sdk_common::deserialized_responses::TimelineEvent> for DecryptedRoomEvent {
-    fn from(value: matrix_sdk_common::deserialized_responses::TimelineEvent) -> Self {
-        Self {
-            event: value.raw().json().get().to_owned().into(),
-            encryption_info: value.encryption_info().map(|e| e.clone().into()),
-        }
+impl TryFrom<matrix_sdk_common::deserialized_responses::TimelineEvent> for DecryptedRoomEvent {
+    type Error = anyhow::Error;
+
+    fn try_from(
+        value: matrix_sdk_common::deserialized_responses::TimelineEvent,
+    ) -> Result<Self, Self::Error> {
+        let encryption_info = match value.encryption_info() {
+            None => None,
+            Some(encryption_info) => Some(encryption_info.clone().try_into()?),
+        };
+
+        Ok(Self { event: value.raw().json().get().to_owned().into(), encryption_info })
     }
 }
 
@@ -280,19 +287,28 @@ impl EncryptionInfo {
     }
 }
 
-impl From<Arc<matrix_sdk_common::deserialized_responses::EncryptionInfo>> for EncryptionInfo {
-    fn from(value: Arc<matrix_sdk_common::deserialized_responses::EncryptionInfo>) -> Self {
+impl TryFrom<Arc<matrix_sdk_common::deserialized_responses::EncryptionInfo>> for EncryptionInfo {
+    type Error = anyhow::Error;
+
+    fn try_from(
+        value: Arc<matrix_sdk_common::deserialized_responses::EncryptionInfo>,
+    ) -> Result<Self, Self::Error> {
         match &value.algorithm_info {
-            AlgorithmInfo::MegolmV1AesSha2 { curve25519_key, sender_claimed_keys, .. } => Self {
-                sender: value.sender.clone().into(),
-                sender_device: value.sender_device.clone().map(Into::into),
-                sender_curve25519_key_base64: curve25519_key.clone(),
-                sender_claimed_ed25519_key: sender_claimed_keys
-                    .get(&ruma::DeviceKeyAlgorithm::Ed25519)
-                    .cloned()
-                    .into(),
-                verification_state: value.verification_state.clone(),
-            },
+            AlgorithmInfo::MegolmV1AesSha2 { curve25519_key, sender_claimed_keys, .. } => {
+                Ok(Self {
+                    sender: value.sender.clone().into(),
+                    sender_device: value.sender_device.clone().map(Into::into),
+                    sender_curve25519_key_base64: curve25519_key.clone(),
+                    sender_claimed_ed25519_key: sender_claimed_keys
+                        .get(&ruma::DeviceKeyAlgorithm::Ed25519)
+                        .cloned()
+                        .into(),
+                    verification_state: value.verification_state.clone(),
+                })
+            }
+            AlgorithmInfo::OlmV1Curve25519AesSha2 { .. } => Err(anyhow!(
+                "AlgorithmInfo::OlmV1Curve25519AesSha2 is not applicable for room event EncryptionInfo",
+            )),
         }
     }
 }

src/responses.rs

@@ -480,7 +480,7 @@ pub fn processed_to_device_event_to_js_value(
     processed_to_device_event: matrix_sdk_crypto::types::ProcessedToDeviceEvent,
 ) -> JsValue {
     match processed_to_device_event {
-        matrix_sdk_crypto::types::ProcessedToDeviceEvent::Decrypted(raw) => {
+        matrix_sdk_crypto::types::ProcessedToDeviceEvent::Decrypted { raw, .. } => {
             DecryptedToDeviceEvent { decrypted_raw_event: raw.json().get().into() }.into()
         }
         matrix_sdk_crypto::types::ProcessedToDeviceEvent::UnableToDecrypt(utd) => {