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

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Oct 21 19:41:04 2016
New Revision: 8523

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8523&view=rev
Log:
IDP-1071: Config schema and parser support for HttpClientSecurityParameters in HTTP metadata resolvers

Added:
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/dynamicClientSecurityParams.xml   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-client-security-params.xml   (with props)
Modified:
    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
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/DynamicHTTPMetadataProviderParserTest.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParserTest.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml

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=8523&r1=8522&r2=8523&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	Fri Oct 21 19:41:04 2016
@@ -88,6 +88,11 @@
                 builder.addPropertyValue("tLSTrustEngine", tlsTrustEngine);
                 haveTLSTrustEngine = true;
             }
+        }
+        
+        if (element.hasAttributeNS(null, "httpClientSecurityParametersRef")) {
+            builder.addPropertyReference("httpClientSecurityParameters",
+                    StringSupport.trimOrNull(element.getAttributeNS(null, "httpClientSecurityParametersRef")));
         }
 
         if (element.hasAttributeNS(null, "httpClientRef")) {

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/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/impl/HTTPMetadataProviderParser.java?rev=8523&r1=8522&r2=8523&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java	Fri Oct 21 19:41:04 2016
@@ -107,6 +107,11 @@
                 haveTLSTrustEngine = true;
             }
         }
+        
+        if (element.hasAttributeNS(null, "httpClientSecurityParametersRef")) {
+            builder.addPropertyReference("httpClientSecurityParameters",
+                    StringSupport.trimOrNull(element.getAttributeNS(null, "httpClientSecurityParametersRef")));
+        }
 
         if (element.hasAttributeNS(null, "httpClientRef")) {
             builder.addConstructorArgReference(StringSupport.trimOrNull(element.getAttributeNS(null, "httpClientRef")));
@@ -118,9 +123,9 @@
                     || element.hasAttributeNS(null, "disregardTLSCertificate")
                     || element.hasAttributeNS(null, "proxyHost") || element.hasAttributeNS(null, "proxyPort")
                     || element.hasAttributeNS(null, "proxyUser") || element.hasAttributeNS(null, "proxyPassword")) {
-                log.warn("httpClientRef overrides settings for requestTimeout, connectionTimeout, connectionRequestTimeout, " 
-                        + "socketTimeout, disregardSslCertificate, disregardTLSCertificate, proxyHost, proxyPort, "
-                        + "proxyUser and proxyPassword");
+                log.warn("httpClientRef overrides settings for requestTimeout, connectionTimeout, " 
+                    + "connectionRequestTimeout, socketTimeout, disregardSslCertificate, disregardTLSCertificate, "
+                    + " proxyHost, proxyPort, proxyUser and proxyPassword");
             }
         } else {
             builder.addConstructorArgValue(buildHttpClient(element, parserContext, haveTLSTrustEngine));


[... 55 lines stripped ...]