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

Process all authentication results

This commit is contained in:
M66B 2020-06-12 08:21:16 +02:00
parent 0cc0b9b94b
commit fda85e1f07
2 changed files with 27 additions and 19 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

@ -1614,7 +1614,7 @@ class Core {
if (sent == null)
sent = 0L;
String authentication = helper.getAuthentication();
String[] authentication = helper.getAuthentication();
MessageHelper.MessageParts parts = helper.getMessageParts();
EntityMessage message = new EntityMessage();
@ -2239,7 +2239,7 @@ class Core {
received = sent;
}
String authentication = helper.getAuthentication();
String[] authentication = helper.getAuthentication();
MessageHelper.MessageParts parts = helper.getMessageParts();
message = new EntityMessage();

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

@ -1016,31 +1016,39 @@ public class MessageHelper {
return getAddressHeader("Disposition-Notification-To");
}
String getAuthentication() throws MessagingException {
String[] getAuthentication() throws MessagingException {
ensureMessage(false);
String header = imessage.getHeader("Authentication-Results", null);
return (header == null ? null : MimeUtility.unfold(header));
String[] headers = imessage.getHeader("Authentication-Results");
if (headers == null)
return null;
for (int i = 0; i < headers.length; i++)
headers[i] = MimeUtility.unfold(headers[i]);
return headers;
}
static Boolean getAuthentication(String type, String header) {
if (header == null)
static Boolean getAuthentication(String type, String[] headers) {
if (headers == null)
return null;
// https://tools.ietf.org/html/rfc7601
Boolean result = null;
String[] part = header.split(";");
for (int i = 1; i < part.length; i++) {
String[] kv = part[i].split("=");
if (kv.length > 1) {
String key = kv[0].trim();
String[] val = kv[1].trim().split(" ");
if (val.length > 0 && type.equals(key)) {
if ("fail".equals(val[0]))
result = false;
else if ("pass".equals(val[0]))
if (result == null)
result = true;
for (String header : headers) {
String[] part = header.split(";");
for (int i = 1; i < part.length; i++) {
String[] kv = part[i].split("=");
if (kv.length > 1) {
String key = kv[0].trim();
String[] val = kv[1].trim().split(" ");
if (val.length > 0 && type.equals(key)) {
if ("fail".equals(val[0]))
result = false;
else if ("pass".equals(val[0]))
if (result == null)
result = true;
}
}
}
}