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

crypto: Don't send cancellations for passive verification requests

master
Damir Jelić 2021-07-19 09:48:22 +02:00
parent 55a9e6836d
commit 0053d2a874
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -465,7 +465,13 @@ impl VerificationRequest {
if self.is_cancelled() || self.is_done() { if self.is_cancelled() || self.is_done() {
None None
} else if self.timed_out() { } else if self.timed_out() {
self.cancel_with_code(CancelCode::Timeout) let request = self.cancel_with_code(CancelCode::Timeout);
if self.is_passive() {
None
} else {
request
}
} else { } else {
None None
} }
@ -681,6 +687,12 @@ impl InnerRequest {
} }
fn cancel(&mut self, cancelled_by_us: bool, cancel_code: &CancelCode) { fn cancel(&mut self, cancelled_by_us: bool, cancel_code: &CancelCode) {
trace!(
cancelled_by_us = cancelled_by_us,
code = cancel_code.as_str(),
"Verification request going into the cancelled state"
);
*self = InnerRequest::Cancelled(match self { *self = InnerRequest::Cancelled(match self {
InnerRequest::Created(s) => s.clone().into_canceled(cancelled_by_us, cancel_code), InnerRequest::Created(s) => s.clone().into_canceled(cancelled_by_us, cancel_code),
InnerRequest::Requested(s) => s.clone().into_canceled(cancelled_by_us, cancel_code), InnerRequest::Requested(s) => s.clone().into_canceled(cancelled_by_us, cancel_code),