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

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Sep 25 16:27:42 2015
New Revision: 7781

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7781&view=rev
Log:
Deal with issuance of AuthnStatement in Liberty delegation profile.

Add new action which clones the inbound Assertion token's AuthnStatement to produce the statement for the new Assertion issued
under the Liberty profile only.
Make existing AddAuthnStatment- action conditional on non-Liberty profile, via activation condition. 

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddAuthnStatementToAssertionFromInboundAssertionToken.java   (with props)
Modified:
    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/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=7781&r1=7780&r2=7781&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 Sep 25 16:27:42 2015
@@ -45,6 +45,19 @@
                 <constructor-arg name="principal">
                     <bean class="net.shibboleth.idp.saml.authn.principal.AuthnContextClassRefPrincipal"
                         c:classRef="#{T(org.opensaml.saml.saml2.core.AuthnContext).UNSPECIFIED_AUTHN_CTX}" />
+                </constructor-arg>
+            </bean>
+        </property>
+        <property name="activationCondition">
+            <bean parent="shibboleth.Conditions.NOT">
+                <constructor-arg>
+                    <bean parent="shibboleth.Conditions.Expression">
+                        <constructor-arg>
+                            <value>
+                                #profileContext.getProfileId().equals('http://shibboleth.net/ns/profiles/liberty/ssos')
+                            </value>
+                        </constructor-arg>
+                    </bean>
                 </constructor-arg>
             </bean>
         </property>

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=7781&r1=7780&r2=7781&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	Fri Sep 25 16:27:42 2015
@@ -162,4 +162,23 @@
         class="net.shibboleth.idp.saml.profile.impl.InitializeOutboundMessageContextForError" scope="prototype"
         p:outboundBinding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" />
         
+    <bean id="AddAuthnStatementToAssertionFromInboundAssertionToken"
+        class="net.shibboleth.idp.saml.saml2.profile.delegation.impl.AddAuthnStatementToAssertionFromInboundAssertionToken"
+        scope="prototype"
+        p:httpServletRequest-ref="shibboleth.HttpServletRequest">
+        <property name="identifierGeneratorLookupStrategy">
+            <bean class="net.shibboleth.idp.profile.config.navigate.IdentifierGenerationStrategyLookupFunction"
+                p:defaultIdentifierGenerationStrategy-ref="shibboleth.DefaultIdentifierGenerationStrategy" />
+        </property>
+        <property name="activationCondition">
+            <bean parent="shibboleth.Conditions.Expression">
+                <constructor-arg>
+                    <value>
+                        #profileContext.getProfileId().equals('http://shibboleth.net/ns/profiles/liberty/ssos')
+                    </value>
+                </constructor-arg>
+            </bean>
+        </property>
+    </bean>
+        
 </beans>

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=7781&r1=7780&r2=7781&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	Fri Sep 25 16:27:42 2015
@@ -93,6 +93,8 @@
         <evaluate expression="AddInResponseToToResponse" />
 
         <evaluate expression="AddAuthnStatementToAssertion" />
+        <evaluate expression="AddAuthnStatementToAssertionFromInboundAssertionToken" />
+        
         <evaluate expression="AddAttributeStatementToAssertion" />
         <evaluate expression="AddNameIDToSubjects" />

[... 2 lines stripped ...]