Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-28 03:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed native ARC

Browse Source
This commit is contained in:
M66B
2024-05-10 08:45:54 +02:00
parent 93fc9b169c
commit 3300463e79
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2244,24 +2244,26 @@ public class MessageHelper {
}
// https://datatracker.ietf.org/doc/html/rfc6376/
List<String> headers = new ArrayList<>();
String[] dkim_headers = amessage.getHeader(DKIM_SIGNATURE);
if (dkim_headers != null && dkim_headers.length > 0)
headers.addAll(Arrays.asList(dkim_headers));
String[] arc_headers = amessage.getHeader(ARC_MESSAGE_SIGNATURE);
if (arc_headers != null && arc_headers.length > 0)
headers.addAll(Arrays.asList(arc_headers));
if (headers.size() == 0)
if ((dkim_headers == null ? 0 : dkim_headers.length) +
(arc_headers == null ? 0 : arc_headers.length) == 0)
return signers;
for (String header : headers) {
String signer = verifySignatureHeader(context, header, DKIM_SIGNATURE, amessage);
if (signer != null && !signers.contains(signer))
signers.add(signer);
}
if (dkim_headers != null)
for (String header : dkim_headers) {
String signer = verifySignatureHeader(context, header, DKIM_SIGNATURE, amessage);
if (signer != null && !signers.contains(signer))
signers.add(signer);
}
if (arc_headers != null)
for (String header : arc_headers) {
String signer = verifySignatureHeader(context, header, ARC_MESSAGE_SIGNATURE, amessage);
if (signer != null && !signers.contains(signer))
signers.add(signer);
}
Log.i("DKIM signers=" + TextUtils.join(",", signers));