[java-opensaml COMMIT] in /trunk: opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractD...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Nov  4 17:03:24 2015
New Revision: 4380

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4380&view=rev
Log:
Refactoring of security-enhanced HttpClient TLS trust engine support.

Deprecate existing TrustEngine TLS socket factory in favor a unified implementation
which supports both (existing) TrustEngine eval and (new) client TLS via thread-local
KeyManager.
Remove the monolithic client TLS one, since never released.
Update all code and wiring to use the new SecurityEnhancedTLSSocketFactory.

Added:
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactory.java   (with props)
    trunk/opensaml-security-impl/src/test/java/org/opensaml/security/httpclient/impl/SecurityEnhancedTLSSocketFactoryTest.java   (with props)
Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FunctionDrivenDynamicHTTPMetadataResolverTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolverTest.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/ThreadLocalClientTLSSocketFactory.java
    trunk/opensaml-security-impl/src/main/java/org/opensaml/security/httpclient/impl/TrustEngineTLSSocketFactory.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java?rev=4380&r1=4379&r2=4380&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java	(original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicHTTPMetadataResolver.java	Wed Nov  4 17:03:24 2015
@@ -123,8 +123,9 @@
      * Sets the optional trust engine used in evaluating server TLS credentials.
      * 
      * <p>
-     * Must be used in conjunction with an HttpClient instance which is configured with a 
-     * {@link org.opensaml.security.httpclient.impl.TrustEngineTLSSocketFactory}. If this socket
+     * Must be used in conjunction with an HttpClient instance which is configured with either a 
+     * {@link org.opensaml.security.httpclient.impl.SecurityEnhancedTLSSocketFactory} or the (deprecated)
+     * {@link org.opensaml.security.httpclient.impl.TrustEngineTLSSocketFactory}. If such a socket
      * factory is not configured, then this will result in no TLS trust evaluation being performed
      * and a {@link ResolverException} will ultimately be thrown.
      * </p>

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java?rev=4380&r1=4379&r2=4380&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java	(original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/HTTPMetadataResolver.java	Wed Nov  4 17:03:24 2015
@@ -133,8 +133,9 @@
      * Sets the optional trust engine used in evaluating server TLS credentials.
      * 
      * <p>
-     * Must be used in conjunction with an HttpClient instance which is configured with a 
-     * {@link org.opensaml.security.httpclient.impl.TrustEngineTLSSocketFactory}. If this socket
+     * Must be used in conjunction with an HttpClient instance which is configured with either a 
+     * {@link org.opensaml.security.httpclient.impl.SecurityEnhancedTLSSocketFactory} or the (deprecated)
+     * {@link org.opensaml.security.httpclient.impl.TrustEngineTLSSocketFactory}. If such a socket
      * factory is not configured, then this will result in no TLS trust evaluation being performed
      * and a {@link ResolverException} will ultimately be thrown.
      * </p>

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/FileBackedHTTPMetadataResolverTest.java?rev=4380&r1=4379&r2=4380&view=diff
==============================================================================

[... 86 lines stripped ...]