Dima/matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(sdk): Move the crypto plumbing of the sync into a separate method

Browse Source
This commit is contained in:
Damir Jelić
2021-09-16 14:14:37 +02:00
parent 626f4b92b5
commit 729a29352b
2 changed files with 55 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/matrix-sdk/src/client.rs
+3 -69
View File
@@ -1796,75 +1796,9 @@ impl Client {
};
#[cfg(feature = "encryption")]
{
use matrix_sdk_base::crypto::OutgoingRequests;
// This is needed because sometimes we need to automatically
// claim some one-time keys to unwedge an existing Olm session.
if let Err(e) = self.claim_one_time_keys([].iter()).await {
warn!("Error while claiming one-time keys {:?}", e);
}
// TODO we should probably abort if we get an cryptostore error here
let outgoing_requests = match self.base_client.outgoing_requests().await {
Ok(r) => r,
Err(e) => {
warn!("Could not fetch the outgoing requests {:?}", e);
vec![]
}
};
for r in outgoing_requests {
match r.request() {
OutgoingRequests::KeysQuery(request) => {
if let Err(e) =
self.keys_query(r.request_id(), request.device_keys.clone()).await
{
warn!("Error while querying device keys {:?}", e);
}
}
OutgoingRequests::KeysUpload(request) => {
if let Err(e) = self.keys_upload(r.request_id(), request).await {
warn!("Error while querying device keys {:?}", e);
}
}
OutgoingRequests::ToDeviceRequest(request) => {
// TODO remove this unwrap
if let Ok(resp) = self.send_to_device(request).await {
self.base_client
.mark_request_as_sent(r.request_id(), &resp)
.await
.unwrap();
}
}
OutgoingRequests::SignatureUpload(request) => {
// TODO remove this unwrap.
if let Ok(resp) = self.send(request.clone(), None).await {
self.base_client
.mark_request_as_sent(r.request_id(), &resp)
.await
.unwrap();
}
}
OutgoingRequests::RoomMessage(request) => {
if let Ok(resp) = self.room_send_helper(request).await {
self.base_client
.mark_request_as_sent(r.request_id(), &resp)
.await
.unwrap();
}
}
OutgoingRequests::KeysClaim(request) => {
if let Ok(resp) = self.send(request.clone(), None).await {
self.base_client
.mark_request_as_sent(r.request_id(), &resp)
.await
.unwrap();
}
}
}
}
}
if let Err(e) = self.send_outgoing_request().await {
error!(error =? e, "Error while sending outgoing E2EE requests");
};
if callback(response).await == LoopCtrl::Break {
return;
crates/matrix-sdk/src/encryption/mod.rs
+52 -1
View File
@@ -42,7 +42,7 @@ use ruma::{
events::{AnyMessageEvent, AnyRoomEvent, AnySyncMessageEvent, EventType},
DeviceId, DeviceIdBox, UserId,
};
use tracing::{debug, instrument, trace};
use tracing::{debug, instrument, trace, warn};
use crate::{
encryption::{
@@ -696,4 +696,55 @@ impl Client {
trace!(room =? room, "Found room");
room
}
pub(crate) async fn send_outgoing_request(&self) -> Result<()> {
use matrix_sdk_base::crypto::OutgoingRequests;
// This is needed because sometimes we need to automatically
// claim some one-time keys to unwedge an existing Olm session.
if let Err(e) = self.claim_one_time_keys([].iter()).await {
warn!("Error while claiming one-time keys {:?}", e);
}
let outgoing_requests = self.base_client.outgoing_requests().await?;
for r in outgoing_requests {
match r.request() {
OutgoingRequests::KeysQuery(request) => {
if let Err(e) =
self.keys_query(r.request_id(), request.device_keys.clone()).await
{
warn!("Error while querying device keys {:?}", e);
}
}
OutgoingRequests::KeysUpload(request) => {
if let Err(e) = self.keys_upload(r.request_id(), request).await {
warn!("Error while querying device keys {:?}", e);
}
}
OutgoingRequests::ToDeviceRequest(request) => {
if let Ok(resp) = self.send_to_device(request).await {
self.base_client.mark_request_as_sent(r.request_id(), &resp).await?;
}
}
OutgoingRequests::SignatureUpload(request) => {
if let Ok(resp) = self.send(request.clone(), None).await {
self.base_client.mark_request_as_sent(r.request_id(), &resp).await?;
}
}
OutgoingRequests::RoomMessage(request) => {
if let Ok(resp) = self.room_send_helper(request).await {
self.base_client.mark_request_as_sent(r.request_id(), &resp).await?;
}
}
OutgoingRequests::KeysClaim(request) => {
if let Ok(resp) = self.send(request.clone(), None).await {
self.base_client.mark_request_as_sent(r.request_id(), &resp).await?;
}
}
}
}
Ok(())
}
}