From 908bd5784a4357197a7f6c7034d1ed7988800ae7 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 21 Jul 2021 07:28:48 +0200
Subject: [PATCH] Use parent domain for BIMI

---
 app/src/main/java/eu/faircode/email/Bimi.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/Bimi.java b/app/src/main/java/eu/faircode/email/Bimi.java
index 55cc8a4f0c..1ddc2c5ca8 100644
--- a/app/src/main/java/eu/faircode/email/Bimi.java
+++ b/app/src/main/java/eu/faircode/email/Bimi.java
@@ -85,11 +85,13 @@ public class Bimi {
 
         if (TextUtils.isEmpty(selector))
             selector = "default";
+        String parent = UriHelper.getParentDomain(context, domain);
+        Log.i("BIMI domain=" + domain + " parent=" + parent);
 
         // Get DNS record
         DnsHelper.DnsRecord[] records;
         try {
-            String txt = selector + "._bimi." + domain;
+            String txt = selector + "._bimi." + parent;
             Log.i("BIMI fetch TXT " + txt);
             records = DnsHelper.lookup(context, txt, "txt");
             if (records.length == 0)
@@ -210,7 +212,7 @@ public class Bimi {
 
                         // Check subject
                         List<String> names = EntityCertificate.getDnsNames(cert);
-                        if (!names.contains(domain))
+                        if (!names.contains(parent))
                             throw new IllegalArgumentException("Invalid certificate domain" +
                                     " names=" + TextUtils.join(", ", names));
 
@@ -301,10 +303,10 @@ public class Bimi {
                         CertPathValidator cpv = CertPathValidator.getInstance("PKIX");
                         cpv.validate(path.getCertPath(), pparams);
 
-                        Log.i("BIMI valid domain=" + domain);
+                        Log.i("BIMI valid domain=" + parent);
 
                         // Get DMARC record
-                        String txt = "_dmarc." + domain;
+                        String txt = "_dmarc." + parent;
                         Log.i("BIMI fetch TXT " + txt);
                         records = DnsHelper.lookup(context, txt, "txt");
                         if (records.length == 0)
@@ -321,7 +323,7 @@ public class Bimi {
                     } catch (MalformedURLException ex) {
                         Log.i(ex);
                     } catch (Throwable ex) {
-                        Log.w(new Throwable("BIMI " + domain, ex));
+                        Log.w(new Throwable("BIMI " + parent, ex));
                     }
 
                     break;