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

crypto: Don't return a result when receiving a ready event 

Ready events might be invalid but we might receive a valid one later on,
e.g. someone is trying to disrupt our verification, so just ignore
invalid ready events.
master
Damir Jelić 2021-06-14 17:16:40 +02:00
parent 073b91fa62
commit df1fe0ebc4
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
matrix_sdk_crypto/src/verification/machine.rs
View File

@ -272,8 +272,7 @@ impl VerificationMachine {
AnyVerificationContent::Ready(c) => {
if let Some(request) = self.requests.get(flow_id.as_str()) {
if request.flow_id() == &flow_id {
// TODO remove this unwrap.
request.receive_ready(event.sender(), c).unwrap();
request.receive_ready(event.sender(), c);
} else {
flow_id_mismatch();
}

11
matrix_sdk_crypto/src/verification/requests.rs
View File

@ -301,15 +301,12 @@ impl VerificationRequest {
})
}
#[allow(clippy::unnecessary_wraps)]
pub(crate) fn receive_ready(&self, sender: &UserId, content: &ReadyContent) -> Result<(), ()> {
pub(crate) fn receive_ready(&self, sender: &UserId, content: &ReadyContent) {
let mut inner = self.inner.lock().unwrap();
if let InnerRequest::Created(s) = &*inner {
*inner = InnerRequest::Ready(s.clone().into_ready(sender, content));
}
Ok(())
}
pub(crate) async fn receive_start(
@ -932,7 +929,7 @@ mod test {
let content: OutgoingContent = alice_request.accept().unwrap().into();
let content = ReadyContent::try_from(&content).unwrap();
bob_request.receive_ready(&alice_id(), &content).unwrap();
bob_request.receive_ready(&alice_id(), &content);
assert!(bob_request.is_ready());
assert!(alice_request.is_ready());
@ -985,7 +982,7 @@ mod test {
let content: OutgoingContent = alice_request.accept().unwrap().into();
let content = ReadyContent::try_from(&content).unwrap();
bob_request.receive_ready(&alice_id(), &content).unwrap();
bob_request.receive_ready(&alice_id(), &content);
assert!(bob_request.is_ready());
assert!(alice_request.is_ready());
@ -1043,7 +1040,7 @@ mod test {
let content: OutgoingContent = alice_request.accept().unwrap().into();
let content = ReadyContent::try_from(&content).unwrap();
bob_request.receive_ready(&alice_id(), &content).unwrap();
bob_request.receive_ready(&alice_id(), &content);
assert!(bob_request.is_ready());
assert!(alice_request.is_ready());