mirror of
https://github.com/apache/lucene.git
synced 2025-02-13 21:45:39 +00:00
aab3c5faa3
Jetty 9.4.16.v20190411 and up introduced separate client and server SslContextFactory implementations. This split requires the proper use of of SslContextFactory in clients and server configs. This fixes the following * SSL with SOLR_SSL_NEED_CLIENT_AUTH not working since v8.2.0 * Http2SolrClient SSL not working in branch_8x Signed-off-by: Kevin Risden <krisden@apache.org>
38 lines
2.3 KiB
XML
38 lines
2.3 KiB
XML
<?xml version="1.0"?>
|
|
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
|
|
|
|
<!-- ============================================================= -->
|
|
<!-- Configure a TLS (SSL) Context Factory -->
|
|
<!-- This configuration must be used in conjunction with jetty.xml -->
|
|
<!-- 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">
|
|
<Get name="keyStorePassword" id="keyStorePassword"/>
|
|
<Get name="trustStorePassword" id="trustStorePassword"/>
|
|
</Call>
|
|
<Set name="KeyStorePath"><Property name="solr.jetty.keystore" default="./etc/solr-ssl.keystore.jks"/></Set>
|
|
<Set name="KeyStorePassword"><Ref refid="keyStorePassword"/></Set>
|
|
<Set name="TrustStorePath"><Property name="solr.jetty.truststore" default="./etc/solr-ssl.keystore.jks"/></Set>
|
|
<Set name="TrustStorePassword"><Ref refid="trustStorePassword"/></Set>
|
|
<Set name="NeedClientAuth"><Property name="solr.jetty.ssl.needClientAuth" default="false"/></Set>
|
|
<Set name="WantClientAuth"><Property name="solr.jetty.ssl.wantClientAuth" default="false"/></Set>
|
|
<Set name="EndpointIdentificationAlgorithm"><Property name="solr.jetty.ssl.verifyClientHostName"/></Set>
|
|
<Set name="KeyStoreType"><Property name="solr.jetty.keystore.type" default="JKS"/></Set>
|
|
<Set name="TrustStoreType"><Property name="solr.jetty.truststore.type" default="JKS"/></Set>
|
|
|
|
<!-- =========================================================== -->
|
|
<!-- Create a TLS specific HttpConfiguration based on the -->
|
|
<!-- common HttpConfiguration defined in jetty.xml -->
|
|
<!-- Add a SecureRequestCustomizer to extract certificate and -->
|
|
<!-- session information -->
|
|
<!-- =========================================================== -->
|
|
<New id="sslHttpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
|
|
<Arg><Ref refid="httpConfig"/></Arg>
|
|
<Call name="addCustomizer">
|
|
<Arg><New class="org.eclipse.jetty.server.SecureRequestCustomizer"/></Arg>
|
|
</Call>
|
|
</New>
|
|
|
|
</Configure>
|