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

DKIM simplification

This commit is contained in:
M66B 2023-03-30 10:55:52 +02:00
parent 1076a99c53
commit 796ea88727
2 changed files with 8 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3201,13 +3201,10 @@ class Core {
message.tls = helper.getTLS();
message.dkim = MessageHelper.getAuthentication("dkim", authentication);
if (Boolean.TRUE.equals(message.dkim)) {
if (native_dkim && !BuildConfig.PLAY_STORE_RELEASE) {
if (TextUtils.isEmpty(message.signedby))
message.dkim = false;
} else
message.dkim = helper.checkDKIMRequirements();
}
if (Boolean.TRUE.equals(message.dkim) &&
native_dkim && !BuildConfig.PLAY_STORE_RELEASE &&
TextUtils.isEmpty(message.signedby))
message.dkim = false;
message.spf = MessageHelper.getAuthentication("spf", authentication);
if (message.spf == null && helper.getSPF())
message.spf = true;
@ -4305,8 +4302,10 @@ class Core {
message.tls = helper.getTLS();
message.dkim = MessageHelper.getAuthentication("dkim", authentication);
if (Boolean.TRUE.equals(message.dkim))
message.dkim = helper.checkDKIMRequirements();
if (Boolean.TRUE.equals(message.dkim) &&
native_dkim && !BuildConfig.PLAY_STORE_RELEASE &&
TextUtils.isEmpty(message.signedby))
message.dkim = false;
message.spf = MessageHelper.getAuthentication("spf", authentication);
if (message.spf == null && helper.getSPF())
message.spf = true;

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

@ -2160,41 +2160,6 @@ public class MessageHelper {
return (spf.trim().toLowerCase(Locale.ROOT).startsWith("pass"));
}
boolean checkDKIMRequirements() throws MessagingException {
ensureHeaders();
// https://datatracker.ietf.org/doc/html/rfc6376/
String[] headers = imessage.getHeader("DKIM-Signature");
if (headers == null || headers.length < 1)
return false;
for (String header : headers) {
Map<String, String> kv = getKeyValues(MimeUtility.unfold(header));
// Algorithm
// https://tools.ietf.org/id/draft-ietf-dcrup-dkim-usage-03.html#rfc.section.4.3
String a = kv.get("a");
if ("rsa-sha1".equals(a))
return false;
// 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;
}
}
return true;
}
@NonNull
List<String> verifyDKIM(Context context) {
List<String> signers = new ArrayList<>();