Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-03 05:16:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix securejoin cancelation

Browse Source
This commit is contained in:
dignifiedquire
2020-05-21 15:09:32 +02:00
parent c89d7b5b18
commit 82c85566dc
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/job.rs
View File

@@ -1113,7 +1113,6 @@ LIMIT 1;
}) })
.await; .await;
dbg!(&job_res);
match job_res { match job_res {
Ok(job) => break job, Ok(job) => break job,
Err(_) => { Err(_) => {

16
src/securejoin.rs
View File

@@ -1,6 +1,7 @@
//! Verified contact protocol implementation as [specified by countermitm project](https://countermitm.readthedocs.io/en/stable/new.html#setup-contact-protocol) //! Verified contact protocol implementation as [specified by countermitm project](https://countermitm.readthedocs.io/en/stable/new.html#setup-contact-protocol)
use async_std::prelude::*; use std::time::Duration;
use percent_encoding::{utf8_percent_encode, AsciiSet, NON_ALPHANUMERIC}; use percent_encoding::{utf8_percent_encode, AsciiSet, NON_ALPHANUMERIC};
use crate::aheader::EncryptPreference; use crate::aheader::EncryptPreference;
@@ -183,18 +184,11 @@ async fn cleanup(
/// Take a scanned QR-code and do the setup-contact/join-group handshake. /// Take a scanned QR-code and do the setup-contact/join-group handshake.
/// See the ffi-documentation for more details. /// See the ffi-documentation for more details.
pub async fn dc_join_securejoin(context: &Context, qr: &str) -> ChatId { pub async fn dc_join_securejoin(context: &Context, qr: &str) -> ChatId {
use futures::future::FutureExt; if let Err(_) = context.alloc_ongoing().await {
let cancel = match context.alloc_ongoing().await {
Ok(cancel) => cancel,
Err(_) => {
return cleanup(&context, ChatId::new(0), false, false).await; return cleanup(&context, ChatId::new(0), false, false).await;
} }
};
securejoin(context, qr) securejoin(context, qr).await
.race(cancel.recv().map(|_| ChatId::new(0)))
.await
} }
async fn securejoin(context: &Context, qr: &str) -> ChatId { async fn securejoin(context: &Context, qr: &str) -> ChatId {
@@ -301,7 +295,7 @@ async fn securejoin(context: &Context, qr: &str) -> ChatId {
if join_vg { if join_vg {
// for a group-join, wait until the secure-join is done and the group is created // for a group-join, wait until the secure-join is done and the group is created
while !context.shall_stop_ongoing().await { while !context.shall_stop_ongoing().await {
async_std::task::sleep(std::time::Duration::from_millis(200)).await; async_std::task::sleep(Duration::from_millis(50)).await;
} }
cleanup(&context, contact_chat_id, true, join_vg).await cleanup(&context, contact_chat_id, true, join_vg).await
} else { } else {