vv/fractal
1
0
Fork 0
Code Pull requests Projects Releases Packages Activity

verification: Use correct CancelCode for SAS mismatch

Browse source
This commit is contained in:
Julian Sparber 2022-03-21 10:58:58 +01:00
parent fb31c43734
commit 22ec222870
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/session/verification/identity_verification.rs
View file

@ -795,8 +795,11 @@ macro_rules! wait {
}
return Ok(State::Cancelled);
},
Message::UserAction(UserAction::Cancel) | Message::UserAction(UserAction::NotMatch) => {
Message::UserAction(UserAction::Cancel) => {
return $this.cancel_request().await;
},
Message::UserAction(UserAction::NotMatch) => {
return $this.sas_mismatch().await;
},
Message::UserAction(UserAction::Accept) => {
if true $(&& $allow_action)? {
@ -857,7 +860,7 @@ macro_rules! wait_without_scanning_sas {
return $this.cancel_request().await;
}
Message::UserAction(UserAction::NotMatch) => {
return $this.cancel_request().await;
return $this.sas_mismatch().await;
},
Message::UserAction(UserAction::Accept) => {
break;
@ -1080,4 +1083,21 @@ impl Context {
Ok(State::Cancelled)
}
async fn sas_mismatch(self) -> Result<State, RequestVerificationError> {
if let Some(Verification::SasV1(sas_verification)) = self
.client
.encryption()
.get_verification(self.request.other_user_id(), self.request.flow_id())
.await
{
sas_verification.mismatch().await?;
if let Some(info) = sas_verification.cancel_info() {
self.send_cancel_info(info);
}
}
Ok(State::Cancelled)
}
}