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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Sep 30 03:31:55 2014
New Revision: 6607

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6607&view=rev
Log:
IDP-475 Default the useragent to be Shibboleth/Idp<Version> OpenSAML/<Version>

Allow directly injected Clients to allow this to be overloaded if required

Added:
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntitiesClient.xml   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/httpClient.xml   (with props)
Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HttpClientFactoryBean.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParserTest.java
    trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParser.java?rev=6607&r1=6606&r2=6607&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParser.java Tue Sep 30 03:31:55 2014
@@ -21,6 +21,8 @@
 
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.opensaml.saml.metadata.resolver.impl.HTTPMetadataResolver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
@@ -43,6 +45,9 @@
     /** BASIC auth password. */
     private static final String BASIC_AUTH_PASSWORD = "basicAuthPassword";
 
+    /** Logger. */
+    private final Logger log = LoggerFactory.getLogger(HTTPMetadataProviderParser.class);
+
     /** {@inheritDoc} */
     @Override protected Class<? extends HTTPMetadataResolver> getNativeBeanClass(Element element) {
         return HTTPMetadataResolver.class;
@@ -53,7 +58,18 @@
             BeanDefinitionBuilder builder) {
         super.doNativeParse(element, parserContext, builder);
 
-        builder.addConstructorArgValue(buildHttpClient(element));
+        if (element.hasAttributeNS(null, "httpClientRef")) {
+            builder.addConstructorArgReference(element.getAttributeNS(null, "httpClientRef"));
+            if (element.hasAttributeNS(null, "requestTimeout")
+                    || element.hasAttributeNS(null, "disregardSslCertificate")
+                    || element.hasAttributeNS(null, "proxyHost") || element.hasAttributeNS(null, "proxyPort")
+                    || element.hasAttributeNS(null, "proxyUser") || element.hasAttributeNS(null, "proxyPassword")) {
+                log.warn("httpClientRef overrides settings for requestTimeout, "
+                        + "disregardSslCertificate, proxyHost, proxyPort, proxyUser and proxyPassword");
+            }
+        } else {
+            builder.addConstructorArgValue(buildHttpClient(element));
+        }
         builder.addConstructorArgValue(element.getAttributeNS(null, METADATA_URL));
 
         if (element.hasAttributeNS(null, BASIC_AUTH_USER) || element.hasAttributeNS(null, BASIC_AUTH_PASSWORD)) {

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HttpClientFactoryBean.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HttpClientFactoryBean.java?rev=6607&r1=6606&r2=6607&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HttpClientFactoryBean.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HttpClientFactoryBean.java Tue Sep 30 03:31:55 2014
@@ -17,6 +17,9 @@
 
 package net.shibboleth.idp.profile.spring.relyingparty.metadata;
 
+import javax.annotation.Nullable;
+
+import net.shibboleth.idp.Version;
 import net.shibboleth.utilities.java.support.annotation.Duration;
 import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
 
@@ -29,13 +32,24 @@
 public class HttpClientFactoryBean extends AbstractFactoryBean<HttpClient> {
 
     /** Our captive builder. */
-    private HttpClientBuilder builder = new HttpClientBuilder();
-

[... 85 lines stripped ...]