[geode] branch develop updated: GEODE-5212: Also use the host's canonical (fully qualified) name as a SAN in the certificate (#2574)

[jensdeppe]

This is an automated email from the ASF dual-hosted git repository.

jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 9ca42dd  GEODE-5212: Also use the host's canonical (fully qualified) 
name as a SAN in the certificate (#2574)
9ca42dd is described below

commit 9ca42dd64e54dc478f85bb9dbe46065848e3e012
Author: Jens Deppe <jde...@pivotal.io>
AuthorDate: Mon Oct 8 09:35:45 2018 -0700

    GEODE-5212: Also use the host's canonical (fully qualified) name as a SAN 
in the certificate (#2574)
---
 .../internal/ClientServerHostNameVerificationDistributedTest.java       | 1 +
 .../geode/cache/client/internal/CustomSSLProviderDistributedTest.java   | 1 +
 .../cache/wan/serial/WANHostNameVerificationDistributedTest.java        | 2 ++
 3 files changed, 4 insertions(+)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/ClientServerHostNameVerificationDistributedTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/ClientServerHostNameVerificationDistributedTest.java
index d5afdca..118e5b2 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/ClientServerHostNameVerificationDistributedTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/ClientServerHostNameVerificationDistributedTest.java
@@ -83,6 +83,7 @@ public class ClientServerHostNameVerificationDistributedTest {
     CertificateBuilder serverCertificate = new CertificateBuilder()
         .commonName("server")
         .sanDnsName(InetAddress.getLocalHost().getHostName())
+        .sanDnsName(InetAddress.getLocalHost().getCanonicalHostName())
         .sanIpAddress(InetAddress.getLocalHost());
 
     CertificateBuilder clientCertificate = new CertificateBuilder()
diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/CustomSSLProviderDistributedTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/CustomSSLProviderDistributedTest.java
index 7c962ae..9fddeec 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/CustomSSLProviderDistributedTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/cache/client/internal/CustomSSLProviderDistributedTest.java
@@ -98,6 +98,7 @@ public class CustomSSLProviderDistributedTest {
     CertificateBuilder serverCertificate = new CertificateBuilder()
         .commonName("server")
         .sanDnsName(InetAddress.getLocalHost().getHostName())
+        .sanDnsName(InetAddress.getLocalHost().getCanonicalHostName())
         .sanIpAddress(InetAddress.getLocalHost());
 
     CertificateBuilder clientCertificate = new CertificateBuilder()
diff --git 
a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/WANHostNameVerificationDistributedTest.java
 
b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/WANHostNameVerificationDistributedTest.java
index 55fc1f2..b022b75 100644
--- 
a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/WANHostNameVerificationDistributedTest.java
+++ 
b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/WANHostNameVerificationDistributedTest.java
@@ -226,12 +226,14 @@ public class WANHostNameVerificationDistributedTest {
         // ClusterStartupRule uses 'localhost' as locator host
         .sanDnsName(InetAddress.getLoopbackAddress().getHostName())
         .sanDnsName(InetAddress.getLocalHost().getHostName())
+        .sanDnsName(InetAddress.getLocalHost().getCanonicalHostName())
         .sanIpAddress(InetAddress.getLocalHost())
         .sanIpAddress(InetAddress.getByName("0.0.0.0")); // to pass on windows
 
     CertificateBuilder server_ny_cert = new CertificateBuilder()
         .commonName("server_ny")
         .sanDnsName(InetAddress.getLocalHost().getHostName())
+        .sanDnsName(InetAddress.getLocalHost().getCanonicalHostName())
         .sanIpAddress(InetAddress.getLocalHost());
 
     setupWanSites(locator_ln_cert, server_ln_cert, locator_ny_cert, 
server_ny_cert);