[java-identity-provider] 02/05: IDP-1423 Remove deprecated attribute requireSignedMetadata from SignatureValidation

[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=d96b03a28f4dcf74cbcaf9bbb9e0e6011580bf30

commit d96b03a28f4dcf74cbcaf9bbb9e0e6011580bf30
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Mar 3 15:18:26 2019 +0000

    IDP-1423 Remove deprecated attribute requireSignedMetadata from SignatureValidation
    
    https://issues.shibboleth.net/jira/browse/IDP-1423
---
 .../filter/impl/SignatureValidationParser.java       | 20 +++++++-------------
 .../main/resources/schema/shibboleth-metadata.xsd    |  8 --------
 2 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationParser.java
index fdc657c..dcd73b4 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationParser.java
@@ -23,15 +23,6 @@ import java.util.List;
 import javax.annotation.Nonnull;
 import javax.xml.namespace.QName;
 
-import net.shibboleth.ext.spring.util.SpringSupport;
-import net.shibboleth.idp.profile.spring.factory.BasicInlineCredentialFactoryBean;
-import net.shibboleth.idp.profile.spring.factory.BasicX509CredentialFactoryBean;
-import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-import net.shibboleth.utilities.java.support.xml.ElementSupport;
-
 import org.opensaml.saml.metadata.resolver.filter.impl.SignatureValidationFilter;
 import org.opensaml.security.credential.impl.StaticCredentialResolver;
 import org.opensaml.xmlsec.keyinfo.impl.BasicProviderKeyInfoCredentialResolver;
@@ -50,6 +41,13 @@ import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.w3c.dom.Element;
 
+import net.shibboleth.ext.spring.util.SpringSupport;
+import net.shibboleth.idp.profile.spring.factory.BasicInlineCredentialFactoryBean;
+import net.shibboleth.idp.profile.spring.factory.BasicX509CredentialFactoryBean;
+import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
+import net.shibboleth.utilities.java.support.xml.ElementSupport;
+
 /**
  * Parser for xsi:type="SignatureValidation".
  */
@@ -128,10 +126,6 @@ public class SignatureValidationParser extends AbstractSingleBeanDefinitionParse
 
         if (element.hasAttributeNS(null, "requireSignedRoot")) {
             builder.addPropertyValue("requireSignedRoot", element.getAttributeNS(null, "requireSignedRoot"));
-        } else if (element.hasAttributeNS(null, "requireSignedMetadata")) {
-            DeprecationSupport.warn(ObjectType.ATTRIBUTE, "requireSignedMetadata",
-                    parserContext.getReaderContext().getResource().getDescription(), "requireSignedRoot");
-            builder.addPropertyValue("requireSignedRoot", element.getAttributeNS(null, "requireSignedMetadata"));
         }
 
         if (element.hasAttributeNS(null, "defaultCriteriaRef")) {
diff --git a/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd b/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
index f30ee65..040c6c2 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
@@ -940,14 +940,6 @@
                         </documentation>
                     </annotation>
                 </attribute>
-                <attribute name="requireSignedMetadata" type="string">
-                    <annotation>
-                        <documentation>
-                            A boolean flag indicating whether a signature is required on the incoming metadata's root element.
-                            Deprecated: Use 'requireSignedRoot' instead.
-                        </documentation>
-                    </annotation>
-                </attribute>
                 <attribute name="certificateFile" type="string">
                     <annotation>
                         <documentation>

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