sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

verify against IDN variant of domain

This commit is contained in:
Daniel Gultsch 2021-02-04 11:15:59 +01:00
parent f82ae0a9b8
commit b76b60df5c
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/eu/siacs/conversations/crypto/XmppDomainVerifier.java
View File

@ -16,6 +16,7 @@ import org.bouncycastle.asn1.x500.style.IETFUtils;
import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder; import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
import java.io.IOException; import java.io.IOException;
import java.net.IDN;
import java.security.cert.Certificate; import java.security.cert.Certificate;
import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateEncodingException;
import java.security.cert.X509Certificate; import java.security.cert.X509Certificate;
@ -98,24 +99,26 @@ public class XmppDomainVerifier implements DomainHostnameVerifier {
} }
@Override @Override
public boolean verify(String domain, String hostname, SSLSession sslSession) { public boolean verify(final String unicodeDomain,final String unicodeHostname, SSLSession sslSession) {
final String domain = IDN.toASCII(unicodeDomain);
final String hostname = unicodeHostname == null ? null : IDN.toASCII(unicodeHostname);
try { try {
Certificate[] chain = sslSession.getPeerCertificates(); final Certificate[] chain = sslSession.getPeerCertificates();
if (chain.length == 0 || !(chain[0] instanceof X509Certificate)) { if (chain.length == 0 || !(chain[0] instanceof X509Certificate)) {
return false; return false;
} }
X509Certificate certificate = (X509Certificate) chain[0]; final X509Certificate certificate = (X509Certificate) chain[0];
final List<String> commonNames = getCommonNames(certificate); final List<String> commonNames = getCommonNames(certificate);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && isSelfSigned(certificate)) { if (isSelfSigned(certificate)) {
if (commonNames.size() == 1 && matchDomain(domain, commonNames)) { if (commonNames.size() == 1 && matchDomain(domain, commonNames)) {
Log.d(LOGTAG, "accepted CN in self signed cert as work around for " + domain); Log.d(LOGTAG, "accepted CN in self signed cert as work around for " + domain);
return true; return true;
} }
} }
Collection<List<?>> alternativeNames = certificate.getSubjectAlternativeNames(); final Collection<List<?>> alternativeNames = certificate.getSubjectAlternativeNames();
List<String> xmppAddrs = new ArrayList<>(); final List<String> xmppAddrs = new ArrayList<>();
List<String> srvNames = new ArrayList<>(); final List<String> srvNames = new ArrayList<>();
List<String> domains = new ArrayList<>(); final List<String> domains = new ArrayList<>();
if (alternativeNames != null) { if (alternativeNames != null) {
for (List<?> san : alternativeNames) { for (List<?> san : alternativeNames) {
final Integer type = (Integer) san.get(0); final Integer type = (Integer) san.get(0);
@ -152,7 +155,7 @@ public class XmppDomainVerifier implements DomainHostnameVerifier {
|| srvNames.contains("_xmpp-client." + domain) || srvNames.contains("_xmpp-client." + domain)
|| matchDomain(domain, domains) || matchDomain(domain, domains)
|| (hostname != null && matchDomain(hostname, domains)); || (hostname != null && matchDomain(hostname, domains));
} catch (Exception e) { } catch (final Exception e) {
return false; return false;
} }
} }