Apache Solr open-source search software
SOLR-15590 Fix SSL, init order misplaced by prior commit for this ticket. (#445)
Gus Heck6fdbe171284b
diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.javaindex ec8d3c77f0a..fcb12dcde5d 100644--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java+++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java@@ -73,6 +73,7 @@ import org.apache.solr.metrics.SolrMetricManager;import org.apache.solr.servlet.CoreContainerProvider;import org.apache.solr.servlet.SolrDispatchFilter;import org.apache.solr.util.TimeOut;+import org.apache.solr.util.configuration.SSLConfigurationsFactory;import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory;import org.eclipse.jetty.http2.HTTP2Cipher;import org.eclipse.jetty.http2.server.HTTP2CServerConnectionFactory;@@ -387,6 +388,7 @@ public class JettySolrRunner {root.getServletContext().setAttribute(SolrDispatchFilter.PROPERTIES_ATTRIBUTE, nodeProperties);root.getServletContext().setAttribute(SolrDispatchFilter.SOLRHOME_ATTRIBUTE, solrHome);+ SSLConfigurationsFactory.current().init(); // normally happens in jetty-ssl.xmlcoreContainerProvider = new CoreContainerProvider();coreContainerProvider.init(root.getServletContext());log.info("Jetty properties: {}", nodeProperties);diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.javaindex 632e0db65f4..130ca18b92f 100644--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java@@ -35,7 +35,6 @@ import org.apache.solr.security.AuthenticationPlugin;import org.apache.solr.security.PKIAuthenticationPlugin;import org.apache.solr.security.PublicKeyHandler;import org.apache.solr.servlet.CoreContainerProvider.ServiceHolder;-import org.apache.solr.util.configuration.SSLConfigurationsFactory;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -131,7 +130,7 @@ public class SolrDispatchFilter extends BaseSolrFilter implements PathExcluder {public void init(FilterConfig config) throws ServletException {try {coreService = CoreContainerProvider.serviceForContext(config.getServletContext());- SSLConfigurationsFactory.current().init();+if (log.isTraceEnabled()) {log.trace("SolrDispatchFilter.init(): {}", this.getClass().getClassLoader());}diff --git a/solr/server/etc/jetty-ssl.xml b/solr/server/etc/jetty-ssl.xmlindex 53e0ec1109b..7292b7f3343 100644--- a/solr/server/etc/jetty-ssl.xml+++ b/solr/server/etc/jetty-ssl.xml@@ -7,6 +7,9 @@<!-- and either jetty-https.xml or jetty-spdy.xml (but not both) --><!-- ============================================================= --><Configure id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory$Server">+ <Call class="org.apache.solr.util.configuration.SSLConfigurationsFactory" name="current">+ <Call name="init" />+ </Call><Call class="org.apache.solr.util.configuration.SSLConfigurationsFactory" name="current"><Get name="keyStorePassword" id="keyStorePassword"/><Get name="trustStorePassword" id="trustStorePassword"/>