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

Added basic DMARC viewer

This commit is contained in:
M66B 2022-03-10 09:12:59 +01:00
parent bca13b5156
commit 46cfcdcf7e
11 changed files with 568 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -9,6 +9,7 @@
* Enabled [sqlite analyze](https://sqlite.org/lang_analyze.html)
* Added [linear back-off scheme](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq123)
* Added option to sort reply templates by frequency of use
* Added basic DMARC report viewer
* Small improvements and minor bug fixes
* Updated translations

20
app/src/amazon/AndroidManifest.xml
View File

@ -377,6 +377,26 @@
</intent-filter>
</activity>
<activity
android:name=".ActivityDmarc"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="content" />
<data android:mimeType="text/xml" />
<data android:mimeType="application/xml" />
<data android:host="*" />
</intent-filter>
</activity>
<activity
android:name=".ActivityBilling"
android:exported="false"

20
app/src/fdroid/AndroidManifest.xml
View File

@ -376,6 +376,26 @@
</intent-filter>
</activity>
<activity
android:name=".ActivityDmarc"
android:enabled="true"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="content" />
<data android:mimeType="text/xml" />
<data android:mimeType="application/xml" />
<data android:host="*" />
</intent-filter>
</activity>
<activity
android:name=".ActivityBilling"
android:exported="false"

20
app/src/github/AndroidManifest.xml
View File

@ -376,6 +376,26 @@
</intent-filter>
</activity>
<activity
android:name=".ActivityDmarc"
android:enabled="true"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="content" />
<data android:mimeType="text/xml" />
<data android:mimeType="application/xml" />
<data android:host="*" />
</intent-filter>
</activity>
<activity
android:name=".ActivityBilling"
android:exported="false"

19
app/src/main/AndroidManifest.xml
View File

@ -376,6 +376,25 @@
</intent-filter>
</activity>
<activity
android:name=".ActivityDmarc"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="content" />
<data android:mimeType="text/xml" />
<data android:mimeType="application/xml" />
<data android:host="*" />
</intent-filter>
</activity>
<activity
android:name=".ActivityBilling"
android:exported="false"

1
app/src/main/assets/CHANGELOG.md
View File

@ -9,6 +9,7 @@
* Enabled [sqlite analyze](https://sqlite.org/lang_analyze.html)
* Added [linear back-off scheme](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq123)
* Added option to sort reply templates by frequency of use
* Added basic DMARC report viewer
* Small improvements and minor bug fixes
* Updated translations

391
app/src/main/java/eu/faircode/email/ActivityDmarc.java Normal file
View File

@ -0,0 +1,391 @@
package eu.faircode.email;
/*
This file is part of FairEmail.
FairEmail is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
FairEmail is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with FairEmail. If not, see <http://www.gnu.org/licenses/>.
Copyright 2018-2022 by Marcel Bokhorst (M66B)
*/
import static androidx.webkit.WebSettingsCompat.FORCE_DARK_OFF;
import static androidx.webkit.WebSettingsCompat.FORCE_DARK_ON;
import android.Manifest;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Typeface;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.method.ScrollingMovementMethod;
import android.text.style.ForegroundColorSpan;
import android.text.style.RelativeSizeSpan;
import android.text.style.StyleSpan;
import android.text.style.TypefaceSpan;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.constraintlayout.widget.Group;
import androidx.preference.PreferenceManager;
import androidx.webkit.WebSettingsCompat;
import androidx.webkit.WebViewFeature;
import com.google.android.material.snackbar.Snackbar;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserFactory;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.StringReader;
import java.nio.charset.StandardCharsets;
import java.text.DateFormat;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
public class ActivityDmarc extends ActivityBase {
private TextView tvDmarc;
private ContentLoadingProgressBar pbWait;
private Group grpReady;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setSubtitle("DMARC");
View view = LayoutInflater.from(this).inflate(R.layout.activity_dmarc, null);
setContentView(view);
tvDmarc = findViewById(R.id.tvDmarc);
pbWait = findViewById(R.id.pbWait);
grpReady = findViewById(R.id.grpReady);
// Initialize
FragmentDialogTheme.setBackground(this, view, false);
grpReady.setVisibility(View.GONE);
load();
}
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
setIntent(intent);
load();
}
private void load() {
Intent intent = getIntent();
Uri uri = intent.getData();
long id = intent.getLongExtra("id", -1L);
Log.i("DMARC uri=" + uri + " id=" + id);
Bundle args = new Bundle();
args.putParcelable("uri", uri);
args.putLong("id", id);
new SimpleTask<Spanned>() {
@Override
protected void onPreExecute(Bundle args) {
pbWait.setVisibility(View.VISIBLE);
}
@Override
protected void onPostExecute(Bundle args) {
pbWait.setVisibility(View.GONE);
}
@Override
protected Spanned onExecute(Context context, Bundle args) throws Throwable {
Uri uri = args.getParcelable("uri");
if (uri == null)
throw new FileNotFoundException();
if (!"content".equals(uri.getScheme()) &&
!Helper.hasPermission(context, Manifest.permission.READ_EXTERNAL_STORAGE)) {
Log.w("DMARC uri=" + uri);
throw new IllegalArgumentException(context.getString(R.string.title_no_stream));
}
DateFormat DTF = Helper.getDateTimeInstance(context, DateFormat.SHORT, DateFormat.SHORT);
int colorWarning = Helper.resolveColor(context, R.attr.colorWarning);
int colorSeparator = Helper.resolveColor(context, R.attr.colorSeparator);
float stroke = context.getResources().getDisplayMetrics().density;
SpannableStringBuilder ssb = new SpannableStringBuilderEx();
String data;
ContentResolver resolver = context.getContentResolver();
try (InputStream is = resolver.openInputStream(uri)) {
data = Helper.readStream(is);
}
XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
XmlPullParser xml = factory.newPullParser();
xml.setInput(new StringReader(data));
// https://tools.ietf.org/id/draft-kucherawy-dmarc-base-13.xml#xml_schema
boolean feedback = false;
boolean report_metadata = false;
boolean policy_published = false;
boolean record = false;
boolean row = false;
boolean policy_evaluated = false;
boolean identifiers = false;
boolean auth_results = false;
String result = null;
int eventType = xml.getEventType();
while (eventType != XmlPullParser.END_DOCUMENT) {
if (eventType == XmlPullParser.START_TAG) {
String name = xml.getName();
switch (name) {
case "feedback":
feedback = true;
break;
case "report_metadata":
report_metadata = true;
break;
case "policy_published":
policy_published = true;
break;
case "record":
record = true;
break;
case "row":
row = true;
ssb.append("\uFFFC");
ssb.setSpan(new LineSpan(colorSeparator, stroke, 0), ssb.length() - 1, ssb.length(), 0);
ssb.append("\n");
break;
case "policy_evaluated":
policy_evaluated = true;
break;
case "identifiers":
identifiers = true;
break;
case "auth_results":
auth_results = true;
ssb.append("\n");
break;
case "org_name":
case "begin":
case "end":
if (feedback && report_metadata) {
eventType = xml.next();
if (eventType == XmlPullParser.TEXT) {
String text = xml.getText();
if ("begin".equals(name) || "end".equals(name)) {
text = text.trim();
try {
ssb.append(name).append('=')
.append(DTF.format(Long.parseLong(text) * 1000));
} catch (Throwable ex) {
Log.w(ex);
ssb.append(name).append('=')
.append(text);
}
} else
ssb.append(text);
ssb.append(' ');
}
}
break;
case "domain":
if (feedback && (policy_published || auth_results)) {
eventType = xml.next();
if (eventType == XmlPullParser.TEXT)
ssb.append(xml.getText()).append(' ');
}
break;
case "adkim":
case "aspf":
case "p":
case "sp":
case "pct":
if (feedback && policy_published) {
eventType = xml.next();
if (eventType == XmlPullParser.TEXT)
ssb.append(name).append('=')
.append(xml.getText()).append(' ');
}
break;
case "source_ip":
case "count":
if (feedback && record && row) {
eventType = xml.next();
if (eventType == XmlPullParser.TEXT) {
ssb.append(name).append('=')
.append(xml.getText()).append(' ');
}
}
break;
case "disposition": // none, quarantine, reject
case "dkim":
case "spf":
case "header_from":
if (feedback && record)
if (policy_evaluated || identifiers) {
eventType = xml.next();
if (eventType == XmlPullParser.TEXT) {
ssb.append(name).append('=');
int start = ssb.length();
String text = xml.getText();
ssb.append(text);
if (!"pass".equals(text) &&
("dkim".equals(name) || "spf".equals(name))) {
ssb.setSpan(new ForegroundColorSpan(colorWarning), start, ssb.length(), 0);
ssb.setSpan(new StyleSpan(Typeface.BOLD), start, ssb.length(), 0);
}
ssb.append(' ');
}
} else if (auth_results)
result = name;
break;
case "result":
if (feedback && auth_results) {
eventType = xml.next();
if (eventType == XmlPullParser.TEXT) {
ssb.append(result == null ? "?" : result).append('=');
int start = ssb.length();
String text = xml.getText();
ssb.append(text);
if (!"pass".equals(text)) {
ssb.setSpan(new ForegroundColorSpan(colorWarning), start, ssb.length(), 0);
ssb.setSpan(new StyleSpan(Typeface.BOLD), start, ssb.length(), 0);
}
ssb.append(' ');
}
}
break;
case "selector":
case "scope":
if (feedback && auth_results) {
eventType = xml.next();
if (eventType == XmlPullParser.TEXT)
ssb.append(name).append('=')
.append(xml.getText()).append(' ');
}
break;
}
if ("report_metadata".equals(name) ||
"policy_published".equals(name) ||
"row".equals(name) ||
"identifiers".equals(name) ||
"auth_results".equals(name)) {
int start = ssb.length();
ssb.append(name);
ssb.setSpan(new StyleSpan(Typeface.BOLD), start, ssb.length(), 0);
ssb.append("\n");
}
} else if (eventType == XmlPullParser.END_TAG) {
String name = xml.getName();
switch (name) {
case "feedback":
feedback = false;
break;
case "report_metadata":
report_metadata = false;
if (feedback)
ssb.append("\n\n");
break;
case "policy_published":
policy_published = false;
if (feedback)
ssb.append("\n\n");
break;
case "record":
record = false;
break;
case "row":
row = false;
if (feedback)
ssb.append("\n\n");
break;
case "policy_evaluated":
policy_evaluated = false;
break;
case "identifiers":
identifiers = false;
if (feedback)
ssb.append("\n");
break;
case "auth_results":
auth_results = false;
if (feedback)
ssb.append("\n");
break;
case "dkim":
case "spf":
if (feedback && auth_results) {
result = null;
ssb.append("\n");
}
break;
}
}
eventType = xml.next();
}
ssb.append("\uFFFC");
ssb.setSpan(new LineSpan(colorSeparator, stroke, 0), ssb.length() - 1, ssb.length(), 0);
ssb.append("\n");
int start = ssb.length();
ssb.append(data);
ssb.setSpan(new TypefaceSpan("monospace"), start, ssb.length(), 0);
ssb.setSpan(new RelativeSizeSpan(HtmlHelper.FONT_SMALL), start, ssb.length(), 0);
return ssb;
}
@Override
protected void onExecuted(Bundle args, Spanned dmarc) {
tvDmarc.setText(dmarc);
grpReady.setVisibility(View.VISIBLE);
}
@Override
protected void onException(Bundle args, @NonNull Throwable ex) {
if (ex instanceof IllegalArgumentException && !BuildConfig.DEBUG)
Snackbar.make(findViewById(android.R.id.content), ex.getMessage(), Snackbar.LENGTH_LONG)
.setGestureInsetBottomIgnored(true).show();
else
Log.unexpectedError(getSupportFragmentManager(), ex, false);
}
}.execute(this, args, "dmarc:decode");
}
}

3
app/src/main/java/eu/faircode/email/Helper.java
View File

@ -698,7 +698,8 @@ public class Helper {
"message/delivery-status".equals(type) ||
"message/disposition-notification".equals(type) ||
"text/rfc822-headers".equals(type) ||
"text/x-amp-html".equals(type)))
"text/x-amp-html".equals(type) ||
"text/xml".equals(type) /* DMARC */))
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
if (!TextUtils.isEmpty(name))

73
app/src/main/res/layout/activity_dmarc.xml Normal file
View File

@ -0,0 +1,73 @@
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="eu.faircode.email.ActivityDSN">
<eu.faircode.email.ScrollViewEx
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingHorizontal="6dp"
android:paddingVertical="12dp"
android:scrollbarStyle="outsideOverlay"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.cardview.widget.CardView
android:id="@+id/cardDmarc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="3dp"
app:cardBackgroundColor="?attr/colorCardBackground"
app:cardCornerRadius="6dp"
app:cardElevation="0dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="6dp"
android:paddingVertical="12dp">
<eu.faircode.email.FixedTextView
android:id="@+id/tvDmarc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:text="DMARC"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textIsSelectable="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.Group
android:id="@+id/grpReady"
android:layout_width="0dp"
android:layout_height="0dp"
app:constraint_referenced_ids="tvDmarc" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</eu.faircode.email.ScrollViewEx>
<eu.faircode.email.ContentLoadingProgressBar
android:id="@+id/pbWait"
style="@style/Base.Widget.AppCompat.ProgressBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

20
app/src/play/AndroidManifest.xml
View File

@ -377,6 +377,26 @@
</intent-filter>
</activity>
<activity
android:name=".ActivityDmarc"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="content" />
<data android:mimeType="text/xml" />
<data android:mimeType="application/xml" />
<data android:host="*" />
</intent-filter>
</activity>
<activity
android:name=".ActivityBilling"
android:exported="false"

1
metadata/en-US/changelogs/1854.txt
View File

@ -9,6 +9,7 @@
* Enabled [sqlite analyze](https://sqlite.org/lang_analyze.html)
* Added [linear back-off scheme](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq123)
* Added option to sort reply templates by frequency of use
* Added basic DMARC report viewer
* Small improvements and minor bug fixes
* Updated translations