At the same time, this commit makes `ServerName` a newtype around str so other identifier types can borrow out their server name part as a `&ServerName`. This technique works for `ServerName` because it keeps no additional metadata. For the other identifier types to support being created in borrowed form from a string slice, custom DSTs first have to be added to Rust.
163 lines
5.1 KiB
Rust
163 lines
5.1 KiB
Rust
//! Types for the *m.room.encrypted* event.
|
|
|
|
use std::collections::BTreeMap;
|
|
|
|
use js_int::UInt;
|
|
use ruma_events_macros::MessageEventContent;
|
|
use ruma_identifiers::DeviceId;
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
use crate::MessageEvent;
|
|
|
|
/// An event that defines how messages sent in this room should be encrypted.
|
|
pub type EncryptedEvent = MessageEvent<EncryptedEventContent>;
|
|
|
|
/// The payload for `EncryptedEvent`.
|
|
#[derive(Clone, Debug, Deserialize, Serialize, MessageEventContent)]
|
|
#[non_exhaustive]
|
|
#[ruma_event(type = "m.room.encrypted")]
|
|
#[serde(tag = "algorithm")]
|
|
pub enum EncryptedEventContent {
|
|
/// An event encrypted with *m.olm.v1.curve25519-aes-sha2*.
|
|
#[serde(rename = "m.olm.v1.curve25519-aes-sha2")]
|
|
OlmV1Curve25519AesSha2(OlmV1Curve25519AesSha2Content),
|
|
|
|
/// An event encrypted with *m.megolm.v1.aes-sha2*.
|
|
#[serde(rename = "m.megolm.v1.aes-sha2")]
|
|
MegolmV1AesSha2(MegolmV1AesSha2Content),
|
|
}
|
|
|
|
/// The payload for `EncryptedEvent` using the *m.olm.v1.curve25519-aes-sha2* algorithm.
|
|
#[derive(Clone, Debug, Serialize, Deserialize)]
|
|
pub struct OlmV1Curve25519AesSha2Content {
|
|
/// A map from the recipient Curve25519 identity key to ciphertext information.
|
|
pub ciphertext: BTreeMap<String, CiphertextInfo>,
|
|
|
|
/// The Curve25519 key of the sender.
|
|
pub sender_key: String,
|
|
}
|
|
|
|
/// Ciphertext information holding the ciphertext and message type.
|
|
///
|
|
/// Used for messages encrypted with the *m.olm.v1.curve25519-aes-sha2* algorithm.
|
|
#[derive(Clone, Debug, Deserialize, Serialize)]
|
|
pub struct CiphertextInfo {
|
|
/// The encrypted payload.
|
|
pub body: String,
|
|
|
|
/// The Olm message type.
|
|
#[serde(rename = "type")]
|
|
pub message_type: UInt,
|
|
}
|
|
|
|
/// The payload for `EncryptedEvent` using the *m.megolm.v1.aes-sha2* algorithm.
|
|
#[derive(Clone, Debug, Serialize, Deserialize)]
|
|
pub struct MegolmV1AesSha2Content {
|
|
/// The encrypted content of the event.
|
|
pub ciphertext: String,
|
|
|
|
/// The Curve25519 key of the sender.
|
|
pub sender_key: String,
|
|
|
|
/// The ID of the sending device.
|
|
pub device_id: Box<DeviceId>,
|
|
|
|
/// The ID of the session used to encrypt the message.
|
|
pub session_id: String,
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use matches::assert_matches;
|
|
use serde_json::{from_value as from_json_value, json, to_value as to_json_value};
|
|
|
|
use super::{EncryptedEventContent, MegolmV1AesSha2Content};
|
|
use crate::EventJson;
|
|
|
|
#[test]
|
|
fn serialization() {
|
|
let key_verification_start_content =
|
|
EncryptedEventContent::MegolmV1AesSha2(MegolmV1AesSha2Content {
|
|
ciphertext: "ciphertext".into(),
|
|
sender_key: "sender_key".into(),
|
|
device_id: "device_id".into(),
|
|
session_id: "session_id".into(),
|
|
});
|
|
|
|
let json_data = json!({
|
|
"algorithm": "m.megolm.v1.aes-sha2",
|
|
"ciphertext": "ciphertext",
|
|
"sender_key": "sender_key",
|
|
"device_id": "device_id",
|
|
"session_id": "session_id"
|
|
});
|
|
|
|
assert_eq!(to_json_value(&key_verification_start_content).unwrap(), json_data);
|
|
}
|
|
|
|
#[test]
|
|
fn deserialization() {
|
|
let json_data = json!({
|
|
"algorithm": "m.megolm.v1.aes-sha2",
|
|
"ciphertext": "ciphertext",
|
|
"sender_key": "sender_key",
|
|
"device_id": "device_id",
|
|
"session_id": "session_id"
|
|
});
|
|
|
|
assert_matches!(
|
|
from_json_value::<EventJson<EncryptedEventContent>>(json_data)
|
|
.unwrap()
|
|
.deserialize()
|
|
.unwrap(),
|
|
EncryptedEventContent::MegolmV1AesSha2(MegolmV1AesSha2Content {
|
|
ciphertext,
|
|
sender_key,
|
|
device_id,
|
|
session_id,
|
|
}) if ciphertext == "ciphertext"
|
|
&& sender_key == "sender_key"
|
|
&& device_id.as_ref() == "device_id"
|
|
&& session_id == "session_id"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn deserialization_olm() {
|
|
let json_data = json!({
|
|
"sender_key": "test_key",
|
|
"ciphertext": {
|
|
"test_curve_key": {
|
|
"body": "encrypted_body",
|
|
"type": 1
|
|
}
|
|
},
|
|
"algorithm": "m.olm.v1.curve25519-aes-sha2"
|
|
});
|
|
let content = from_json_value::<EventJson<EncryptedEventContent>>(json_data)
|
|
.unwrap()
|
|
.deserialize()
|
|
.unwrap();
|
|
|
|
match content {
|
|
EncryptedEventContent::OlmV1Curve25519AesSha2(c) => {
|
|
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]
|
|
fn deserialization_failure() {
|
|
assert!(from_json_value::<EventJson<EncryptedEventContent>>(
|
|
json!({ "algorithm": "m.megolm.v1.aes-sha2" })
|
|
)
|
|
.unwrap()
|
|
.deserialize()
|
|
.is_err());
|
|
}
|
|
}
|