[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: Tue Dec 16 16:39:35 2014
New Revision: 7124

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7124&view=rev
Log:
Deprecate HTTP metadata provider schema disregardSslCertificate in favor of disregardTLSCertificate.

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicHTTPMetadataProviderParser.java
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParser.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntities.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPEntitiesClient.xml
    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/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/AbstractDynamicHTTPMetadataProviderParser.java?rev=7124&r1=7123&r2=7124&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicHTTPMetadataProviderParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicHTTPMetadataProviderParser.java Tue Dec 16 16:39:35 2014
@@ -60,10 +60,11 @@
             builder.addConstructorArgReference(element.getAttributeNS(null, "httpClientRef"));
             if (element.hasAttributeNS(null, "requestTimeout")
                     || element.hasAttributeNS(null, "disregardSslCertificate")
+                    || 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, "
-                        + "disregardSslCertificate, proxyHost, proxyPort, proxyUser and proxyPassword");
+                log.warn("httpClientRef overrides settings for requestTimeout, disregardSslCertificate, "
+                        + "disregardTLSCertificate, proxyHost, proxyPort, proxyUser and proxyPassword");
             }
         } else {
             builder.addConstructorArgValue(buildHttpClient(element, parserContext));
@@ -148,7 +149,11 @@
             clientBuilder.addPropertyValue("connectionTimeout", element.getAttributeNS(null, "requestTimeout"));
         }
 
-        if (element.hasAttributeNS(null, "disregardSslCertificate")) {
+        if (element.hasAttributeNS(null, "disregardTLSCertificate")) {
+            clientBuilder.addPropertyValue("connectionDisregardTLSCertificate",
+                    element.getAttributeNS(null, "disregardTLSCertificate"));
+        } else if (element.hasAttributeNS(null, "disregardSslCertificate")) {
+            log.warn("disregardSslCertificate is deprecated, please switch to disregardTLSCertificate");
             clientBuilder.addPropertyValue("connectionDisregardTLSCertificate",
                     element.getAttributeNS(null, "disregardSslCertificate"));
         }

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=7124&r1=7123&r2=7124&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 Dec 16 16:39:35 2014
@@ -83,10 +83,11 @@
             builder.addConstructorArgReference(element.getAttributeNS(null, "httpClientRef"));
             if (element.hasAttributeNS(null, "requestTimeout")
                     || element.hasAttributeNS(null, "disregardSslCertificate")
+                    || 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, "
-                        + "disregardSslCertificate, proxyHost, proxyPort, proxyUser and proxyPassword");

[... 90 lines stripped ...]