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

Partially override server DMARC indication

This commit is contained in:
M66B 2024-05-23 19:34:22 +02:00
parent ff97ce5b3e
commit b241c49512
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3512,8 +3512,13 @@ class Core {
List<String> signers = helper.verifyDKIM(context);
message.signedby = (signers.isEmpty() ? null : TextUtils.join(",", signers));
message.dkim = !signers.isEmpty();
message.dmarc = Boolean.TRUE.equals(message.dmarc) ||
helper.isAligned(context, signers, message.return_path, message.smtp_from, message.from);
if (message.dkim) {
boolean aligned = helper.isAligned(context, signers, message.return_path, message.smtp_from, message.from);
if (aligned)
message.dmarc = true;
else if (message.dmarc != null)
message.dmarc = false;
}
}
if (message.size == null && message.total != null)
@ -4668,8 +4673,13 @@ class Core {
List<String> signers = helper.verifyDKIM(context);
message.signedby = (signers.isEmpty() ? null : TextUtils.join(",", signers));
message.dkim = !signers.isEmpty();
message.dmarc = Boolean.TRUE.equals(message.dmarc) ||
helper.isAligned(context, signers, message.return_path, message.smtp_from, message.from);
if (message.dkim) {
boolean aligned = helper.isAligned(context, signers, message.return_path, message.smtp_from, message.from);
if (aligned)
message.dmarc = true;
else if (message.dmarc != null)
message.dmarc = false;
}
}
// Borrow reply name from sender name