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

Removed provider from SOA record

This commit is contained in:
M66B 2021-11-14 19:21:03 +01:00
parent a58dda43c2
commit 538177ee52
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/eu/faircode/email/EmailProvider.java
View File

@ -320,25 +320,16 @@ public class EmailProvider implements Parcelable {
Log.w(ex); Log.w(ex);
} }
try {
// Primary DNS server
DnsHelper.DnsRecord[] soa = DnsHelper.lookup(context, domain, "soa");
if (soa.length > 0)
records.add(soa[0]);
} catch (Throwable ex) {
Log.w(ex);
}
for (DnsHelper.DnsRecord record : records) for (DnsHelper.DnsRecord record : records)
if (!TextUtils.isEmpty(record.name)) { if (!TextUtils.isEmpty(record.name)) {
String target = record.name.toLowerCase(Locale.ROOT); String target = record.name.toLowerCase(Locale.ROOT);
EntityLog.log(context, "MX/SOA target=" + target); EntityLog.log(context, "MX target=" + target);
for (EmailProvider provider : providers) { for (EmailProvider provider : providers) {
if (provider.enabled && provider.mx != null) if (provider.enabled && provider.mx != null)
for (String mx : provider.mx) for (String mx : provider.mx)
if (target.matches(mx)) { if (target.matches(mx)) {
EntityLog.log(context, "From MX/SOA domain=" + domain); EntityLog.log(context, "From MX domain=" + domain);
candidates.add(provider); candidates.add(provider);
break; break;
} }
@ -346,7 +337,7 @@ public class EmailProvider implements Parcelable {
String mxparent = UriHelper.getParentDomain(context, target); String mxparent = UriHelper.getParentDomain(context, target);
String pdomain = UriHelper.getParentDomain(context, provider.imap.host); String pdomain = UriHelper.getParentDomain(context, provider.imap.host);
if (mxparent.equalsIgnoreCase(pdomain)) { if (mxparent.equalsIgnoreCase(pdomain)) {
EntityLog.log(context, "From MX/SOA host=" + provider.imap.host); EntityLog.log(context, "From MX host=" + provider.imap.host);
candidates.add(provider); candidates.add(provider);
break; break;
} }
@ -959,7 +950,7 @@ public class EmailProvider implements Parcelable {
public boolean starttls; public boolean starttls;
// Scores: // Scores:
// 0 from MX/SOA record // 0 from MX record
// 10 from port scan // 10 from port scan
// +2 trusted host // +2 trusted host
// +1 trusted DNS name // +1 trusted DNS name