[java-opensaml] branch master updated: Fix failing tests wrt recent SecurityEnhancedTLSSocketFactory change.
Brent Putman
putmanb at georgetown.edu
Wed Jun 7 20:12:38 EDT 2017
This is an automated email from the git hooks/post-receive script.
putmanb pushed a commit to branch master
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=f8e84efe6f6fca5f7c16298533d518cefdbf689a
The following commit(s) were added to refs/heads/master by this push:
new f8e84ef Fix failing tests wrt recent SecurityEnhancedTLSSocketFactory change.
f8e84ef is described below
commit f8e84efe6f6fca5f7c16298533d518cefdbf689a
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Wed Jun 7 20:12:30 2017 -0400
Fix failing tests wrt recent SecurityEnhancedTLSSocketFactory change.
---
.../resolver/impl/FileBackedHTTPMetadataResolverTest.java | 12 +++++++++---
.../impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java | 12 +++++++++---
.../metadata/resolver/impl/HTTPMetadataResolverTest.java | 12 +++++++++---
3 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
index 9b44215..48f39cd 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
@@ -293,7 +293,7 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
@Test
public void testTrustEngineSocketFactoryNoHTTPSNoTrustEngine() throws Exception {
// Make sure resolver works when TrustEngine socket factory is configured but just using an HTTP URL.
- httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
+ httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory(false));
metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL, backupFilePath);
metadataProvider.setParserPool(parserPool);
@@ -323,7 +323,7 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
@Test
public void testHTTPSNoTrustEngine() throws Exception {
- httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
+ httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory(false));
metadataProvider = new FileBackedHTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL, backupFilePath);
metadataProvider.setParserPool(parserPool);
@@ -444,10 +444,16 @@ public class FileBackedHTTPMetadataResolverTest extends XMLObjectBaseTestCase {
// Helpers
private LayeredConnectionSocketFactory buildTrustEngineSocketFactory() {
- return new SecurityEnhancedTLSSocketFactory(
+ return buildTrustEngineSocketFactory(true);
+ }
+
+ private LayeredConnectionSocketFactory buildTrustEngineSocketFactory(boolean trustEngineRequired) {
+ SecurityEnhancedTLSSocketFactory factory = new SecurityEnhancedTLSSocketFactory(
HttpClientSupport.buildNoTrustTLSSocketFactory(),
SSLConnectionSocketFactory.STRICT_HOSTNAME_VERIFIER
);
+ factory.setTrustEngineRequired(trustEngineRequired);
+ return factory;
}
private TrustEngine<? super X509Credential> buildExplicitKeyTrustEngine(String cert) throws URISyntaxException, CertificateException {
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
index 5554b1c..7428ffe 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
@@ -258,7 +258,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
true,
new StringDigester("SHA-1", OutputFormat.HEX_LOWER));
- httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
+ httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory(false));
resolver = new FunctionDrivenDynamicHTTPMetadataResolver(httpClientBuilder.buildClient());
resolver.setId("myDynamicResolver");
@@ -315,7 +315,7 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
true,
new StringDigester("SHA-1", OutputFormat.HEX_LOWER));
- httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
+ httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory(false));
resolver = new FunctionDrivenDynamicHTTPMetadataResolver(httpClientBuilder.buildClient());
resolver.setId("myDynamicResolver");
@@ -531,10 +531,16 @@ public class FunctionDrivenDynamicHTTPMetadataResolverTest extends XMLObjectBase
// Helpers
private LayeredConnectionSocketFactory buildTrustEngineSocketFactory() {
- return new SecurityEnhancedTLSSocketFactory(
+ return buildTrustEngineSocketFactory(true);
+ }
+
+ private LayeredConnectionSocketFactory buildTrustEngineSocketFactory(boolean trustEngineRequired) {
+ SecurityEnhancedTLSSocketFactory factory = new SecurityEnhancedTLSSocketFactory(
HttpClientSupport.buildNoTrustTLSSocketFactory(),
SSLConnectionSocketFactory.STRICT_HOSTNAME_VERIFIER
);
+ factory.setTrustEngineRequired(trustEngineRequired);
+ return factory;
}
private TrustEngine<? super X509Credential> buildExplicitKeyTrustEngine(String cert) throws URISyntaxException, CertificateException {
diff --git a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
index b318153..2e0ab96 100644
--- a/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
+++ b/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
@@ -138,7 +138,7 @@ public class HTTPMetadataResolverTest extends XMLObjectBaseTestCase {
@Test
public void testTrustEngineSocketFactoryNoHTTPSNoTrustEngine() throws Exception {
// Make sure resolver works when TrustEngine socket factory is configured but just using an HTTP URL.
- httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
+ httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory(false));
metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL);
metadataProvider.setParserPool(parserPool);
@@ -168,7 +168,7 @@ public class HTTPMetadataResolverTest extends XMLObjectBaseTestCase {
@Test
public void testHTTPSNoTrustEngine() throws Exception {
- httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory());
+ httpClientBuilder.setTLSSocketFactory(buildTrustEngineSocketFactory(false));
metadataProvider = new HTTPMetadataResolver(httpClientBuilder.buildClient(), metadataURL);
metadataProvider.setParserPool(parserPool);
@@ -290,10 +290,16 @@ public class HTTPMetadataResolverTest extends XMLObjectBaseTestCase {
// Helpers
private LayeredConnectionSocketFactory buildTrustEngineSocketFactory() {
- return new SecurityEnhancedTLSSocketFactory(
+ return buildTrustEngineSocketFactory(true);
+ }
+
+ private LayeredConnectionSocketFactory buildTrustEngineSocketFactory(boolean trustEngineRequired) {
+ SecurityEnhancedTLSSocketFactory factory = new SecurityEnhancedTLSSocketFactory(
HttpClientSupport.buildNoTrustTLSSocketFactory(),
SSLConnectionSocketFactory.STRICT_HOSTNAME_VERIFIER
);
+ factory.setTrustEngineRequired(trustEngineRequired);
+ return factory;
}
private TrustEngine<? super X509Credential> buildExplicitKeyTrustEngine(String cert) throws URISyntaxException, CertificateException {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list