Apache Solr open-source search software
SOLR-16679: Fix solr.jetty.ssl.verifyClientHostName logging (#1376)
Kevin Risden67a654b0df24
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 91c56d19aa9..9372924eef6 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -223,6 +223,8 @@ Bug Fixes* SOLR-16669: Http2SolrClient now defaults checkPeerName to True, as the documentation specified (Houston Putman)+* SOLR-16679: Fix solr.jetty.ssl.verifyClientHostName logging (Kevin Risden)+Build---------------------* Upgrade forbiddenapis to 3.4 (Uwe Schindler)diff --git a/solr/bin/solr b/solr/bin/solrindex cbb34e09047..d4d6905bc25 100644--- a/solr/bin/solr+++ b/solr/bin/solr@@ -224,8 +224,8 @@ if [ "$SOLR_SSL_ENABLED" == "true" ]; thenSOLR_SSL_OPTS+=" -Dsolr.jetty.truststore.type=$SOLR_SSL_TRUST_STORE_TYPE"fi- if [ -z "$SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION" ] ; then- SOLR_SSL_OPTS+=" -Dsolr.jetty.ssl.verifyClientHostName=HTTPS"+ if [ "${SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION:-true}" == "false" ]; then+ SOLR_SSL_OPTS+=" -Dsolr.jetty.ssl.verifyClientHostName=false"fiif [ -n "$SOLR_SSL_NEED_CLIENT_AUTH" ]; thendiff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmdindex 167ef7fe165..77b1b2263ab 100755--- a/solr/bin/solr.cmd+++ b/solr/bin/solr.cmd@@ -103,7 +103,10 @@ IF "%SOLR_SSL_ENABLED%"=="true" ()IF NOT DEFINED SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION (- set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dsolr.jetty.ssl.verifyClientHostName=HTTPS"+ set SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=true+ )+ IF "%SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION%"=="false" (+ set "SOLR_SSL_OPTS=!SOLR_SSL_OPTS! -Dsolr.jetty.ssl.verifyClientHostName=false")IF DEFINED SOLR_SSL_NEED_CLIENT_AUTH (diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.javaindex 91cfe4a119b..91388da194a 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java@@ -1265,8 +1265,11 @@ public class Http2SolrClient extends SolrClient {sslContextFactory.setTrustStoreType(System.getProperty("javax.net.ssl.trustStoreType"));}- sslContextFactory.setEndpointIdentificationAlgorithm(- System.getProperty("solr.jetty.ssl.verifyClientHostName"));+ if (Boolean.parseBoolean(System.getProperty("solr.jetty.ssl.verifyClientHostName", "true"))) {+ sslContextFactory.setEndpointIdentificationAlgorithm("HTTPS");+ } else {+ sslContextFactory.setEndpointIdentificationAlgorithm(null);+ }return sslContextFactory;}diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.javaindex 99eabbd9785..733650aca56 100644--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/Http2SolrClientTest.java@@ -724,15 +724,37 @@ public class Http2SolrClientTest extends SolrJettyTestBase {@Testpublic void testGetDefaultSslContextFactory() {- assertNull(Http2SolrClient.getDefaultSslContextFactory().getEndpointIdentificationAlgorithm());+ assertEquals(+ "HTTPS",+ Http2SolrClient.getDefaultSslContextFactory().getEndpointIdentificationAlgorithm());- System.setProperty("solr.jetty.ssl.verifyClientHostName", "HTTPS");System.setProperty("javax.net.ssl.keyStoreType", "foo");System.setProperty("javax.net.ssl.trustStoreType", "bar");SslContextFactory.Client sslContextFactory = Http2SolrClient.getDefaultSslContextFactory();assertEquals("HTTPS", sslContextFactory.getEndpointIdentificationAlgorithm());assertEquals("foo", sslContextFactory.getKeyStoreType());assertEquals("bar", sslContextFactory.getTrustStoreType());+ System.clearProperty("javax.net.ssl.keyStoreType");+ System.clearProperty("javax.net.ssl.trustStoreType");++ System.setProperty("solr.jetty.ssl.verifyClientHostName", "true");+ System.setProperty("javax.net.ssl.keyStoreType", "foo");+ System.setProperty("javax.net.ssl.trustStoreType", "bar");+ SslContextFactory.Client sslContextFactory2 = Http2SolrClient.getDefaultSslContextFactory();+ assertEquals("HTTPS", sslContextFactory2.getEndpointIdentificationAlgorithm());+ assertEquals("foo", sslContextFactory2.getKeyStoreType());+ assertEquals("bar", sslContextFactory2.getTrustStoreType());+ System.clearProperty("solr.jetty.ssl.verifyClientHostName");+ System.clearProperty("javax.net.ssl.keyStoreType");+ System.clearProperty("javax.net.ssl.trustStoreType");++ System.setProperty("solr.jetty.ssl.verifyClientHostName", "false");+ System.setProperty("javax.net.ssl.keyStoreType", "foo");+ System.setProperty("javax.net.ssl.trustStoreType", "bar");+ SslContextFactory.Client sslContextFactory3 = Http2SolrClient.getDefaultSslContextFactory();+ assertNull(sslContextFactory3.getEndpointIdentificationAlgorithm());+ assertEquals("foo", sslContextFactory3.getKeyStoreType());+ assertEquals("bar", sslContextFactory3.getTrustStoreType());System.clearProperty("solr.jetty.ssl.verifyClientHostName");System.clearProperty("javax.net.ssl.keyStoreType");System.clearProperty("javax.net.ssl.trustStoreType");