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

Use parent domain for BIMI

This commit is contained in:
M66B 2021-07-21 07:28:48 +02:00
parent 6375a502c0
commit 908bd5784a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/eu/faircode/email/Bimi.java
View File

@ -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;