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

More small improvements

Browse Source 
"alice@mailo.com/alice@mail.ru" was a really uninteresting file that
needed a special-case in the test since for some reason, there just was
no good Authentication-Results header
This commit is contained in:
Hocuri
2022-10-14 18:53:12 +02:00
parent 63ddc927a2
commit 097830120b
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/authres_handling.rs
View File

@@ -516,18 +516,15 @@ Authentication-Results: box.hispanilandia.net; spf=pass smtp.mailfrom=adbenitez@
let from_domain = EmailAddress::new(from).unwrap().domain; let from_domain = EmailAddress::new(from).unwrap().domain;
let dkim_result = dkim_works(&t, &from_domain).await.unwrap(); let dkim_result = dkim_works(&t, &from_domain).await.unwrap();
// delta.blinzeln.de and gmx.de have invalid DKIM, so the DKIM check should fail // delta.blinzeln.de and gmx.de have invalid DKIM, so the DKIM check should fail
let expected_result = (from_domain != "delta.blinzeln.de") && (from_domain != "gmx.de") let expected_result = (from_domain != "delta.blinzeln.de") && (from_domain != "gmx.de")
// These are (fictional) forged emails where the attacker added a fake // These are (fictional) forged emails where the attacker added a fake
// Authentication-Results before sending the email // Authentication-Results before sending the email
&& from != "forged-authres-added@example.com" && from != "forged-authres-added@example.com"
// Other forged emails // Other forged emails
&& !from.starts_with("forged") && !from.starts_with("forged");
&& !entry
.path()
.to_str()
.unwrap()
.ends_with("alice@mailo.com/alice@mail.ru");
if dkim_result != expected_result { if dkim_result != expected_result {
if authres_parsing_works { if authres_parsing_works {
println!( println!(
@@ -554,7 +551,7 @@ Authentication-Results: box.hispanilandia.net; spf=pass smtp.mailfrom=adbenitez@
// Even if the format is wrong and parsing fails, handle_authres() shouldn't // Even if the format is wrong and parsing fails, handle_authres() shouldn't
// return an Err because this would prevent the message from being added // return an Err because this would prevent the message from being added
// to the database and // to the database and downloaded again and again
let bytes = b"Authentication-Results: dkim="; let bytes = b"Authentication-Results: dkim=";
let mail = mailparse::parse_mail(bytes).unwrap(); let mail = mailparse::parse_mail(bytes).unwrap();
handle_authres(&t, &mail, "invalidfrom.com").await.unwrap(); handle_authres(&t, &mail, "invalidfrom.com").await.unwrap();

3
test-data/message/dkimchecks-2022-09-28/alice@mailo.com/alice@mail.ru
View File

@@ -1,3 +0,0 @@
From: <alice@mail.ru>
To: <alice@mailo.com>
Authentication-Results: smtpng1.m.smailru.net; auth=pass smtp.auth=alice@mail.ru smtp.mailfrom=alice@mail.ru