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

Check DKIM requirements

This commit is contained in:
M66B 2022-03-22 20:05:11 +01:00
parent 4dbed4a887
commit f286ca533a
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2953,6 +2953,8 @@ class Core {
message.bimi_selector = helper.getBimiSelector();
message.tls = helper.getTLS();
message.dkim = MessageHelper.getAuthentication("dkim", authentication);
if (Boolean.TRUE.equals(message.dkim))
message.dkim = helper.checkDKIMRequirements();
message.spf = MessageHelper.getAuthentication("spf", authentication);
if (message.spf == null && helper.getSPF())
message.spf = true;
@ -3921,6 +3923,8 @@ class Core {
message.bimi_selector = helper.getBimiSelector();
message.tls = helper.getTLS();
message.dkim = MessageHelper.getAuthentication("dkim", authentication);
if (Boolean.TRUE.equals(message.dkim))
message.dkim = helper.checkDKIMRequirements();
message.spf = MessageHelper.getAuthentication("spf", authentication);
if (message.spf == null && helper.getSPF())
message.spf = true;

33
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@ -1832,6 +1832,39 @@ public class MessageHelper {
return (spf.trim().toLowerCase(Locale.ROOT).startsWith("pass"));
}
boolean checkDKIMRequirements() throws MessagingException {
ensureHeaders();
String[] headers = imessage.getHeader("DKIM-Signature");
if (headers == null || headers.length < 1)
return false;
for (String header : headers) {
Map<String, String> kv = getKeyValues(header);
// Hashed body length
Integer l = Helper.parseInt(kv.get("l"));
if (l != null && l == 0) {
Log.w("DKIM body length=" + l);
return false;
}
// Hashed header fields
String h = kv.get("h");
if (h == null) {
Log.w("DKIM header fields missing");
return false;
}
if (Arrays.asList(h.split(":")).contains("from")) {
Log.i("DKIM headers fields missing 'from'");
return false;
}
}
return true;
}
Address[] getMailFrom(String[] headers) {
if (headers == null)
return null;