[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/profile-defaults.xml idp-conf/src/main/re...

[noreply at shibboleth.net]

Author: scantor
Date: Sun May 11 20:20:02 2014
New Revision: 5906

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5906&view=rev
Log:
Populate security configuration and remove auto-wired credential.

Modified:
    trunk/idp-conf/src/main/resources/conf/profile-defaults.xml
    trunk/idp-conf/src/main/resources/conf/relying-party-native.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/InitializeOutboundMessageContext.java

Modified: trunk/idp-conf/src/main/resources/conf/profile-defaults.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/profile-defaults.xml?rev=5906&r1=5905&r2=5906&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/profile-defaults.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/profile-defaults.xml Sun May 11 20:20:02 2014
@@ -69,8 +69,43 @@
         
 	<!-- And the global default security configuration. -->
 
-	<bean id="shibboleth.DefaultSecurityConfiguration" class="net.shibboleth.idp.profile.config.SecurityConfiguration" />
+	<bean id="shibboleth.DefaultSecurityConfiguration" class="net.shibboleth.idp.profile.config.SecurityConfiguration">
+        <property name="signatureSigningConfiguration">
+            <bean class="org.opensaml.xmlsec.impl.BasicSignatureSigningConfiguration">
+                <property name="signatureAlgorithms">
+                    <util:list>
+                        <util:constant static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256" />
+                        <util:constant static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_SIGNATURE_ECDSA_SHA256" />
+                    </util:list>
+                </property>
+                <property name="signatureReferenceDigestMethods">
+                    <util:list>
+                        <util:constant static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_DIGEST_SHA256" />
+                    </util:list>
+                </property>
+                <property name="signatureCanonicalizationAlgorithm">
+                    <util:constant static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS" />
+                </property>
+            </bean>
+        </property>
+        <property name="encryptionConfiguration">
+            <bean class="org.opensaml.xmlsec.impl.BasicEncryptionConfiguration">
+                <property name="dataEncryptionAlgorithms">
+                    <util:list>
+                        <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128_GCM" />
+                        <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128" />
+                    </util:list>
+                </property>
+                <property name="keyTransportEncryptionAlgorithms">
+                    <util:list>
+                        <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP11" />
+                        <util:constant static-field="org.opensaml.xmlsec.encryption.support.EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP" />
+                    </util:list>
+                </property>
+            </bean>
+        </property>
+    </bean>
     
-    <util:map id="shibboleth.DefaultSecurityConfigurationMap"/>
+    <util:map id="shibboleth.DefaultSecurityConfigurationMap" />
     
 </beans>

Modified: trunk/idp-conf/src/main/resources/conf/relying-party-native.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/relying-party-native.xml?rev=5906&r1=5905&r2=5906&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/relying-party-native.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/relying-party-native.xml Sun May 11 20:20:02 2014
@@ -52,16 +52,39 @@
     <bean id="DefaultSecurityConfiguration" class="net.shibboleth.idp.profile.config.SecurityConfiguration">
         <property name="signatureSigningConfiguration">
             <bean class="org.opensaml.xmlsec.impl.BasicSignatureSigningConfiguration"
-                p:signingCredentials-ref="signingCredential" />
-        </property>
-        <!--
-        <property name="signatureValidationConfiguration">
+                    p:signingCredentials-ref="signingCredential">
+                <property name="signatureAlgorithms">
+                    <util:list>
+                        <util:constant static-field="org.opensaml.xmlsec.signature.support.SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256" />

[... 165 lines stripped ...]