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

[noreply at shibboleth.net]

Author: scantor
Date: Thu May 15 23:17:52 2014
New Revision: 5938

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5938&view=rev
Log:
IDP-137 - Action to add ProxyRestriction

Modified:
    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/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=5938&r1=5937&r2=5938&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 23:17:52 2014
@@ -58,6 +58,16 @@
         p:httpServletRequest-ref="shibboleth.HttpServletRequest"
         p:method="urn:oasis:names:tc:SAML:2.0:cm:bearer" />
 
+    <bean id="AddProxyRestrictionToAssertions"
+            class="org.opensaml.saml.saml2.profile.impl.AddProxyRestrictionToAssertions" scope="prototype">
+        <property name="proxyAudiencesLookupStrategy">
+            <bean class="net.shibboleth.idp.saml.profile.config.navigate.ProxyAudienceRestrictionsLookupFunction" />
+        </property>
+        <property name="proxyCountLookupStrategy">
+            <bean class="net.shibboleth.idp.saml.profile.config.navigate.ProxyCountLookupFunction" />
+        </property>
+    </bean>
+
     <bean id="UpdateSessionWithSPSession"
             class="net.shibboleth.idp.session.impl.UpdateSessionWithSPSession" scope="prototype"
             p:enabled="${idp.session.enabled}"

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=5938&r1=5937&r2=5938&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 23:17:52 2014
@@ -40,6 +40,7 @@
         <evaluate expression="AddNotBeforeConditionToAssertions" />
         <evaluate expression="AddNotOnOrAfterConditionToAssertions" />
         <evaluate expression="AddAudienceRestrictionToAssertions" />
+        <evaluate expression="AddProxyRestrictionToAssertions" />
 
         <!-- Needs access to unencrypted NameID and Assertion. -->
         <evaluate expression="UpdateSessionWithSPSession" />