[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/metadata-providers.xml idp-conf/src/test/...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Nov  6 19:03:35 2015
New Revision: 7966

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7966&view=rev
Log:
IDP-735: On SignatureValidationFilter parser change schema attrib 'requireSignedMetadata' to something more descriptive

Modified:
    trunk/idp-conf/src/main/resources/conf/metadata-providers.xml
    trunk/idp-conf/src/test/resources/conf/metadata-providers.xml
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationParser.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/signatureValidationRefs.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/signingCertCheck.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/signingNoCertCheck.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/signingNone.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party-group.xml
    trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd

Modified: trunk/idp-conf/src/main/resources/conf/metadata-providers.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/metadata-providers.xml?rev=7966&r1=7965&r2=7966&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/metadata-providers.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/metadata-providers.xml	Fri Nov  6 19:03:35 2015
@@ -43,7 +43,7 @@
                       backingFile="%{idp.home}/metadata/localCopyFromXYZHTTP.xml"
                       metadataURL="http://WHATEVER"> 
         
-        <MetadataFilter xsi:type="SignatureValidation" requireSignedMetadata="true">
+        <MetadataFilter xsi:type="SignatureValidation" requireSignedRoot="true">
             <PublicKey>
                 MIIBI.....
             </PublicKey>

Modified: trunk/idp-conf/src/test/resources/conf/metadata-providers.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/resources/conf/metadata-providers.xml?rev=7966&r1=7965&r2=7966&view=diff
==============================================================================
--- trunk/idp-conf/src/test/resources/conf/metadata-providers.xml	(original)
+++ trunk/idp-conf/src/test/resources/conf/metadata-providers.xml	Fri Nov  6 19:03:35 2015
@@ -20,7 +20,7 @@
 	<!-- Example metadata provider. -->
 
     <MetadataProvider id="URLMD" xsi:type="ResourceBackedMetadataProvider" maxRefreshDelay="PT5M">
-        <MetadataFilter xsi:type="SignatureValidation" requireSignedMetadata="false"> <!-- TODO -->
+        <MetadataFilter xsi:type="SignatureValidation" requireSignedRoot="false"> <!-- TODO -->
             <PublicKey>
                 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxg0TyQAP/tIvOH89EtaX
                 uRRn8SYzTj7W1TbNY4VvBmobjkRmSkki4hH9x4sQpi635wn6WtXTN/FNNmkTK3N/

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationParser.java?rev=7966&r1=7965&r2=7966&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationParser.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationParser.java	Fri Nov  6 19:03:35 2015
@@ -122,8 +122,13 @@
             buildTrustEngine(builder, buildPublicKeyCredential(parserContext, publicKeys));
         }
 
-        if (element.hasAttributeNS(null, "requireSignedMetadata")) {
-            builder.addPropertyValue("requireSignature", element.getAttributeNS(null, "requireSignedMetadata"));
+        if (element.hasAttributeNS(null, "requireSignedRoot")) {
+            builder.addPropertyValue("requireSignedRoot", element.getAttributeNS(null, "requireSignedRoot"));
+        } else if (element.hasAttributeNS(null, "requireSignedMetadata")) {
+            log.warn("{} Use of the attribute 'requireSignedMetadata' is deprecated, " 
+                    + "use 'requireSignedRoot' instead", 
+                    parserContext.getReaderContext().getResource().getDescription());
+            builder.addPropertyValue("requireSignedRoot", element.getAttributeNS(null, "requireSignedMetadata"));
         }
 
         if (element.hasAttributeNS(null, "defaultCriteriaRef")) {

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/signatureValidationRefs.xml

[... 100 lines stripped ...]