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

SOLR-9028: Fix 2 SSL test related bugs... 

1) SolrTestCaseJ4 should always reset the HttpClientConfigurer in afterClass, regardless of wether ssl was used
   (when SSL is not used, the active configurer explicitly excludes SSL)
2) HttpClientUtilTest.testSSLSystemProperties made no sense as written.  setSSLSystemProperties() didn't have any
   effect on what was being tested, even if it was useful it would only have affected what keystore/truststore were
   used, not wether HTTPS was supported or not.
This commit is contained in:
Chris Hostetter 2016-04-30 22:22:09 -07:00
parent 6c0e940b9b
commit 8e8f6c1fa8
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java
View File

@ -23,6 +23,8 @@ import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.http.auth.AuthScope;
import org.apache.http.client.config.AuthSchemes;
import org.apache.http.client.HttpClient;
@ -40,8 +42,9 @@ import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.util.SSLTestConfig;
import org.junit.Test;
import org.junit.Assume;
public class HttpClientUtilTest {
public class HttpClientUtilTest extends LuceneTestCase {
@Test
public void testNoParamsSucceeds() throws IOException {
@ -121,11 +124,14 @@ public class HttpClientUtilTest {
@Test
@SuppressWarnings("deprecation")
public void testSSLSystemProperties() throws IOException {
HttpClientUtil.setConfigurer(new HttpClientConfigurer());
CloseableHttpClient client = HttpClientUtil.createClient(null);
try {
SSLTestConfig.setSSLSystemProperties();
assertNotNull("HTTPS scheme could not be created using the javax.net.ssl.* system properties.",
client.getConnectionManager().getSchemeRegistry().get("https"));
// We could use SSLContext.setDefault to *ensure* that SSL is supported by default,
// but if the platform default doesn't already support it, something is seriously wonky
// with the JVM, so let's not push our luck
Assume.assumeNotNull("HTTPS scheme could not be created using JVM/Configurer defaults",
client.getConnectionManager().getSchemeRegistry().get("https"));
System.clearProperty(HttpClientUtil.SYS_PROP_CHECK_PEER_NAME);
client.close();
@ -147,7 +153,6 @@ public class HttpClientUtilTest {
client = HttpClientUtil.createClient(null);
assertEquals(AllowAllHostnameVerifier.class, getHostnameVerifier(client).getClass());
} finally {
SSLTestConfig.clearSSLSystemProperties();
System.clearProperty(HttpClientUtil.SYS_PROP_CHECK_PEER_NAME);
client.close();
}

4
solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
View File

@ -277,9 +277,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase {
System.clearProperty("useCompoundFile");
System.clearProperty("urlScheme");
if (isSSLMode()) {
HttpClientUtil.setConfigurer(new HttpClientConfigurer());
}
HttpClientUtil.setConfigurer(new HttpClientConfigurer());
// clean up static
sslConfig = null;