Skip to content

crypto: Save private identity in the MemoryStore #3222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 20, 2024
Merged

crypto: Save private identity in the MemoryStore #3222

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions crates/matrix-sdk-crypto/src/store/memorystore.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ pub struct MemoryStore {
sessions: SessionStore,
inbound_group_sessions: GroupSessionStore,
outbound_group_sessions: StdRwLock<BTreeMap<OwnedRoomId, OutboundGroupSession>>,
private_identity: StdRwLock<Option<PrivateCrossSigningIdentity>>,
tracked_users: StdRwLock<Vec<TrackedUser>>,
olm_hashes: StdRwLock<HashMap<String, HashSet<String>>>,
devices: DeviceStore,
Expand All @@ -77,6 +78,7 @@ impl Default for MemoryStore {
sessions: SessionStore::new(),
inbound_group_sessions: GroupSessionStore::new(),
outbound_group_sessions: Default::default(),
private_identity: Default::default(),
tracked_users: Default::default(),
olm_hashes: Default::default(),
devices: DeviceStore::new(),
Expand Down Expand Up @@ -130,6 +132,10 @@ impl MemoryStore {
.unwrap()
.extend(sessions.into_iter().map(|s| (s.room_id().to_owned(), s)));
}

fn save_private_identity(&self, private_identity: Option<PrivateCrossSigningIdentity>) {
*self.private_identity.write().unwrap() = private_identity;
}
}

type Result<T> = std::result::Result<T, Infallible>;
Expand All @@ -144,7 +150,7 @@ impl CryptoStore for MemoryStore {
}

async fn load_identity(&self) -> Result<Option<PrivateCrossSigningIdentity>> {
Ok(None)
Ok(self.private_identity.read().unwrap().clone())
}

async fn next_batch_token(&self) -> Result<Option<String>> {
Expand All @@ -163,6 +169,7 @@ impl CryptoStore for MemoryStore {
self.save_sessions(changes.sessions).await;
self.save_inbound_group_sessions(changes.inbound_group_sessions);
self.save_outbound_group_sessions(changes.outbound_group_sessions);
self.save_private_identity(changes.private_identity);

self.save_devices(changes.devices.new);
self.save_devices(changes.devices.changed);
Expand Down Expand Up @@ -482,7 +489,10 @@ mod tests {

use crate::{
identities::device::testing::get_device,
olm::{tests::get_account_and_session_test_helper, InboundGroupSession, OlmMessageHash},
olm::{
tests::get_account_and_session_test_helper, InboundGroupSession, OlmMessageHash,
PrivateCrossSigningIdentity,
},
store::{memorystore::MemoryStore, Changes, CryptoStore, PendingChanges},
};

Expand Down Expand Up @@ -568,6 +578,22 @@ mod tests {
assert_eq!(loaded_tracked_users.len(), 2);
}

#[async_test]
async fn test_private_identity_store() {
// Given a private identity
let private_identity = PrivateCrossSigningIdentity::empty(user_id!("@u:s"));

// When we save it to the store
let store = MemoryStore::new();
store.save_private_identity(Some(private_identity.clone()));

// Then we can get it out again
let loaded_identity =
store.load_identity().await.expect("failed to load private identity").unwrap();

assert_eq!(loaded_identity.user_id(), user_id!("@u:s"));
}

#[async_test]
async fn test_device_store() {
let device = get_device();
Expand Down