Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Verify IPv6 hostnames [3.14.x] #6483

Closed
wants to merge 1 commit into from
Closed

Verify IPv6 hostnames [3.14.x] #6483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions okhttp-tests/src/test/java/okhttp3/internal/tls/HostnameVerifierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,42 @@ public final class HostnameVerifierTest {
assertThat(verifier.verify("quux.com", session)).isFalse();
}

@Test public void subjectAltNameWithIPAddresses() throws Exception {
// $ cat ./cert.cnf
// [req]
// distinguished_name=distinguished_name
// req_extensions=req_extensions
// x509_extensions=x509_extensions
// [distinguished_name]
// [req_extensions]
// [x509_extensions]
// subjectAltName=IP:0:0:0:0:0:0:0:1,IP:2a03:2880:f003:c07:face:b00c::2,IP:0::5,IP:192.168.1.1
//
// $ openssl req -x509 -nodes -days 36500 -subj '/CN=foo.com' -config ./cert.cnf \
// -newkey rsa:512 -out cert.pem
SSLSession session = session(""
+ "-----BEGIN CERTIFICATE-----\n"
+ "MIIBaDCCARKgAwIBAgIJALxN+AOBVGwQMA0GCSqGSIb3DQEBCwUAMBIxEDAOBgNV\n"
+ "BAMMB2Zvby5jb20wIBcNMjAwMzIyMTEwNDI4WhgPMjEyMDAyMjcxMTA0MjhaMBIx\n"
+ "EDAOBgNVBAMMB2Zvby5jb20wXDANBgkqhkiG9w0BAQEFAANLADBIAkEAlnVbVfQ9\n"
+ "4aYjrPCcFuxOpjXuvyOc9Hcha4K7TfXyfsrjhAvCjCBIT/TiLOUVF3sx4yoCAtX8\n"
+ "wmt404tTbKD6UwIDAQABo0kwRzBFBgNVHREEPjA8hxAAAAAAAAAAAAAAAAAAAAAB\n"
+ "hxAqAyiA8AMMB/rOsAwAAAAChxAAAAAAAAAAAAAAAAAAAAAFhwTAqAEBMA0GCSqG\n"
+ "SIb3DQEBCwUAA0EAPSOYHJh7hB4ElBqTCAFW+T5Y7mXsv9nQjBJ7w0YIw83V2PEI\n"
+ "3KbBIyGTrqHD6lG8QGZy+yNkIcRlodG8OfQRUg==\n"
+ "-----END CERTIFICATE-----");
assertThat(verifier.verify("foo.com", session)).isFalse();
assertThat(verifier.verify("::1", session)).isTrue();
assertThat(verifier.verify("::2", session)).isFalse();
assertThat(verifier.verify("::5", session)).isTrue();
assertThat(verifier.verify("2a03:2880:f003:c07:face:b00c::2", session)).isTrue();
assertThat(verifier.verify("2a03:2880:f003:c07:face:b00c:0:2", session)).isTrue();
assertThat(verifier.verify("2a03:2880:f003:c07:FACE:B00C:0:2", session)).isTrue();
assertThat(verifier.verify("2a03:2880:f003:c07:face:b00c:0:3", session)).isFalse();
assertThat(verifier.verify("127.0.0.1", session)).isFalse();
assertThat(verifier.verify("192.168.1.1", session)).isTrue();
}

@Test public void verifyAsIpAddress() {
// IPv4
assertThat(Util.verifyAsIpAddress("127.0.0.1")).isTrue();
Expand Down
4 changes: 3 additions & 1 deletion okhttp/src/main/java/okhttp3/internal/tls/OkHostnameVerifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import javax.net.ssl.SSLException;
import javax.net.ssl.SSLSession;

import static okhttp3.internal.Util.canonicalizeHost;
import static okhttp3.internal.Util.verifyAsIpAddress;

/**
Expand Down Expand Up @@ -60,9 +61,10 @@ public boolean verify(String host, X509Certificate certificate) {

/** Returns true if {@code certificate} matches {@code ipAddress}. */
private boolean verifyIpAddress(String ipAddress, X509Certificate certificate) {
String canonicalIpAddress = canonicalizeHost(ipAddress);
List<String> altNames = getSubjectAltNames(certificate, ALT_IPA_NAME);
for (int i = 0, size = altNames.size(); i < size; i++) {
if (ipAddress.equalsIgnoreCase(altNames.get(i))) {
if (canonicalIpAddress.equals(canonicalizeHost(altNames.get(i)))) {
return true;
}
}
Expand Down