From 1dd2b2c9e8353f9feef9cb5e4c1f7758d0f7be90 Mon Sep 17 00:00:00 2001 From: Valere Date: Fri, 10 Jan 2025 13:21:33 +0100 Subject: [PATCH] test: Test the KnownSenderData migration with optimised [u8] serialization --- crates/matrix-sdk-crypto/Cargo.toml | 1 + .../src/olm/group_sessions/sender_data.rs | 36 +++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/crates/matrix-sdk-crypto/Cargo.toml b/crates/matrix-sdk-crypto/Cargo.toml index 551c89a9ba..17c7c1c746 100644 --- a/crates/matrix-sdk-crypto/Cargo.toml +++ b/crates/matrix-sdk-crypto/Cargo.toml @@ -87,6 +87,7 @@ http = { workspace = true } indoc = "2.0.5" insta = { workspace = true } matrix-sdk-test = { workspace = true } +rmp-serde = { workspace = true } proptest = { workspace = true } similar-asserts = { workspace = true } # required for async_test macro diff --git a/crates/matrix-sdk-crypto/src/olm/group_sessions/sender_data.rs b/crates/matrix-sdk-crypto/src/olm/group_sessions/sender_data.rs index 697507647f..9ac3b4a546 100644 --- a/crates/matrix-sdk-crypto/src/olm/group_sessions/sender_data.rs +++ b/crates/matrix-sdk-crypto/src/olm/group_sessions/sender_data.rs @@ -352,11 +352,11 @@ mod tests { device_id, owned_device_id, owned_user_id, user_id, DeviceKeyAlgorithm, DeviceKeyId, }; use serde_json::json; - use vodozemac::{Curve25519PublicKey, Ed25519PublicKey}; + use vodozemac::{base64_decode, Curve25519PublicKey, Ed25519PublicKey}; use super::SenderData; use crate::{ - olm::KnownSenderData, + olm::{KnownSenderData, PickledInboundGroupSession}, types::{DeviceKey, DeviceKeys, EventEncryptionAlgorithm, Signatures}, }; @@ -616,4 +616,36 @@ mod tests { Ed25519PublicKey::from_slice(&[0u8; 32]).unwrap().to_base64() ); } + + #[test] + fn test_sender_known_data_migration_with_efficient_bytes_array() { + // This is an serialized PickledInboundGroupSession as rmp_serde will generate. + // + // This export usse a more efficient serialization format for bytes. This was + // exported when the `KnownSenderData` master_key was serialized as an byte + // array instead of a base64 encoded string. + const SERIALIZED_B64: &str = + "iaZwaWNrbGWEr2luaXRpYWxfcmF0Y2hldIKlaW5uZXLcAIABYMzfSnBRzMlPKF1uKjYbzLtkzNJ4RcylzN0HzP\ + 9DzON1Tm05zO7M2MzFQsy9Acz9zPnMqDvM4syQzNrMzxF5KzbM4sy9zPUbBWfM7m4/zJzM18zDzMESKgfMkE7M\ + yszIHszqWjYyQURbzKTMkx7M58zANsy+AGPM2A8tbcyFYczge8ykzMFdbVxJMMyAzN8azJEXGsy8zPJazMMaP8\ + ziDszmWwfM+My2ajLMr8y+eczTRm9TFadjb3VudGVyAKtzaWduaW5nX2tlecQgefpCr6Duu7QUWzKIeMOFmxv/\ + NjfcsYwZz8IN2ZOhdaS0c2lnbmluZ19rZXlfdmVyaWZpZWTDpmNvbmZpZ4GndmVyc2lvbqJWMapzZW5kZXJfa2\ + V52StoMkIySDg2ajFpYmk2SW13ak9UUkhzbTVMamtyT2kyUGtiSXVUb0w0TWtFq3NpZ25pbmdfa2V5gadlZDI1\ + NTE52StUWHJqNS9UYXpia3Yram1CZDl4UlB4NWNVaFFzNUNnblc1Q1pNRjgvNjZzq3NlbmRlcl9kYXRhgbBTZW\ + 5kZXJVbnZlcmlmaWVkg6d1c2VyX2lks0B2YWxvdTM1Om1hdHJpeC5vcmepZGV2aWNlX2lkqkZJQlNaRlJLUE2q\ + bWFzdGVyX2tlecQgkOp9s4ClyQujYD7rRZA8xgE6kvYlqKSNnMrQNmSrcuGncm9vbV9pZL4hRWt5VEtGdkViYl\ + B6SmxhaUhFOm1hdHJpeC5vcmeoaW1wb3J0ZWTCqWJhY2tlZF91cMKyaGlzdG9yeV92aXNpYmlsaXR5wKlhbGdv\ + cml0aG20bS5tZWdvbG0udjEuYWVzLXNoYTI"; + + let input = base64_decode(SERIALIZED_B64).unwrap(); + let sender_data: PickledInboundGroupSession = rmp_serde::from_slice(&input) + .expect("Should be able to deserialize serialized inbound group session"); + + assert_let!( + SenderData::SenderUnverified(KnownSenderData { master_key, .. }) = + sender_data.sender_data + ); + + assert_eq!(master_key.to_base64(), "kOp9s4ClyQujYD7rRZA8xgE6kvYlqKSNnMrQNmSrcuE"); + } }