chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

room/encrypted: Fix the OlmV1 deserialization

Browse Source 
A m.room.encrypted event with the algorithm type
"m.olm.v1.curve25519-aes-sha2" will have multiple ciphertext values.

The documentation for the struct field even mentions that the
ciphertext is a map, yet it only expected one body and one message type.

This patch fixes the de-serialization and puts all the available
ciphertext values into a hashmap.
This commit is contained in:
poljar 2020-03-09 11:33:08 +01:00 committed by GitHub
parent c81cc48aeb
commit f1bc5438b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/room/encrypted.rs
View File

@ -1,4 +1,5 @@
//! Types for the *m.room.encrypted* event. //! Types for the *m.room.encrypted* event.
use std::collections::HashMap;
use js_int::UInt; use js_int::UInt;
use ruma_identifiers::{DeviceId, EventId, RoomId, UserId}; use ruma_identifiers::{DeviceId, EventId, RoomId, UserId};
@ -235,14 +236,14 @@ pub struct OlmV1Curve25519AesSha2Content {
/// The encryption algorithm used to encrypt this event. /// The encryption algorithm used to encrypt this event.
pub algorithm: Algorithm, pub algorithm: Algorithm,
/// The encrypted content of the event. /// A map from the recipient Curve25519 identity key to ciphertext information.
pub ciphertext: CiphertextInfo, pub ciphertext: HashMap<String, CiphertextInfo>,
/// The Curve25519 key of the sender. /// The Curve25519 key of the sender.
pub sender_key: String, pub sender_key: String,
} }
/// A map from the recipient Curve25519 identity key to ciphertext information. /// Ciphertext information holding the ciphertext and message type.
/// ///
/// Used for messages encrypted with the *m.olm.v1.curve25519-aes-sha2* algorithm. /// Used for messages encrypted with the *m.olm.v1.curve25519-aes-sha2* algorithm.
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] #[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
@ -320,6 +321,27 @@ mod tests {
); );
} }
#[test]
fn deserialization_olm() {
let content = serde_json::from_str::<EventResult<EncryptedEventContent>>(
r#"{"sender_key":"test_key", "ciphertext":{ "test_curve_key": { "body": "encrypted_body", "type": 1 }},"algorithm": "m.olm.v1.curve25519-aes-sha2"}"#
)
.unwrap()
.into_result()
.unwrap();
match content {
EncryptedEventContent::OlmV1Curve25519AesSha2(c) => {
assert_eq!(c.algorithm, Algorithm::OlmV1Curve25519AesSha2);
assert_eq!(c.sender_key, "test_key");
assert_eq!(c.ciphertext.len(), 1);
assert_eq!(c.ciphertext["test_curve_key"].body, "encrypted_body");
assert_eq!(c.ciphertext["test_curve_key"].message_type, 1u16.into());
}
_ => panic!("Wrong content type, expected a OlmV1 content"),
}
}
#[test] #[test]
fn deserialization_failure() { fn deserialization_failure() {
assert!(serde_json::from_str::<EventResult<EncryptedEventContent>>( assert!(serde_json::from_str::<EventResult<EncryptedEventContent>>(