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

events: Stabilize MSC3700

Browse Source
This commit is contained in:
Kévin Commaille 2022-06-20 16:16:45 +02:00 committed by Kévin Commaille
parent a940de9e41
commit 6bee869b66
4 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/ruma-common/CHANGELOG.md
View File

@ -28,6 +28,7 @@ Improvements:
* Add unstable support for Improved Signalling for 1:1 VoIP (MSC2746) * Add unstable support for Improved Signalling for 1:1 VoIP (MSC2746)
* Add support for knocking in `events::room::member::MembershipChange` * Add support for knocking in `events::room::member::MembershipChange`
* Add `MatrixVersion::V1_3` * Add `MatrixVersion::V1_3`
* Deprecate the `sender_key` and `device_id` fields for encrypted events (MSC3700)
# 0.9.2 # 0.9.2

1
crates/ruma-common/Cargo.toml
View File

@ -47,7 +47,6 @@ unstable-msc3551 = ["unstable-msc1767"]
unstable-msc3552 = ["unstable-msc3551"] unstable-msc3552 = ["unstable-msc3551"]
unstable-msc3553 = ["unstable-msc3552"] unstable-msc3553 = ["unstable-msc3552"]
unstable-msc3554 = ["unstable-msc1767"] unstable-msc3554 = ["unstable-msc1767"]
unstable-msc3700 = []
[dependencies] [dependencies]
base64 = "0.13.0" base64 = "0.13.0"

28
crates/ruma-common/src/events/room/encrypted.rs
View File

@ -264,17 +264,11 @@ pub struct MegolmV1AesSha2Content {
pub ciphertext: String, pub ciphertext: String,
/// The Curve25519 key of the sender. /// The Curve25519 key of the sender.
#[cfg_attr( #[deprecated = "this field still needs to be sent but should not be used when received"]
feature = "unstable-msc3700",
deprecated = "this field still needs to be sent but should not be used when received"
)]
pub sender_key: String, pub sender_key: String,
/// The ID of the sending device. /// The ID of the sending device.
#[cfg_attr( #[deprecated = "this field still needs to be sent but should not be used when received"]
feature = "unstable-msc3700",
deprecated = "this field still needs to be sent but should not be used when received"
)]
pub device_id: OwnedDeviceId, pub device_id: OwnedDeviceId,
/// The ID of the session used to encrypt the message. /// The ID of the session used to encrypt the message.
@ -317,7 +311,7 @@ mod tests {
use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; use serde_json::{from_value as from_json_value, json, to_value as to_json_value};
use super::{ use super::{
EncryptedEventScheme, InReplyTo, MegolmV1AesSha2Content, Relation, EncryptedEventScheme, InReplyTo, MegolmV1AesSha2ContentInit, Relation,
RoomEncryptedEventContent, RoomEncryptedEventContent,
}; };
use crate::{event_id, serde::Raw}; use crate::{event_id, serde::Raw};
@ -325,12 +319,15 @@ mod tests {
#[test] #[test]
fn serialization() { fn serialization() {
let key_verification_start_content = RoomEncryptedEventContent { let key_verification_start_content = RoomEncryptedEventContent {
scheme: EncryptedEventScheme::MegolmV1AesSha2(MegolmV1AesSha2Content { scheme: EncryptedEventScheme::MegolmV1AesSha2(
ciphertext: "ciphertext".into(), MegolmV1AesSha2ContentInit {
sender_key: "sender_key".into(), ciphertext: "ciphertext".into(),
device_id: "device_id".into(), sender_key: "sender_key".into(),
session_id: "session_id".into(), device_id: "device_id".into(),
}), session_id: "session_id".into(),
}
.into(),
),
relates_to: Some(Relation::Reply { relates_to: Some(Relation::Reply {
in_reply_to: InReplyTo { event_id: event_id!("$h29iv0s8:example.com").to_owned() }, in_reply_to: InReplyTo { event_id: event_id!("$h29iv0s8:example.com").to_owned() },
}), }),
@ -353,6 +350,7 @@ mod tests {
} }
#[test] #[test]
#[allow(deprecated)]
fn deserialization() { fn deserialization() {
let json_data = json!({ let json_data = json!({
"algorithm": "m.megolm.v1.aes-sha2", "algorithm": "m.megolm.v1.aes-sha2",

5
crates/ruma-common/src/events/room_key_request.rs
View File

@ -74,10 +74,7 @@ pub struct RequestedKeyInfo {
pub room_id: OwnedRoomId, pub room_id: OwnedRoomId,
/// The Curve25519 key of the device which initiated the session originally. /// The Curve25519 key of the device which initiated the session originally.
#[cfg_attr( #[deprecated = "this field still needs to be sent but should not be used when received"]
feature = "unstable-msc3700",
deprecated = "this field still needs to be sent but should not be used when received"
)]
pub sender_key: String, pub sender_key: String,
/// The ID of the session that the key is for. /// The ID of the session that the key is for.