[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system/flows/saml/saml2: attribute-query-flow.x...

[noreply at shibboleth.net]

Author: scantor
Date: Thu May 15 14:54:16 2014
New Revision: 5930

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5930&view=rev
Log:
IDP-188 - action to encrypt attributes

Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/common-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-flow.xml?rev=5930&r1=5929&r2=5930&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-flow.xml Thu May 15 14:54:16 2014
@@ -27,7 +27,11 @@
         <evaluate expression="AddNotBeforeConditionToAssertions" />
         <evaluate expression="AddNotOnOrAfterConditionToAssertions" />
         <evaluate expression="AddAudienceRestrictionToAssertions" />
+        
+        <evaluate expression="EncryptAttributes" />
         <evaluate expression="SignAssertions" />
+        <evaluate expression="EncryptAssertions" />
+        
         <evaluate expression="'proceed'" />
         
         <transition on="proceed" to="ReturnToParentFlow" />

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=5930&r1=5929&r2=5930&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 Thu May 15 14:54:16 2014
@@ -76,4 +76,24 @@
         </property>
     </bean>
 
+    <bean id="EncryptAttributes"
+            class="org.opensaml.saml.saml2.profile.impl.EncryptAttributes" scope="prototype"
+            p:recipientLookupStrategy-ref="shibboleth.RelyingPartyIdLookup.Simple">
+        <property name="encryptionContextLookupStrategy">
+            <bean class="com.google.common.base.Functions" factory-method="compose"
+                c:g-ref="shibboleth.ChildLookup.EncryptionParameters"
+                c:f-ref="shibboleth.ChildLookup.RelyingParty" />
+        </property>
+    </bean>
+    
+    <bean id="EncryptAssertions"
+            class="org.opensaml.saml.saml2.profile.impl.EncryptAssertions" scope="prototype"
+            p:recipientLookupStrategy-ref="shibboleth.RelyingPartyIdLookup.Simple">
+        <property name="encryptionContextLookupStrategy">
+            <bean class="com.google.common.base.Functions" factory-method="compose"
+                c:g-ref="shibboleth.ChildLookup.EncryptionParameters"
+                c:f-ref="shibboleth.ChildLookup.RelyingParty" />
+        </property>
+    </bean>
+
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml?rev=5930&r1=5929&r2=5930&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml Thu May 15 14:54:16 2014
@@ -67,16 +67,6 @@
                 c:lifetime="${idp.session.defaultSPlifetime}"/>
         </property>
     </bean>
-    
-    <bean id="EncryptAssertions"
-            class="org.opensaml.saml.saml2.profile.impl.EncryptAssertions" scope="prototype"
-            p:recipientLookupStrategy-ref="shibboleth.RelyingPartyIdLookup.Simple">
-        <property name="encryptionContextLookupStrategy">
-            <bean class="com.google.common.base.Functions" factory-method="compose"
-                c:g-ref="shibboleth.ChildLookup.EncryptionParameters"
-                c:f-ref="shibboleth.ChildLookup.RelyingParty" />
-        </property>
-    </bean>
 
     <bean id="outboundMessageHandlerChain"
             class="org.opensaml.messaging.handler.impl.BasicMessageHandlerChain" scope="prototype">

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml?rev=5930&r1=5929&r2=5930&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml (original)

[... 10 lines stripped ...]