[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/conf: credentials.xml relying-party-native.xml

[noreply at shibboleth.net]

Author: scantor
Date: Wed May 28 19:29:54 2014
New Revision: 5989

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5989&view=rev
Log:
Add custom EncryptedKeyResolver to defaults.

Modified:
    trunk/idp-conf/src/main/resources/conf/credentials.xml
    trunk/idp-conf/src/main/resources/conf/relying-party-native.xml

Modified: trunk/idp-conf/src/main/resources/conf/credentials.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/credentials.xml?rev=5989&r1=5988&r2=5989&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/credentials.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/credentials.xml Wed May 28 19:29:54 2014
@@ -106,10 +106,9 @@
         </constructor-arg>
     </bean>
 
-    <!-- TODO: once Spring config is facilitated. -->
-    <!--
-    <bean id="defaultEncryptedKeyResolver" class="org.opensaml.xmlsec.encryption.support.ChainingEncryptedKeyResolver">
-        <constructor-arg>
+    <bean id="defaultEncryptedKeyResolver" class="org.opensaml.xmlsec.encryption.support.ChainingEncryptedKeyResolver"
+            c:recipients-ref="entityID">
+        <constructor-arg name="encKeyResolvers">
             <util:list>
                 <bean class="org.opensaml.xmlsec.encryption.support.InlineEncryptedKeyResolver" />
                 <bean class="org.opensaml.saml.saml2.encryption.EncryptedElementTypeEncryptedKeyResolver" />
@@ -118,6 +117,5 @@
             </util:list>
         </constructor-arg>
     </bean>
-    -->
     
 </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=5989&r1=5988&r2=5989&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 Wed May 28 19:29:54 2014
@@ -17,13 +17,15 @@
     <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 
+    <bean id="entityID" class="java.lang.String" c:_0="${idp.entity.id}" />
+
     <bean class="net.shibboleth.idp.relyingparty.impl.DefaultRelyingPartyConfigurationResolver"
         p:anonymousConfiguration-ref="AnonymousRelyingParty" p:defaultConfiguration-ref="DefaultRelyingParty"
         p:relyingPartyConfigurations-ref="RelyingPartyOverrides"
         p:defaultSecurityConfiguration-ref="DefaultSecurityConfiguration" />
 
     <bean id="RelyingParty" class="net.shibboleth.idp.relyingparty.RelyingPartyConfiguration" abstract="true"
-        p:responderId="${idp.entity.id}" p:detailedErrors="${idp.errors.detailed}" />
+        p:responderId-ref="entityID" p:detailedErrors="${idp.errors.detailed}" />
 
     <!-- Profile Configuration Defaults -->
     
@@ -100,8 +102,8 @@
         
         <property name="decryptionConfiguration">
             <bean class="org.opensaml.xmlsec.impl.BasicDecryptionConfiguration"
-                p:KEKKeyInfoCredentialResolver-ref="defaultKeyEncryptionCredentialResolver" />
-            <!-- TODO: add p:encryptedKeyResolver-ref="defaultEncryptedKeyResolver" -->
+                p:KEKKeyInfoCredentialResolver-ref="defaultKeyEncryptionCredentialResolver"
+                p:encryptedKeyResolver-ref="defaultEncryptedKeyResolver" />
         </property>
         
         <property name="encryptionConfiguration">