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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Dec 11 23:43:20 2014
New Revision: 7074

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7074&view=rev
Log:
Move some security-related beans out of global-system

Modified:
    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/security.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/security.xml?rev=7074&r1=7073&r2=7074&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/security.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/security.xml Thu Dec 11 23:43:20 2014
@@ -11,11 +11,6 @@
                            
        default-init-method="initialize"
        default-destroy-method="destroy">
-
-    <!--
-    Settings related to security algorithms and configuration applied by default to both profiles
-    and metadata verification.
-    -->
 
     <!--
     Algorithm whitelists and blacklists that override or merge with library defaults. Normally you can

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=7074&r1=7073&r2=7074&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 Thu Dec 11 23:43:20 2014
@@ -185,29 +185,4 @@
     <bean id="shibboleth.DefaultIdentifierGenerationStrategy"
         class="net.shibboleth.utilities.java.support.security.SecureRandomIdentifierGenerationStrategy" />
     
-    <bean id="shibboleth.SignatureValidationParametersResolver"
-        class="org.opensaml.xmlsec.impl.BasicSignatureValidationParametersResolver" />
-    <bean id="shibboleth.SignatureSigningParametersResolver"
-        class="org.opensaml.saml.security.impl.SAMLMetadataSignatureSigningParametersResolver" />
-    <bean id="shibboleth.DecryptionParametersResolver"
-        class="org.opensaml.xmlsec.impl.BasicDecryptionParametersResolver" />
-    <bean id="shibboleth.EncryptionParametersResolver"
-        class="org.opensaml.saml.security.impl.SAMLMetadataEncryptionParametersResolver"
-        c:resolver-ref="shibboleth.MetadataCredentialResolver" />
-    <bean id="shibboleth.ClientTLSValidationParametersResolver"
-        class="org.opensaml.security.x509.tls.impl.BasicClientTLSValidationParametersResolver" />
-
-    <!--
-    The beans below are primarily used by trust engines in relying-party-system.xml, but also in the
-    resolver for encryption parameters above.
-    -->
-
-    <bean id="shibboleth.MetadataCredentialResolver" class="org.opensaml.saml.security.impl.MetadataCredentialResolver"
-         p:roleDescriptorResolver-ref="shibboleth.RoleDescriptorResolver"
-         p:keyInfoCredentialResolver-ref="shibboleth.KeyInfoCredentialResolver">
-    </bean>
-
-    <bean id="shibboleth.KeyInfoCredentialResolver" class="org.opensaml.xmlsec.config.DefaultSecurityConfigurationBootstrap"
-        factory-method="buildBasicInlineKeyInfoCredentialResolver" />
-
  </beans>

Modified: trunk/idp-conf/src/main/resources/system/conf/security-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/security-system.xml?rev=7074&r1=7073&r2=7074&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/security-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/security-system.xml Thu Dec 11 23:43:20 2014
@@ -41,4 +41,33 @@
         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"
+        class="org.opensaml.xmlsec.impl.BasicSignatureValidationParametersResolver" />
+    <bean id="shibboleth.SignatureSigningParametersResolver"
+        class="org.opensaml.saml.security.impl.SAMLMetadataSignatureSigningParametersResolver" />
+    <bean id="shibboleth.DecryptionParametersResolver"
+        class="org.opensaml.xmlsec.impl.BasicDecryptionParametersResolver" />
+    <bean id="shibboleth.EncryptionParametersResolver"
+        class="org.opensaml.saml.security.impl.SAMLMetadataEncryptionParametersResolver"
+        c:resolver-ref="shibboleth.MetadataCredentialResolver" />
+    <bean id="shibboleth.ClientTLSValidationParametersResolver"
+        class="org.opensaml.security.x509.tls.impl.BasicClientTLSValidationParametersResolver" />
+
+    <!--

[... 16 lines stripped ...]