Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-27 10:26:29 +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/receive_imf.rs
View File

@@ -172,7 +172,7 @@ pub(crate) async fn receive_imf_inner(
// If this is a mailing list email (i.e. list_id_header is some), don't change the displayname because in
// a mailing list the sender displayname sometimes does not belong to the sender email address.
let (from_id, _from_id_blocked, incoming_origin) =
from_field_to_contact_id(context, Some(&mime_parser.from), prevent_rename).await?;
from_field_to_contact_id(context, &mime_parser.from, prevent_rename).await?;
let incoming = from_id != ContactId::SELF;
@@ -370,17 +370,9 @@ pub(crate) async fn receive_imf_inner(
/// * `prevent_rename`: passed through to `add_or_lookup_contacts_by_address_list()`
pub async fn from_field_to_contact_id(
context: &Context,
from: Option<&SingleInfo>,
from: &SingleInfo,
prevent_rename: bool,
) -> Result<(ContactId, bool, Origin)> {
let from = match from {
Some(f) => f,
None => {
warn!(context, "mail has an empty From header");
return Ok((ContactId::UNDEFINED, false, Origin::Unknown));
}
};
let display_name = if prevent_rename {
Some("")
} else {