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

fix: ignore vc-/vg- prefix for SecurejoinInviterProgress

Browse Source 
Inviter progress is for group if we added Bob to the group,
not if Bob sent us vg-request-with-auth.
This commit is contained in:
link2xt
2025-09-15 18:59:49 +00:00
committed by l
parent cb5f9f3051
commit 40b866117e
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/securejoin.rs
View File

@@ -35,7 +35,7 @@ use crate::token::Namespace;
fn inviter_progress( fn inviter_progress(
context: &Context, context: &Context,
contact_id: ContactId, contact_id: ContactId,
step: &str, is_group: bool,
progress: usize, progress: usize,
) -> Result<()> { ) -> Result<()> {
logged_debug_assert!( logged_debug_assert!(
@@ -43,11 +43,12 @@ fn inviter_progress(
progress == 0 || progress == 1000, progress == 0 || progress == 1000,
"inviter_progress: contact {contact_id}, progress={progress}, but value is not 0 (error) or 1000 (success)." "inviter_progress: contact {contact_id}, progress={progress}, but value is not 0 (error) or 1000 (success)."
); );
let chat_type = match step.get(..3) { let chat_type = if is_group {
Some("vc-") => Chattype::Single, Chattype::Group
Some("vg-") => Chattype::Group, } else {
_ => bail!("Unknown securejoin step {step}"), Chattype::Single
}; };
context.emit_event(EventType::SecurejoinInviterProgress { context.emit_event(EventType::SecurejoinInviterProgress {
contact_id, contact_id,
chat_type, chat_type,
@@ -425,7 +426,8 @@ pub(crate) async fn handle_securejoin_handshake(
.await?; .await?;
chat::add_contact_to_chat_ex(context, Nosync, group_chat_id, contact_id, true) chat::add_contact_to_chat_ex(context, Nosync, group_chat_id, contact_id, true)
.await?; .await?;
inviter_progress(context, contact_id, step, 1000)?; let is_group = true;
inviter_progress(context, contact_id, is_group, 1000)?;
// IMAP-delete the message to avoid handling it by another device and adding the // IMAP-delete the message to avoid handling it by another device and adding the
// member twice. Another device will know the member's key from Autocrypt-Gossip. // member twice. Another device will know the member's key from Autocrypt-Gossip.
Ok(HandshakeMessage::Done) Ok(HandshakeMessage::Done)
@@ -442,7 +444,8 @@ pub(crate) async fn handle_securejoin_handshake(
.await .await
.context("failed sending vc-contact-confirm message")?; .context("failed sending vc-contact-confirm message")?;
inviter_progress(context, contact_id, step, 1000)?; let is_group = false;
inviter_progress(context, contact_id, is_group, 1000)?;
Ok(HandshakeMessage::Ignore) // "Done" would delete the message and break multi-device (the key from Autocrypt-header is needed) Ok(HandshakeMessage::Ignore) // "Done" would delete the message and break multi-device (the key from Autocrypt-header is needed)
} }
} }
@@ -562,7 +565,10 @@ pub(crate) async fn observe_securejoin_on_other_device(
ChatId::set_protection_for_contact(context, contact_id, mime_message.timestamp_sent).await?; ChatId::set_protection_for_contact(context, contact_id, mime_message.timestamp_sent).await?;
if step == "vg-member-added" || step == "vc-contact-confirm" { if step == "vg-member-added" || step == "vc-contact-confirm" {
inviter_progress(context, contact_id, step, 1000)?; let is_group = mime_message
.get_header(HeaderDef::ChatGroupMemberAdded)
.is_some();
inviter_progress(context, contact_id, is_group, 1000)?;
} }
if step == "vg-request-with-auth" || step == "vc-request-with-auth" { if step == "vg-request-with-auth" || step == "vc-request-with-auth" {