mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2024-11-02 14:55:58 +01:00
XmppHostnameVerifier: check subject CommonName
This commit is contained in:
parent
0cbbedd2f4
commit
f24ef7dda9
1 changed files with 21 additions and 1 deletions
|
@ -30,6 +30,9 @@ import java.util.Locale;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
import java.util.logging.Logger;
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
|
import javax.naming.InvalidNameException;
|
||||||
|
import javax.naming.ldap.LdapName;
|
||||||
|
import javax.naming.ldap.Rdn;
|
||||||
import javax.net.ssl.HostnameVerifier;
|
import javax.net.ssl.HostnameVerifier;
|
||||||
import javax.net.ssl.SSLPeerUnverifiedException;
|
import javax.net.ssl.SSLPeerUnverifiedException;
|
||||||
import javax.net.ssl.SSLSession;
|
import javax.net.ssl.SSLSession;
|
||||||
|
@ -133,7 +136,24 @@ public class XmppHostnameVerifier implements HostnameVerifier {
|
||||||
throw new CertificateException(sb.toString());
|
throw new CertificateException(sb.toString());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// TODO SubjectX500Name
|
|
||||||
|
LdapName dn = null;
|
||||||
|
try {
|
||||||
|
dn = new LdapName(cert.getSubjectX500Principal().getName());
|
||||||
|
} catch (InvalidNameException e) {
|
||||||
|
LOGGER.warning("Invalid DN: " + e.getMessage());
|
||||||
|
}
|
||||||
|
if (dn != null) {
|
||||||
|
for (Rdn rdn : dn.getRdns()) {
|
||||||
|
if (rdn.getType().equalsIgnoreCase("CN")) {
|
||||||
|
if (matchesPerRfc2818(name, rdn.getValue().toString())) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
throw new CertificateException("No name matching " + name + " found");
|
throw new CertificateException("No name matching " + name + " found");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue