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

Debug: authentication

Browse Source
pull/215/head
M66B 7 months ago
parent 841b46c5a2
commit 684428944f
2 changed files with 77 additions and 17 deletions
Show Stats Download Patch File Download Diff File

77
app/src/main/java/eu/faircode/email/ActivityEML.java
Unescape View File

@ -66,8 +66,10 @@ import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.text.DateFormat;
import java.util.List;
import java.util.Properties;
import javax.mail.Address;
import javax.mail.Flags;
import javax.mail.Folder;
import javax.mail.Message;
@ -88,8 +90,10 @@ public class ActivityEML extends ActivityBase {
private TextView tvBody;
private TextView tvStructure;
private ImageButton ibEml;
private CardView cardStructure;
private CardView cardHeaders;
private TextView tvHeaders;
private TextView tvAuthentication;
private ContentLoadingProgressBar pbWait;
private Group grpReady;
@ -128,8 +132,10 @@ public class ActivityEML extends ActivityBase {
tvBody = findViewById(R.id.tvBody);
tvStructure = findViewById(R.id.tvStructure);
ibEml = findViewById(R.id.ibEml);
cardStructure = findViewById(R.id.cardStructure);
cardHeaders = findViewById(R.id.cardHeaders);
tvHeaders = findViewById(R.id.tvHeaders);
tvAuthentication = findViewById(R.id.tvAuthentication);
pbWait = findViewById(R.id.pbWait);
grpReady = findViewById(R.id.grpReady);
@ -209,6 +215,7 @@ public class ActivityEML extends ActivityBase {
// Initialize
vSeparatorAttachments.setVisibility(View.GONE);
grpReady.setVisibility(View.GONE);
cardStructure.setVisibility(View.GONE);
cardHeaders.setVisibility(View.GONE);
load();
@ -232,8 +239,12 @@ public class ActivityEML extends ActivityBase {
uri = getIntent().getData();
Log.i("EML uri=" + uri);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
boolean debug = prefs.getBoolean("debug", false);
Bundle args = new Bundle();
args.putParcelable("uri", uri);
args.putBoolean("debug", debug || BuildConfig.DEBUG);
new SimpleTask<Result>() {
@Override
@ -249,6 +260,7 @@ public class ActivityEML extends ActivityBase {
@Override
protected Result onExecute(Context context, Bundle args) throws Throwable {
Uri uri = args.getParcelable("uri");
boolean debug = args.getBoolean("debug");
NoStreamException.check(uri, context);
@ -321,17 +333,50 @@ public class ActivityEML extends ActivityBase {
}, null);
}
int textColorLink = Helper.resolveColor(context, android.R.attr.textColorLink);
SpannableStringBuilder ssb = new SpannableStringBuilderEx();
MessageHelper.getStructure(imessage, ssb, 0, textColorLink);
result.structure = ssb;
result.headers = HtmlHelper.highlightHeaders(context,
helper.getFrom(),
helper.getTo(),
helper.getReceivedHeader(),
helper.getHeaders(),
false, false);
if (debug) {
int textColorLink = Helper.resolveColor(context, android.R.attr.textColorLink);
SpannableStringBuilder ssb = new SpannableStringBuilderEx();
MessageHelper.getStructure(imessage, ssb, 0, textColorLink);
result.structure = ssb;
result.headers = HtmlHelper.highlightHeaders(context,
helper.getFrom(),
helper.getTo(),
helper.getReceivedHeader(),
helper.getHeaders(),
false, false);
ssb = new SpannableStringBuilderEx();
String[] authentication = helper.getAuthentication();
Boolean tls = helper.getTLS();
Boolean dkim = MessageHelper.getAuthentication("dkim", authentication);
Boolean spf = MessageHelper.getAuthentication("spf", authentication);
if (spf == null)
spf = helper.getSPF();
Boolean dmarc = MessageHelper.getAuthentication("dmarc", authentication);
Boolean auth = MessageHelper.getAuthentication("auth", authentication);
List<String> signers = helper.verifyDKIM(context);
boolean aligned = helper.isAligned(context, signers,
helper.getReturnPath(), helper.getMailFrom(authentication), helper.getFrom());
ssb.append("TLS: ").append(tls == null ? "-" : (tls ? "✓" : "✗")).append('\n');
ssb.append("DKIM: ").append(dkim == null ? "-" : (dkim ? "✓" : "✗")).append('\n');
ssb.append("SPF: ").append(spf == null ? "-" : (spf ? "✓" : "✗")).append('\n');
ssb.append("DMARC: ").append(dmarc == null ? "-" : (dmarc ? "✓" : "✗")).append('\n');
ssb.append("AUTH: ").append(auth == null ? "-" : (auth ? "✓" : "✗")).append('\n');
ssb.append('\n');
ssb.append("Signers: ").append('\n');
for (String signer : signers)
ssb.append("- ").append(signer).append('\n');
ssb.append('\n');
ssb.append("Aligned: ").append(Boolean.toString(aligned)).append('\n');
result.authentication = ssb;
}
return result;
}
@ -411,10 +456,15 @@ public class ActivityEML extends ActivityBase {
rvAttachment.setAdapter(adapter);
tvBody.setText(result.body);
grpReady.setVisibility(View.VISIBLE);
tvStructure.setText(result.structure);
tvHeaders.setText(result.headers);
grpReady.setVisibility(View.VISIBLE);
cardHeaders.setVisibility(BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
tvAuthentication.setText(result.authentication);
boolean debug = args.getBoolean("debug");
cardStructure.setVisibility(debug ? View.VISIBLE : View.GONE);
cardHeaders.setVisibility(debug ? View.VISIBLE : View.GONE);
}
@Override
@ -672,5 +722,6 @@ public class ActivityEML extends ActivityBase {
Spanned body;
Spanned structure;
Spanned headers;
Spanned authentication;
}
}

17
app/src/main/res/layout/activity_eml.xml
Unescape View File

@ -283,9 +283,7 @@
android:id="@+id/tvStructure"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:fontFamily="monospace"
android:minHeight="30dp"
android:text="Structure"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textIsSelectable="true"
@ -329,15 +327,26 @@
android:id="@+id/tvHeaders"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:fontFamily="monospace"
android:minHeight="30dp"
android:text="Headers"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textIsSelectable="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tvAuthentication"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:fontFamily="monospace"
android:text="Authentication"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textIsSelectable="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvHeaders" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>

Write Preview
Loading…
Cancel
Save