[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 18:02:18 2014
New Revision: 5931

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5931&view=rev
Log:
IDP-189 - action to encrypt NameIDs

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-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=5931&r1=5930&r2=5931&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 18:02:18 2014
@@ -28,6 +28,7 @@
         <evaluate expression="AddNotOnOrAfterConditionToAssertions" />
         <evaluate expression="AddAudienceRestrictionToAssertions" />
         
+        <evaluate expression="EncryptNameIDs" />
         <evaluate expression="EncryptAttributes" />
         <evaluate expression="SignAssertions" />
         <evaluate expression="EncryptAssertions" />

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=5931&r1=5930&r2=5931&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 18:02:18 2014
@@ -76,6 +76,16 @@
         </property>
     </bean>
 
+    <bean id="EncryptNameIDs"
+            class="org.opensaml.saml.saml2.profile.impl.EncryptNameIDs" 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="EncryptAttributes"
             class="org.opensaml.saml.saml2.profile.impl.EncryptAttributes" scope="prototype"
             p:recipientLookupStrategy-ref="shibboleth.RelyingPartyIdLookup.Simple">

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=5931&r1=5930&r2=5931&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml Thu May 15 18:02:18 2014
@@ -44,6 +44,7 @@
         <!-- Needs access to unencrypted NameID and Assertion. -->
         <evaluate expression="UpdateSessionWithSPSession" />
 
+        <evaluate expression="EncryptNameIDs" />
         <evaluate expression="EncryptAttributes" />
         <evaluate expression="SignAssertions" />
         <evaluate expression="EncryptAssertions" />