[java-identity-provider] 01/06: IDP-1423 Remove deprecated attribute disregardSslCertificate

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=68fe78cf6f5ef924436d71a201a8f1d85f688260

commit 68fe78cf6f5ef924436d71a201a8f1d85f688260
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Mar 1 16:29:11 2019 +0000

    IDP-1423 Remove deprecated attribute disregardSslCertificate
    
    https://issues.shibboleth.net/jira/browse/IDP-1423
---
 .../impl/AbstractDynamicHTTPMetadataProviderParser.java      |  3 +--
 .../metadata/impl/HTTPMetadataProviderParser.java            |  3 +--
 .../metadata/impl/HTTPMetadataProvidersParserSupport.java    |  5 -----
 idp-schema/src/main/resources/schema/shibboleth-metadata.xsd | 12 +-----------
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java
index c6854b5..350e823 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractDynamicHTTPMetadataProviderParser.java
@@ -90,13 +90,12 @@ public abstract class AbstractDynamicHTTPMetadataProviderParser extends Abstract
                     || element.hasAttributeNS(null, "socketTimeout")
                     || element.hasAttributeNS(null, "maxConnectionsTotal")
                     || element.hasAttributeNS(null, "maxConnectionsPerRoute")
-                    || 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, connectionTimeout, "
                     + "connectionRequestTimeout, socketTimeout, maxConnectionsTotal, maxConnectionsPerRoute, "
-                    + "disregardSslCertificate, disregardTLSCertificate, proxyHost, proxyPort, "
+                    + "disregardTLSCertificate, proxyHost, proxyPort, "
                     + "proxyUser and proxyPassword");
             }
         } else {
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java
index c93d974..424b962 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProviderParser.java
@@ -90,12 +90,11 @@ public abstract class HTTPMetadataProviderParser extends AbstractReloadingMetada
                     || element.hasAttributeNS(null, "connectionTimeout")
                     || element.hasAttributeNS(null, "connectionRequestTimeout")
                     || element.hasAttributeNS(null, "socketTimeout")
-                    || 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, connectionTimeout, " 
-                    + "connectionRequestTimeout, socketTimeout, disregardSslCertificate, disregardTLSCertificate, "
+                    + "connectionRequestTimeout, socketTimeout, disregardTLSCertificate, "
                     + " proxyHost, proxyPort, proxyUser and proxyPassword");
             }
         } else {
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProvidersParserSupport.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProvidersParserSupport.java
index 488afa4..ae46971 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProvidersParserSupport.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/HTTPMetadataProvidersParserSupport.java
@@ -94,11 +94,6 @@ public final class HTTPMetadataProvidersParserSupport {
         if (element.hasAttributeNS(null, "disregardTLSCertificate")) {
             tlsSocketFactoryBuilder.addPropertyValue("connectionDisregardTLSCertificate",
                     StringSupport.trimOrNull(element.getAttributeNS(null, "disregardTLSCertificate")));
-        } else if (element.hasAttributeNS(null, "disregardSslCertificate")) {
-            DeprecationSupport.warn(ObjectType.ATTRIBUTE, "disregardSslCertificate",
-                    parserContext.getReaderContext().getResource().getDescription(), "disregardTLSCertificate");
-            tlsSocketFactoryBuilder.addPropertyValue("connectionDisregardTLSCertificate",
-                    StringSupport.trimOrNull(element.getAttributeNS(null, "disregardSslCertificate")));
         }
 
         if (httpClientSecurityParametersRef != null) {
diff --git a/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd b/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
index 5a07dcb..88c1cd0 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
@@ -167,11 +167,6 @@
                         <documentation>The URL from which to retrieve the metadata.</documentation>
                     </annotation>
                 </attribute>
-                <attribute name="disregardSslCertificate" type="string">
-                    <annotation>
-                        <documentation>This is deprecated, use disregardTLSCertificate instead.</documentation>
-                    </annotation>
-                </attribute>
                 <attribute name="disregardTLSCertificate" type="string">
                     <annotation>
                         <documentation>Server certificate will be ignored when using an HTTPS source.</documentation>
@@ -491,7 +486,7 @@
                             org.apache.http.client.HttpClient object.
                             
                             This attribute conflicts with and overrides the other HttpClient-related properties: 
-                            disregardSslCertificate, disregardTLSCertificate, requestTimeout, proxyHost, proxyPort, proxyUser, proxyPassword.
+                            disregardTLSCertificate, requestTimeout, proxyHost, proxyPort, proxyUser, proxyPassword.
                        </documentation>
                     </annotation>
                 </attribute>
@@ -511,11 +506,6 @@
                         </documentation>
                     </annotation>
                 </attribute>
-                <attribute name="disregardSslCertificate" type="string">
-                    <annotation>
-                        <documentation>This is deprecated, use disregardTLSCertificate instead.</documentation>
-                    </annotation>
-                </attribute>
                 <attribute name="disregardTLSCertificate" type="string">
                     <annotation>
                         <documentation>Server certificate will be ignored when using an HTTPS source.</documentation>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.