Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-12988: Revert changes

This commit is contained in:
Cao Manh Dat 2019-06-19 21:07:38 +01:00
parent cf8ac4dbcf
commit 150e4f9863
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java
View File

@ -85,8 +85,7 @@ public class TestMiniSolrCloudClusterSSL extends SolrTestCaseJ4 {
@Before @Before
public void before() { public void before() {
assumeFalse("SOLR-12988: TLSv1.3 in Java 11.0.2 or lower versions does not working correctly with HttpClient", assumeFalse("@AwaitsFix: SOLR-12988 - ssl issues on Java 11/12", Constants.JRE_IS_MINIMUM_JAVA11);
Constants.JRE_IS_MINIMUM_JAVA11 && Runtime.version().compareTo(Runtime.Version.parse("11.0.3")) < 0);
// undo the randomization of our super class // undo the randomization of our super class
log.info("NOTE: This Test ignores the randomized SSL & clientAuth settings selected by base class"); log.info("NOTE: This Test ignores the randomized SSL & clientAuth settings selected by base class");

3
solr/core/src/test/org/apache/solr/cloud/TestSSLRandomization.java
View File

@ -44,8 +44,7 @@ public class TestSSLRandomization extends SolrCloudTestCase {
@BeforeClass @BeforeClass
public static void createMiniSolrCloudCluster() throws Exception { public static void createMiniSolrCloudCluster() throws Exception {
assumeFalse("SOLR-12988: TLSv1.3 in Java 11.0.2 or lower versions does not working correctly with HttpClient", assumeFalse("@AwaitsFix: SOLR-12988 - ssl issues on Java 11/12", Constants.JRE_IS_MINIMUM_JAVA11);
Constants.JRE_IS_MINIMUM_JAVA11 && Runtime.version().compareTo(Runtime.Version.parse("11.0.3")) < 0);
configureCluster(TestMiniSolrCloudClusterSSL.NUM_SERVERS).configure(); configureCluster(TestMiniSolrCloudClusterSSL.NUM_SERVERS).configure();
} }

17
solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java
View File

@ -16,7 +16,7 @@
*/ */
package org.apache.solr.util; package org.apache.solr.util;
import java.lang.invoke.MethodHandles; import javax.net.ssl.SSLContext;
import java.security.KeyManagementException; import java.security.KeyManagementException;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.KeyStoreException; import java.security.KeyStoreException;
@ -26,8 +26,6 @@ import java.security.SecureRandomSpi;
import java.security.UnrecoverableKeyException; import java.security.UnrecoverableKeyException;
import java.util.Random; import java.util.Random;
import javax.net.ssl.SSLContext;
import org.apache.http.config.Registry; import org.apache.http.config.Registry;
import org.apache.http.config.RegistryBuilder; import org.apache.http.config.RegistryBuilder;
import org.apache.http.conn.socket.ConnectionSocketFactory; import org.apache.http.conn.socket.ConnectionSocketFactory;
@ -44,8 +42,6 @@ import org.apache.solr.client.solrj.impl.HttpClientUtil.SchemaRegistryProvider;
import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.util.security.CertificateUtils; import org.eclipse.jetty.util.security.CertificateUtils;
import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.ssl.SslContextFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** /**
* An SSLConfig that provides {@link SSLConfig} and {@link SchemaRegistryProvider} for both clients and servers * An SSLConfig that provides {@link SSLConfig} and {@link SchemaRegistryProvider} for both clients and servers
@ -53,7 +49,6 @@ import org.slf4j.LoggerFactory;
* Solr test-framework classes * Solr test-framework classes
*/ */
public class SSLTestConfig { public class SSLTestConfig {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private static final String TEST_KEYSTORE_BOGUSHOST_RESOURCE = "SSLTestConfig.hostname-and-ip-missmatch.keystore"; private static final String TEST_KEYSTORE_BOGUSHOST_RESOURCE = "SSLTestConfig.hostname-and-ip-missmatch.keystore";
private static final String TEST_KEYSTORE_LOCALHOST_RESOURCE = "SSLTestConfig.testing.keystore"; private static final String TEST_KEYSTORE_LOCALHOST_RESOURCE = "SSLTestConfig.testing.keystore";
private static final String TEST_PASSWORD = "secret"; private static final String TEST_PASSWORD = "secret";
@ -104,11 +99,11 @@ public class SSLTestConfig {
* @see HttpClientUtil#SYS_PROP_CHECK_PEER_NAME * @see HttpClientUtil#SYS_PROP_CHECK_PEER_NAME
*/ */
public SSLTestConfig(boolean useSSL, boolean clientAuth, boolean checkPeerName) { public SSLTestConfig(boolean useSSL, boolean clientAuth, boolean checkPeerName) {
if (useSSL) { // @AwaitsFix: SOLR-12988 - ssl issues on Java 11/12
if (Constants.JRE_IS_MINIMUM_JAVA11 && Runtime.version().compareTo(Runtime.Version.parse("11.0.3")) < 0) { if (Constants.JRE_IS_MINIMUM_JAVA11) {
log.warn("SOLR-12988: TLSv1.3 in Java 11.0.2 or lower versions does not working correctly with HttpClient, disabling SSL for tests"); this.useSsl = false;
useSSL = false; } else {
} this.useSsl = useSSL;
} }
this.useSsl = useSSL; this.useSsl = useSSL;
this.clientAuth = clientAuth; this.clientAuth = clientAuth;