mirror of https://github.com/M66B/FairEmail.git
DMARC: small improvements
This commit is contained in:
parent
0116e21e80
commit
5d3c26c961
|
@ -301,6 +301,7 @@ public class ActivityDmarc extends ActivityBase {
|
||||||
ssb.append(' ');
|
ssb.append(' ');
|
||||||
} catch (Throwable ex) {
|
} catch (Throwable ex) {
|
||||||
Log.w(ex);
|
Log.w(ex);
|
||||||
|
ssb.append(ex.toString()).append('\n');
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
@ -310,6 +311,7 @@ public class ActivityDmarc extends ActivityBase {
|
||||||
ssb.append('(').append(info.name).append(") ");
|
ssb.append('(').append(info.name).append(") ");
|
||||||
} catch (Throwable ex) {
|
} catch (Throwable ex) {
|
||||||
Log.w(ex);
|
Log.w(ex);
|
||||||
|
ssb.append(ex.toString()).append('\n');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -406,7 +408,8 @@ public class ActivityDmarc extends ActivityBase {
|
||||||
spf = null;
|
spf = null;
|
||||||
else {
|
else {
|
||||||
Integer start = null;
|
Integer start = null;
|
||||||
spf = lookupSpf(context, lastDomain);
|
SpannableStringBuilder extra = new SpannableStringBuilderEx();
|
||||||
|
spf = lookupSpf(context, lastDomain, extra);
|
||||||
for (Pair<String, DnsHelper.DnsRecord> p : spf) {
|
for (Pair<String, DnsHelper.DnsRecord> p : spf) {
|
||||||
ssb.append(p.first).append(' ')
|
ssb.append(p.first).append(' ')
|
||||||
.append(p.second.name).append("\n");
|
.append(p.second.name).append("\n");
|
||||||
|
@ -415,6 +418,7 @@ public class ActivityDmarc extends ActivityBase {
|
||||||
ssb.append("\n");
|
ssb.append("\n");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
ssb.append('\n').append(extra);
|
||||||
if (start != null) {
|
if (start != null) {
|
||||||
ssb.setSpan(new RelativeSizeSpan(HtmlHelper.FONT_SMALL), start, ssb.length(), 0);
|
ssb.setSpan(new RelativeSizeSpan(HtmlHelper.FONT_SMALL), start, ssb.length(), 0);
|
||||||
ssb.append("\n");
|
ssb.append("\n");
|
||||||
|
@ -489,18 +493,24 @@ public class ActivityDmarc extends ActivityBase {
|
||||||
grpReady.setVisibility(View.VISIBLE);
|
grpReady.setVisibility(View.VISIBLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<Pair<String, DnsHelper.DnsRecord>> lookupSpf(Context context, String domain) {
|
private List<Pair<String, DnsHelper.DnsRecord>> lookupSpf(Context context, String domain, SpannableStringBuilder ssb) {
|
||||||
List<Pair<String, DnsHelper.DnsRecord>> result = new ArrayList<>();
|
List<Pair<String, DnsHelper.DnsRecord>> result = new ArrayList<>();
|
||||||
try {
|
try {
|
||||||
for (DnsHelper.DnsRecord r : DnsHelper.lookup(context, domain, "txt"))
|
DnsHelper.DnsRecord[] records = DnsHelper.lookup(context, domain, "txt");
|
||||||
|
ssb.append(domain).append('=')
|
||||||
|
.append(Integer.toString(records.length)).append('\n');
|
||||||
|
for (DnsHelper.DnsRecord r : records)
|
||||||
if (r.name.contains("spf")) {
|
if (r.name.contains("spf")) {
|
||||||
result.add(new Pair<>(domain, r));
|
result.add(new Pair<>(domain, r));
|
||||||
for (String part : r.name.split("\\s+"))
|
for (String part : r.name.split("\\s+"))
|
||||||
if (part.toLowerCase(Locale.ROOT).startsWith("include:"))
|
if (part.toLowerCase(Locale.ROOT).startsWith("include:")) {
|
||||||
result.addAll(lookupSpf(context, part.substring("include:".length())));
|
String sub = part.substring("include:".length());
|
||||||
|
result.addAll(lookupSpf(context, sub, ssb));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} catch (Throwable ex) {
|
} catch (Throwable ex) {
|
||||||
Log.w(ex);
|
Log.w(ex);
|
||||||
|
ssb.append(ex.toString()).append('\n');
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue