DMARC: small improvements

pull/207/head
M66B 3 years ago
parent 9ba8ff451a
commit 668f24a637

@ -216,7 +216,6 @@ public class ActivityDmarc extends ActivityBase {
case "aspf": case "aspf":
case "p": case "p":
case "sp": case "sp":
case "pct":
case "fo": case "fo":
if (feedback && policy_published) { if (feedback && policy_published) {
eventType = xml.next(); eventType = xml.next();
@ -224,10 +223,32 @@ public class ActivityDmarc extends ActivityBase {
String text = xml.getText(); String text = xml.getText();
if (text == null) if (text == null)
text = "<null>"; text = "<null>";
if ("adkim".equals(name) || "aspf".equals(name))
if ("r".equals(text))
text = "relaxed";
else if ("s".equals(text))
text = "strict";
ssb.append(name).append('=') ssb.append(name).append('=')
.append(text).append(' '); .append(text).append(' ');
} }
} }
break;
case "pct":
if (feedback && policy_published) {
eventType = xml.next();
if (eventType == XmlPullParser.TEXT) {
String text = xml.getText();
if (text == null)
text = "<null>";
Integer pct = Helper.parseInt(text);
if (pct == null)
ssb.append(name).append('=')
.append(text).append(' ');
else
ssb.append(text).append("% ");
}
}
break; break;
case "source_ip": case "source_ip":
case "count": case "count":

Loading…
Cancel
Save