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

[noreply at shibboleth.net]

Author: putmanb
Date: Tue Oct 13 20:20:26 2015
New Revision: 7817

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7817&view=rev
Log:
IDP-672: Create Action(s) and supporting code to issue SAML 2 Assertions decorated for delegation

Refactor current single action which decorates assertion to use a DelegationContext which is populated
by a second earlier action.  This will is necessary to allow us to create a predicate which is based on
whether delegated token issuance is actually active or not. 

Added:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/DelegationContext.java   (with props)
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/DelegationRequest.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContext.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateDelegationContextTest.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertion.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertionTest.java

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml?rev=7817&r1=7816&r2=7817&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml	Tue Oct 13 20:20:26 2015
@@ -122,6 +122,11 @@
         p:endpointType="#{getObject('shibboleth.EndpointType')}"
         p:bindings-ref="shibboleth.OutgoingBindings"
         p:artifactImpliesSecureChannel="%{idp.artifact.secureChannel:true}" />
+        
+    <bean id="PopulateDelegationContext"
+            class="net.shibboleth.idp.saml.saml2.profile.delegation.impl.PopulateDelegationContext" scope="prototype">
+        <property name="credentialResolver" ref="shibboleth.MetadataCredentialResolver" />
+    </bean>
 
     <bean id="PopulateResponseSignatureSigningParameters"
             class="org.opensaml.saml.common.profile.impl.PopulateSignatureSigningParameters" scope="prototype"

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml?rev=7817&r1=7816&r2=7817&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml	Tue Oct 13 20:20:26 2015
@@ -48,6 +48,7 @@
         <evaluate expression="InitializeOutboundMessageContext" />
         <evaluate expression="InitializeMessageChannelSecurityContext" />
         <evaluate expression="PopulateBindingAndEndpointContexts" />
+        <evaluate expression="PopulateDelegationContext" />
         <evaluate expression="PopulateResponseSignatureSigningParameters" />
         <evaluate expression="PopulateAssertionSignatureSigningParameters" />
         <evaluate expression="PopulateEncryptionParameters" />

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=7817&r1=7816&r2=7817&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	Tue Oct 13 20:20:26 2015
@@ -104,7 +104,6 @@
         <property name="keyInfoGeneratorManager">
             <bean factory-method="buildBasicKeyInfoGeneratorManager" class="org.opensaml.xmlsec.config.DefaultSecurityConfigurationBootstrap" />
         </property>
-        <property name="credentialResolver" ref="shibboleth.MetadataCredentialResolver" />
     </bean>
 
     <bean id="AddChannelBindingsToAssertions"

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertion.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertion.java?rev=7817&r1=7816&r2=7817&view=diff

[... 1052 lines stripped ...]