[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/global.xml idp-profile-spring/src/main/ja...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Dec 10 16:53:24 2014
New Revision: 7065

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7065&view=rev
Log:
In the signature validation parser, default in a well-known bean name for the static criteria if not supplied.
Add placeholder bean to confg/global.xml, unless/until decide on a more appropriate home.

Modified:
    trunk/idp-conf/src/main/resources/conf/global.xml
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParser.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/global.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global.xml?rev=7065&r1=7064&r2=7065&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global.xml Wed Dec 10 16:53:24 2014
@@ -14,4 +14,18 @@
 
     <!-- Use this file to define any custom beans needed globally. -->
     
+    <bean id="shibboleth.MetadataSignatureValidationStaticCriteria" 
+            class="net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.SignatureValidationCriteriaSetFactoryBean" 
+            p:includeOpenSAMLGlobalConfig="true">
+        <property name="signatureValidationConfigurations">
+            <util:list>
+                <!-- Algorithm URI's may be supplied below as a space-separated list -->
+                <bean class="org.opensaml.xmlsec.impl.BasicSignatureValidationConfiguration" 
+                    p:whitelistedAlgorithms=""
+                    p:blacklistedAlgorithms="" >
+                </bean>
+            </util:list>
+        </property>
+    </bean>
+    
 </beans>

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/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/SignatureValidationParser.java?rev=7065&r1=7064&r2=7065&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/SignatureValidationParser.java Wed Dec 10 16:53:24 2014
@@ -104,6 +104,9 @@
         
         if (element.hasAttributeNS(null, "defaultCriteriaRef")) {
             builder.addPropertyReference("defaultCriteria", element.getAttributeNS(null, "defaultCriteriaRef"));
+        } else {
+            //TODO refactor, if decide upon new strategy for (or against) well-known bean refs
+            builder.addPropertyReference("defaultCriteria", "shibboleth.MetadataSignatureValidationStaticCriteria");
         }
         
         if (element.hasAttributeNS(null, "signaturePrevalidatorRef")) {

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml?rev=7065&r1=7064&r2=7065&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml (original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/beans.xml Wed Dec 10 16:53:24 2014
@@ -123,6 +123,19 @@
             </list>
         </constructor-arg>
     </bean>
+           
+    <bean id="shibboleth.MetadataSignatureValidationStaticCriteria" 
+            class="net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.SignatureValidationCriteriaSetFactoryBean" 
+            p:includeOpenSAMLGlobalConfig="true">
+        <property name="signatureValidationConfigurations">
+            <util:list>
+                <bean class="org.opensaml.xmlsec.impl.BasicSignatureValidationConfiguration" 
+                    p:whitelistedAlgorithms=""
+                    p:blacklistedAlgorithms="foo bar baz">
+                </bean>
+            </util:list>
+        </property>
+    </bean>
 
 </beans>
                             

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml?rev=7065&r1=7064&r2=7065&view=diff

[... 23 lines stripped ...]