Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-29 13:24:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

DMARC: recursive SPF lookup

Browse Source
This commit is contained in:
M66B
2022-03-13 11:03:32 +01:00
parent 272bd16ec3
commit fd6ff59280
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/eu/faircode/email/ActivityDmarc.java
View File

@@ -32,6 +32,7 @@ import android.text.style.ForegroundColorSpan;
import android.text.style.RelativeSizeSpan;
import android.text.style.StyleSpan;
import android.text.style.TypefaceSpan;
import android.util.Pair;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
@@ -366,10 +367,11 @@ public class ActivityDmarc extends ActivityBase {
if (feedback) {
ssb.append("\n\n");
if (lastDomain != null) {
for (Pair<String, DnsHelper.DnsRecord> spf : lookupSpf(context, lastDomain))
ssb.append(spf.first).append(' ')
.append(spf.second.name).append("\n");
List<DnsHelper.DnsRecord> records = new ArrayList<>();
for (DnsHelper.DnsRecord r : DnsHelper.lookup(context, lastDomain, "txt"))
if (r.name.contains("spf"))
records.add(r);
records.addAll(Arrays.asList(
DnsHelper.lookup(context, "_dmarc." + lastDomain, "txt")));
records.addAll(Arrays.asList(
@@ -437,6 +439,23 @@ public class ActivityDmarc extends ActivityBase {
tvDmarc.setText(ex + "\n" + android.util.Log.getStackTraceString(ex));
grpReady.setVisibility(View.VISIBLE);
}
private List<Pair<String, DnsHelper.DnsRecord>> lookupSpf(Context context, String domain) {
List<Pair<String, DnsHelper.DnsRecord>> result = new ArrayList<>();
try {
for (DnsHelper.DnsRecord r : DnsHelper.lookup(context, domain, "txt"))
if (r.name.contains("spf")) {
result.add(new Pair<>(domain, r));
for (String part : r.name.split("\\s+"))
if (part.toLowerCase(Locale.ROOT).startsWith("include:"))
result.addAll(lookupSpf(context, part.substring("include:".length())));
}
} catch (Throwable ex) {
Log.w(ex);
}
return result;
}
}.execute(this, args, "dmarc:decode");
}
}