mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Native DKIM: align with auth results header

This commit is contained in:
M66B 2024-05-28 07:59:20 +02:00
parent e5f21d6f1a
commit 9be5d1b385
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/eu/faircode/email/Core.java
View File

@ -3516,10 +3516,23 @@ class Core {
boolean aligned = helper.isAligned(context, signers, message.return_path, message.smtp_from, message.from); boolean aligned = helper.isAligned(context, signers, message.return_path, message.smtp_from, message.from);
if (aligned) if (aligned)
message.dmarc = true; message.dmarc = true;
else if (message.dmarc != null) else if (message.dmarc != null) {
boolean found = false;
String asigner = helper.getSigner(authentication);
String adomain = UriHelper.getRootDomain(context, asigner);
if (adomain != null)
for (String signer : signers) {
String sdomain = UriHelper.getRootDomain(context, signer);
if (adomain.equalsIgnoreCase(sdomain)) {
found = true;
break;
}
}
if (!found)
message.dmarc = false; message.dmarc = false;
} }
} }
}
if (message.size == null && message.total != null) if (message.size == null && message.total != null)
message.size = message.total; message.size = message.total;
@ -4690,10 +4703,23 @@ class Core {
boolean aligned = helper.isAligned(context, signers, message.return_path, message.smtp_from, message.from); boolean aligned = helper.isAligned(context, signers, message.return_path, message.smtp_from, message.from);
if (aligned) if (aligned)
message.dmarc = true; message.dmarc = true;
else if (message.dmarc != null) else if (message.dmarc != null) {
boolean found = false;
String asigner = helper.getSigner(authentication);
String adomain = UriHelper.getRootDomain(context, asigner);
if (adomain != null)
for (String signer : signers) {
String sdomain = UriHelper.getRootDomain(context, signer);
if (adomain.equalsIgnoreCase(sdomain)) {
found = true;
break;
}
}
if (!found)
message.dmarc = false; message.dmarc = false;
} }
} }
}
// Borrow reply name from sender name // Borrow reply name from sender name
if (message.from != null && message.from.length == 1 && if (message.from != null && message.from.length == 1 &&