Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-27 18:36:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: Don't let malformed From: headers block the receiving pipeline (#3769)

Browse Source 
That's a bug which @Simon-Laux and probably also @hpk42 had, where one malformed incoming (Spam-) mail blocked the receiving of all emails coming after it.

The problem was that from_field_to_contact_id() returned ContactId::UNDEFINED, and then lookup_by_contact() returned Err.
This commit is contained in:
Hocuri
2022-11-22 21:10:26 +01:00
committed by GitHub
parent 4b17813b9f
commit 06b376d242
4 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/imap.rs
View File

@@ -1754,9 +1754,13 @@ async fn should_move_out_of_spam(
return Ok(false);
}
} else {
let from = match mimeparser::get_from(headers) {
Some(f) => f,
None => return Ok(false),
};
// No chat found.
let (from_id, blocked_contact, _origin) =
from_field_to_contact_id(context, mimeparser::get_from(headers).as_ref(), true).await?;
from_field_to_contact_id(context, &from, true).await?;
if blocked_contact {
// Contact is blocked, leave the message in spam.
return Ok(false);
@@ -2041,8 +2045,12 @@ pub(crate) async fn prefetch_should_download(
.get_header_value(HeaderDef::AutocryptSetupMessage)
.is_some();
let from = match mimeparser::get_from(headers) {
Some(f) => f,
None => return Ok(false),
};
let (_from_id, blocked_contact, origin) =
from_field_to_contact_id(context, mimeparser::get_from(headers).as_ref(), true).await?;
from_field_to_contact_id(context, &from, true).await?;
// prevent_rename=true as this might be a mailing list message and in this case it would be bad if we rename the contact.
// (prevent_rename is the last argument of from_field_to_contact_id())