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

Added auth result

Browse Source
pull/214/head
M66B 1 year ago
parent 5a72eaf6f5
commit 3aa13a30ba
7 changed files with 3027 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2991
app/schemas/eu.faircode.email.DB/287.json
View File

File diff suppressed because it is too large Load Diff

26
app/src/main/java/eu/faircode/email/AdapterMessage.java
Unescape View File

@ -1276,6 +1276,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
!((Boolean.FALSE.equals(message.dkim) && check_authentication) ||
(Boolean.FALSE.equals(message.spf) && check_authentication) ||
(Boolean.FALSE.equals(message.dmarc) && check_authentication) ||
(Boolean.FALSE.equals(message.auth) && check_authentication) ||
(Boolean.FALSE.equals(message.reply_domain) && check_reply_domain) ||
(Boolean.FALSE.equals(message.mx) && check_mx) ||
(Boolean.TRUE.equals(message.blocklist) && check_blocklist));
@ -1377,9 +1378,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
!Boolean.FALSE.equals(message.dmarc))
auths = 3;
if (Boolean.TRUE.equals(message.auth))
auths = 3;
boolean verified = (auths == 3 && (!check_tls || Boolean.TRUE.equals(message.tls)));
if (message.dkim == null && message.spf == null && message.dmarc == null)
if (!Boolean.TRUE.equals(message.auth) &&
message.dkim == null && message.spf == null && message.dmarc == null)
ibAuth.setImageLevel(1);
else
ibAuth.setImageLevel(auths + 2);
@ -2020,9 +2025,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ibAvatar.setVisibility(main == null || !main.hasPhoto() ? View.GONE : View.VISIBLE);
if (main != null && "vmc".equals(main.getType()) &&
Boolean.TRUE.equals(message.dkim) &&
Boolean.TRUE.equals(message.spf) &&
Boolean.TRUE.equals(message.dmarc)) {
(Boolean.TRUE.equals(message.auth) ||
(Boolean.TRUE.equals(message.dkim) &&
Boolean.TRUE.equals(message.spf) &&
Boolean.TRUE.equals(message.dmarc)))) {
ibVerified.setImageLevel(main.isVerified() ? 1 : 0);
ibVerified.setImageTintList(ColorStateList.valueOf(main.isVerified()
? colorVerified : colorControlNormal));
@ -2765,6 +2771,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
.append(" DKIM=").append(message.dkim == null ? "-" : (message.dkim ? "✓" : "✗"))
.append(" SPF=").append(message.spf == null ? "-" : (message.spf ? "✓" : "✗"))
.append(" DMARC=").append(message.dmarc == null ? "-" : (message.dmarc ? "✓" : "✗"))
.append(" AUTH=").append(message.auth == null ? "-" : (message.auth ? "✓" : "✗"))
.append(" BL=").append(message.blocklist == null ? "-" : (message.blocklist ? "✓" : "✗"))
.append('\n');
}
@ -4858,6 +4865,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
result.add("SPF");
if (Boolean.FALSE.equals(message.dmarc))
result.add("DMARC");
if (Boolean.FALSE.equals(message.auth))
result.add("AUTH");
if (Boolean.FALSE.equals(message.mx))
result.add("MX");
@ -4875,7 +4884,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
.append(message.spf == null ? "-" : (message.spf ? "✓" : "✗"))
.append('\n');
sb.append("DMARC: ")
.append(message.dmarc == null ? "-" : (message.dmarc ? "✓" : "✗"));
.append(message.dmarc == null ? "-" : (message.dmarc ? "✓" : "✗"))
.append('\n');
sb.append("AUTH: ")
.append(message.auth == null ? "-" : (message.auth ? "✓" : "✗"));
}
if (native_dkim && !TextUtils.isEmpty(message.signedby)) {
@ -8142,6 +8154,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
same = false;
log("dmarc changed", next.id);
}
if (!Objects.equals(prev.auth, next.auth)) {
same = false;
log("auth changed", next.id);
}
if (!Objects.equals(prev.mx, next.mx)) {
same = false;
log("mx changed", next.id);

2
app/src/main/java/eu/faircode/email/Core.java
Unescape View File

@ -3437,6 +3437,7 @@ class Core {
if (message.spf == null && helper.getSPF())
message.spf = true;
message.dmarc = MessageHelper.getAuthentication("dmarc", authentication);
message.auth = MessageHelper.getAuthentication("auth", authentication);
message.smtp_from = helper.getMailFrom(authentication);
message.return_path = helper.getReturnPath();
message.submitter = helper.getSubmitter();
@ -4585,6 +4586,7 @@ class Core {
if (message.spf == null && helper.getSPF())
message.spf = true;
message.dmarc = MessageHelper.getAuthentication("dmarc", authentication);
message.auth = MessageHelper.getAuthentication("auth", authentication);
message.smtp_from = helper.getMailFrom(authentication);
message.return_path = helper.getReturnPath();
message.submitter = helper.getSubmitter();

8
app/src/main/java/eu/faircode/email/DB.java
Unescape View File

@ -67,7 +67,7 @@ import javax.mail.internet.InternetAddress;
// https://developer.android.com/topic/libraries/architecture/room.html
@Database(
version = 286,
version = 287,
entities = {
EntityIdentity.class,
EntityAccount.class,
@ -2883,6 +2883,12 @@ public abstract class DB extends RoomDatabase {
db.execSQL("UPDATE `attachment` SET available = 0");
prefs.edit().remove("external_storage").apply();
}
}).addMigrations(new Migration(286, 287) {
@Override
public void migrate(@NonNull SupportSQLiteDatabase db) {
logMigration(startVersion, endVersion);
db.execSQL("ALTER TABLE `message` ADD COLUMN `auth` INTEGER");
}
}).addMigrations(new Migration(998, 999) {
@Override
public void migrate(@NonNull SupportSQLiteDatabase db) {

2
app/src/main/java/eu/faircode/email/EntityMessage.java
Unescape View File

@ -163,6 +163,7 @@ public class EntityMessage implements Serializable {
public Boolean dkim;
public Boolean spf;
public Boolean dmarc;
public Boolean auth; // SMTP
public Boolean mx;
public Boolean blocklist;
public Boolean from_domain; // spf/smtp.mailfrom <> from
@ -757,6 +758,7 @@ public class EntityMessage implements Serializable {
Objects.equals(this.dkim, other.dkim) &&
Objects.equals(this.spf, other.spf) &&
Objects.equals(this.dmarc, other.dmarc) &&
Objects.equals(this.auth, other.auth) &&
Objects.equals(this.mx, other.mx) &&
Objects.equals(this.blocklist, other.blocklist) &&
Objects.equals(this.from_domain, other.from_domain) &&

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

@ -387,6 +387,9 @@ public class EntityRule {
} else if ("$dmarc".equals(keyword)) {
if (!Boolean.TRUE.equals(message.dmarc))
return false;
} else if ("$auth".equals(keyword)) {
if (!Boolean.TRUE.equals(message.auth))
return false;
} else if ("$mx".equals(keyword)) {
if (!Boolean.TRUE.equals(message.mx))
return false;

1
app/src/main/java/eu/faircode/email/MessageHelper.java
Unescape View File

@ -2146,6 +2146,7 @@ public class MessageHelper {
List<String> all = new ArrayList<>();
// https://datatracker.ietf.org/doc/html/rfc8601
String[] results = imessage.getHeader("Authentication-Results");
if (results != null)
all.addAll(Arrays.asList(results));

Write Preview
Loading…
Cancel
Save