[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system: conf/utilities.xml flows/saml/saml2/com...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Oct 23 18:59:33 2015
New Revision: 7866

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7866&view=rev
Log:
IDP-671: Create Action(s) and supporting code to issue SAML 2 Assertions decorated for delegation

Add lookup function for self-encryption IdP-specific EncryptionConfiguration.
Add relevant Spring wiring.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/common-beans.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/utilities.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/utilities.xml?rev=7866&r1=7865&r2=7866&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/utilities.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/utilities.xml	Fri Oct 23 18:59:33 2015
@@ -149,6 +149,11 @@
     <bean id="shibboleth.ClientTLSValidationConfigurationLookup"
         class="net.shibboleth.idp.profile.config.navigate.ClientTLSValidationConfigurationLookupFunction"
         p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
+    <bean id="shibboleth.SelfEncryptionConfigurationLookup"
+        class="net.shibboleth.idp.profile.config.navigate.SelfEncryptionConfigurationLookupFunction"
+        p:selfConfiguration="#{getObject('shibboleth.SelfEncryptionConfiguration')}"
+        p:includeProfileDefaultConfiguration="%{idp.encryption.self.includeProfileDefaultConfiguration:false}"
+        p:relyingPartyConfigurationResolver-ref="shibboleth.RelyingPartyConfigurationResolver" />
 
     <util:list id="shibboleth.SAML1Status.VersionMismatch">
         <util:constant static-field="org.opensaml.saml.saml1.core.StatusCode.VERSION_MISMATCH" />

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/common-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/common-beans.xml?rev=7866&r1=7865&r2=7866&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/common-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/common-beans.xml	Fri Oct 23 18:59:33 2015
@@ -119,6 +119,7 @@
         <constructor-arg>
             <bean class="org.opensaml.xmlsec.impl.BasicEncryptionParametersResolver" />
         </constructor-arg>
+        <constructor-arg ref="shibboleth.SelfEncryptionConfigurationLookup" />
     </bean>
 
     <bean id="EncryptNameIDs"