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

Added support for SPF/MX

Browse Source
This commit is contained in:
M66B
2022-04-25 21:31:20 +02:00
parent 7ece2b50ec
commit d8cce82f2d
2 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,7 @@ import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.StringReader;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -280,7 +281,30 @@ public class ActivityDmarc extends ActivityBase {
valid = true;
break;
}
}
} else if ("mx".equals(ip))
try {
DnsHelper.DnsRecord[] mxs =
DnsHelper.lookup(context, p.first, "mx");
for (DnsHelper.DnsRecord mx : mxs) {
List<DnsHelper.DnsRecord> as = new ArrayList<>();
try {
as.addAll(Arrays.asList(DnsHelper.lookup(context, mx.name, "a")));
} catch (UnknownHostException ignored) {
}
try {
as.addAll(Arrays.asList(DnsHelper.lookup(context, mx.name, "aaaa")));
} catch (UnknownHostException ignored) {
}
for (DnsHelper.DnsRecord a : as)
if (text.equals(a.name)) {
valid = true;
break;
}
if (valid)
break;
}
} catch (UnknownHostException ignored) {
}
}
if (valid)
break;
@@ -419,10 +443,16 @@ public class ActivityDmarc extends ActivityBase {
}
List<DnsHelper.DnsRecord> records = new ArrayList<>();
records.addAll(Arrays.asList(
DnsHelper.lookup(context, "_dmarc." + lastDomain, "txt")));
records.addAll(Arrays.asList(
DnsHelper.lookup(context, "default._bimi." + lastDomain, "txt")));
try {
records.addAll(Arrays.asList(
DnsHelper.lookup(context, "_dmarc." + lastDomain, "txt")));
} catch (UnknownHostException ignored) {
}
try {
records.addAll(Arrays.asList(
DnsHelper.lookup(context, "default._bimi." + lastDomain, "txt")));
} catch (UnknownHostException ignored) {
}
for (DnsHelper.DnsRecord r : records)
ssb.append(r.name).append("\n");
ssb.append("\n");