[java-identity-provider COMMIT] in /trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingp...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jan 30 08:16:23 2017
New Revision: 8607

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8607&view=rev
Log:
IDP-688 warn if we meet deprecated tlsTrustEngineRef or basicCredentials

https://issues.shibboleth.net/jira/browse/IDP-688

A complex change simce the conditions become complex and so
 - refactor (some) common code into a new module
 - never set the TLS trust engine directly - always indirect through the client Parameters
 - Get rid of the BeanOrString thing in favor of having two parameters
 
 And warn on basicCredentials= and tlsTrustEngineRef but not n the embedded <TlsTrustEngine> thing.

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProvidersParserSupport.java   (with props)
Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/TLSSocketFactoryFactoryBean.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/TLSSocketFactoryFactoryBean.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/TLSSocketFactoryFactoryBean.java?rev=8607&r1=8606&r2=8607&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/TLSSocketFactoryFactoryBean.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/TLSSocketFactoryFactoryBean.java	Mon Jan 30 08:16:23 2017
@@ -19,6 +19,8 @@
 
 import javax.annotation.Nullable;
 
+import net.shibboleth.utilities.java.support.httpclient.HttpClientSupport;
+
 import org.apache.http.client.HttpClient;
 import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
 import org.opensaml.security.httpclient.HttpClientSecurityParameters;
@@ -26,8 +28,6 @@
 import org.opensaml.security.trust.TrustEngine;
 import org.opensaml.security.x509.X509Credential;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
-
-import net.shibboleth.utilities.java.support.httpclient.HttpClientSupport;
 
 /**
  * A factory bean for producing instances of {@link LayeredConnectionSocketFactory} for use in {@link HttpClient}.
@@ -45,10 +45,10 @@
     
     /**
      * Sets the optional trust engine used in evaluating server TLS credentials.
-     * 
+     * @deprecated use setHttpClientSecurityParameters instead
      * @param engine the trust engine instance to use, or null
      */
-    public void setTLSTrustEngine(@Nullable final TrustEngine<? super X509Credential> engine) {
+    @Deprecated public void setTLSTrustEngine(@Nullable final TrustEngine<? super X509Credential> engine) {
         tlsTrustEngine = engine;
     }
     
@@ -71,12 +71,12 @@
     }
 
     /** {@inheritDoc} */
-    public Class getObjectType() {
+    @Override public Class getObjectType() {
         return LayeredConnectionSocketFactory.class;
     }
 
     /** {@inheritDoc} */
-    protected Object createInstance() throws Exception {
+    @Override protected Object createInstance() throws Exception {
         final boolean haveTrustEngine = tlsTrustEngine != null 
                 || (httpClientSecurityParameters != null && httpClientSecurityParameters.getTLSTrustEngine() != null);
         final boolean haveClientTLSCred = 

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java?rev=8607&r1=8606&r2=8607&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java	Mon Jan 30 08:16:23 2017
@@ -19,19 +19,15 @@
 
 import java.util.List;
 
-import javax.xml.namespace.QName;
-
-import net.shibboleth.ext.spring.util.SpringSupport;
-import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
+import javax.annotation.Nullable;
+
 import net.shibboleth.idp.profile.spring.relyingparty.metadata.FileCachingHttpClientFactoryBean;
 import net.shibboleth.idp.profile.spring.relyingparty.metadata.HttpClientFactoryBean;

[... 447 lines stripped ...]