[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/global.xml conf/security.xml system/conf/...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Dec 14 22:50:20 2014
New Revision: 7095

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7095&view=rev
Log:
Collapse material from security bean files back into global files.

Modified:
    trunk/idp-conf/src/main/resources/conf/global.xml
    trunk/idp-conf/src/main/resources/conf/security.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/security-system.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=7095&r1=7094&r2=7095&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global.xml Sun Dec 14 22:50:20 2014
@@ -14,4 +14,24 @@
 
     <!-- Use this file to define any custom beans needed globally. -->
 
+    <!--
+    Algorithm whitelists and blacklists that override or merge with library defaults. Normally you can leave
+    these empty or commented and use the system defaults, but you can override those defaults using these lists.
+    Each <value> element is an algorithm URI, or you can use <util:constant> elements in place of literal values.
+    -->
+    
+    <!--
+    <util:list id="shibboleth.SignatureWhitelist">
+    </util:list>
+
+    <util:list id="shibboleth.SignatureBlacklist">
+    </util:list>
+
+    <util:list id="shibboleth.EncryptionWhitelist">
+    </util:list>
+
+    <util:list id="shibboleth.EncryptionBlacklist">
+    </util:list>
+    -->
+
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=7095&r1=7094&r2=7095&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Sun Dec 14 22:50:20 2014
@@ -39,8 +39,6 @@
 
     <import resource="../../conf/global.xml" />
     <import resource="../../conf/errors.xml" />
-    <import resource="security-system.xml" />
-    <import resource="../../conf/security.xml" />
     <import resource="general-authn-system.xml" />
     <import resource="session-manager-system.xml" />
     <import resource="services-system.xml" />
@@ -182,6 +180,31 @@
     <bean id="shibboleth.DefaultIdentifierGenerationStrategy"
         class="net.shibboleth.utilities.java.support.security.SecureRandomIdentifierGenerationStrategy" />
 
+    <!-- Parent beans for Signature/Encryption/TLS Configuration objects. -->
+        
+    <bean id="shibboleth.BasicSignatureValidationConfiguration" abstract="true"
+        class="org.opensaml.xmlsec.impl.BasicSignatureValidationConfiguration"
+        p:whitelistedAlgorithms="#{getObject('shibboleth.SignatureWhitelist')}"
+        p:blacklistedAlgorithms="#{getObject('shibboleth.SignatureBlacklist')}" />
+    
+    <bean id="shibboleth.BasicClientTLSValidationConfiguration" abstract="true"
+        class="org.opensaml.security.x509.tls.impl.BasicClientTLSValidationConfiguration" />
+    
+    <bean id="shibboleth.BasicSignatureSigningConfiguration" abstract="true"
+        class="org.opensaml.xmlsec.impl.BasicSignatureSigningConfiguration"
+        p:whitelistedAlgorithms="#{getObject('shibboleth.SignatureWhitelist')}"
+        p:blacklistedAlgorithms="#{getObject('shibboleth.SignatureBlacklist')}" />
+    
+    <bean id="shibboleth.BasicEncryptionConfiguration" abstract="true"
+        class="org.opensaml.xmlsec.impl.BasicEncryptionConfiguration"
+        p:whitelistedAlgorithms="#{getObject('shibboleth.EncryptionWhitelist')}"
+        p:blacklistedAlgorithms="#{getObject('shibboleth.EncryptionBlacklist')}" />
+
+    <bean id="shibboleth.BasicDecryptionConfiguration" abstract="true"
+        class="org.opensaml.xmlsec.impl.BasicDecryptionConfiguration"
+        p:whitelistedAlgorithms="#{getObject('shibboleth.EncryptionWhitelist')}"
+        p:blacklistedAlgorithms="#{getObject('shibboleth.EncryptionBlacklist')}" />
+
     <!-- Beans that implement the mashing of security configurations into final parameter sets. -->
     
     <bean id="shibboleth.SignatureValidationParametersResolver"