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

fix: do not create ad-hoc groups from partial downloads

Browse Source
This commit is contained in:
link2xt
2024-04-11 19:02:55 +00:00
parent 08cbc54c00
commit 0aea7d1e02
2 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/receive_imf.rs
View File

@@ -1749,7 +1749,19 @@ async fn create_or_lookup_group(
) -> Result<Option<(ChatId, Blocked)>> {
let grpid = if let Some(grpid) = try_getting_grpid(mime_parser) {
grpid
} else if allow_creation {
} else if !allow_creation {
info!(context, "Creating ad-hoc group prevented from caller.");
return Ok(None);
} else if is_partial_download {
// Partial download may be an encrypted message with protected Subject header.
//
// We do not want to create a group with "..." or "Encrypted message" as a subject.
info!(
context,
"Ad-hoc group cannot be created from partial download."
);
return Ok(None);
} else {
let mut member_ids: Vec<ContactId> = to_ids.to_vec();
if !member_ids.contains(&(from_id)) {
member_ids.push(from_id);
@@ -1763,9 +1775,6 @@ async fn create_or_lookup_group(
.context("could not create ad hoc group")?
.map(|chat_id| (chat_id, create_blocked));
return Ok(res);
} else {
info!(context, "Creating ad-hoc group prevented from caller.");
return Ok(None);
};
let mut chat_id;