msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

DMARC viewer improvements

Browse Source
pull/214/head
M66B 1 year ago
parent 17b8f77504
commit c08dec2b34
7 changed files with 36 additions and 29 deletions

4
app/src/amazon/AndroidManifest.xml
Unescape View File

@ -487,10 +487,10 @@
<activity <activity
android:name=".ActivityDmarc" android:name=".ActivityDmarc"
android:enabled="false" android:enabled="false"
android:description="@string/app_name" android:description="@string/title_advanced_dmarc_viewer"
android:exported="true" android:exported="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="DMARC"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:resizeableActivity="true"> android:resizeableActivity="true">

4
app/src/debug/AndroidManifest.xml
Unescape View File

@ -493,11 +493,11 @@
<activity <activity
android:name=".ActivityDmarc" android:name=".ActivityDmarc"
android:description="@string/app_name" android:description="@string/title_advanced_dmarc_viewer"
android:enabled="true" android:enabled="true"
android:exported="true" android:exported="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="DMARC"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:resizeableActivity="true"> android:resizeableActivity="true">

4
app/src/fdroid/AndroidManifest.xml
Unescape View File

@ -493,10 +493,10 @@
<activity <activity
android:name=".ActivityDmarc" android:name=".ActivityDmarc"
android:enabled="true" android:enabled="true"
android:description="@string/app_name" android:description="@string/title_advanced_dmarc_viewer"
android:exported="true" android:exported="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="DMARC"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:resizeableActivity="true"> android:resizeableActivity="true">

4
app/src/github/AndroidManifest.xml
Unescape View File

@ -492,11 +492,11 @@
<activity <activity
android:name=".ActivityDmarc" android:name=".ActivityDmarc"
android:description="@string/app_name" android:description="@string/title_advanced_dmarc_viewer"
android:enabled="true" android:enabled="true"
android:exported="true" android:exported="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="DMARC"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:resizeableActivity="true"> android:resizeableActivity="true">

4
app/src/main/AndroidManifest.xml
Unescape View File

@ -488,10 +488,10 @@
<activity <activity
android:name=".ActivityDmarc" android:name=".ActivityDmarc"
android:description="@string/app_name" android:description="@string/title_advanced_dmarc_viewer"
android:exported="true" android:exported="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="DMARC"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:resizeableActivity="true"> android:resizeableActivity="true">

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

@ -64,7 +64,7 @@ public class ActivityDmarc extends ActivityBase {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setSubtitle("DMARC"); getSupportActionBar().setSubtitle(R.string.title_advanced_dmarc_viewer);
View view = LayoutInflater.from(this).inflate(R.layout.activity_dmarc, null); View view = LayoutInflater.from(this).inflate(R.layout.activity_dmarc, null);
setContentView(view); setContentView(view);
@ -276,14 +276,15 @@ public class ActivityDmarc extends ActivityBase {
.append(text).append(' '); .append(text).append(' ');
if ("source_ip".equals(name)) { if ("source_ip".equals(name)) {
try { try {
boolean valid = false; Boolean valid = null;
String because = null; String because = null;
if (spf != null) if (spf != null)
for (Pair<String, DnsHelper.DnsRecord> p : spf) { for (Pair<String, DnsHelper.DnsRecord> p : spf) {
for (String ip : p.second.response.split("\\s+")) { for (String ip : p.second.response.split("\\s+")) {
boolean allow = true;
ip = ip.toLowerCase(Locale.ROOT); ip = ip.toLowerCase(Locale.ROOT);
if (ip.startsWith("-")) if (ip.startsWith("-"))
continue; allow = false;
else if (ip.startsWith("+")) else if (ip.startsWith("+"))
ip = ip.substring(1); ip = ip.substring(1);
@ -298,9 +299,8 @@ public class ActivityDmarc extends ActivityBase {
if (prefix == null) if (prefix == null)
continue; continue;
if (ConnectionHelper.inSubnet(text, net[0], prefix)) { if (ConnectionHelper.inSubnet(text, net[0], prefix)) {
valid = true; valid = allow;
because = ip + " in " + p.first; because = ip + " in " + p.first;
break;
} }
} else if ("a".equals(ip) || ip.startsWith("a:")) { } else if ("a".equals(ip) || ip.startsWith("a:")) {
String domain = (ip.startsWith("a:") String domain = (ip.startsWith("a:")
@ -320,20 +320,18 @@ public class ActivityDmarc extends ActivityBase {
for (DnsHelper.DnsRecord a : as) for (DnsHelper.DnsRecord a : as)
if (prefix == null) { if (prefix == null) {
if (text.equals(a.response)) { if (text.equals(a.response)) {
valid = true; valid = allow;
because = ip + " in " + domain; because = ip + " in " + domain;
break; break;
} }
} else { } else {
if (ConnectionHelper.inSubnet(text, a.response, prefix)) { if (ConnectionHelper.inSubnet(text, a.response, prefix)) {
valid = true; valid = allow;
because = ip + " in " + domain + "/" + prefix; because = ip + " in " + domain + "/" + prefix;
break; break;
} }
} }
if (valid) } else if ("mx".equals(ip) || ip.startsWith("mx:")) {
break;
} else if ("mx".equals(ip) || ip.startsWith("mx:"))
try { try {
String domain = (ip.startsWith("mx:") String domain = (ip.startsWith("mx:")
? ip.substring(3) : p.first); ? ip.substring(3) : p.first);
@ -352,33 +350,42 @@ public class ActivityDmarc extends ActivityBase {
as.addAll(Arrays.asList(DnsHelper.lookup(context, mx.response, "aaaa"))); as.addAll(Arrays.asList(DnsHelper.lookup(context, mx.response, "aaaa")));
} catch (UnknownHostException ignored) { } catch (UnknownHostException ignored) {
} }
for (DnsHelper.DnsRecord a : as) for (DnsHelper.DnsRecord a : as) {
if (prefix == null) { if (prefix == null) {
if (text.equals(a.response)) { if (text.equals(a.response)) {
valid = true; valid = allow;
because = ip + " in " + domain; because = ip + " in " + domain;
break; break;
} }
} else { } else {
if (ConnectionHelper.inSubnet(text, a.response, prefix)) { if (ConnectionHelper.inSubnet(text, a.response, prefix)) {
valid = true; valid = allow;
because = ip + " in " + domain + "/" + prefix; because = ip + " in " + domain + "/" + prefix;
break; break;
} }
} }
if (valid) }
if (valid != null)
break; break;
} }
} catch (UnknownHostException ignored) { } catch (UnknownHostException ignored) {
} }
} else if ("ptr".equals(ip) || ip.startsWith("ptr:")) {
valid = false;
because = ip + " ptr not supported";
}
if (valid != null)
break;
} }
if (valid) if (valid != null)
break; break;
} }
int start = ssb.length(); int start = ssb.length();
ssb.append(valid ? "valid (" + because + ")" : "invalid"); ssb.append(Boolean.TRUE.equals(valid) ? "valid" : "invalid");
if (!valid) { if (because != null)
ssb.append(" (").append(because).append(')');
if (!Boolean.TRUE.equals(valid)) {
ssb.setSpan(new StyleSpan(Typeface.BOLD), start, ssb.length(), 0); ssb.setSpan(new StyleSpan(Typeface.BOLD), start, ssb.length(), 0);
ssb.setSpan(new ForegroundColorSpan(colorWarning), start, ssb.length(), 0); ssb.setSpan(new ForegroundColorSpan(colorWarning), start, ssb.length(), 0);
} }

4
app/src/play/AndroidManifest.xml
Unescape View File

@ -487,10 +487,10 @@
<activity <activity
android:name=".ActivityDmarc" android:name=".ActivityDmarc"
android:enabled="false" android:enabled="false"
android:description="@string/app_name" android:description="@string/title_advanced_dmarc_viewer"
android:exported="true" android:exported="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="DMARC"
android:launchMode="singleInstance" android:launchMode="singleInstance"
android:resizeableActivity="true"> android:resizeableActivity="true">

Write Preview
Loading…
Cancel
Save