[java-identity-provider COMMIT] in /trunk/idp-saml-impl/src: main/java/net/shibboleth/idp/saml/saml2/profile/delegati...

[noreply at shibboleth.net]

Author: putmanb
Date: Tue Jun 16 22:39:15 2015
New Revision: 7568

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7568&view=rev
Log:
More work on initial Action to decorate a SAML 2 Assertion for delegation.  Now functional, with unit test.  Still a few TODOs and cleanup needed.

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/XMLObjectProviderInitializer.java   (with props)
    trunk/idp-saml-impl/src/main/resources/liberty-soap-binding-config.xml   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertionTest.java   (with props)
Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertion.java
    trunk/idp-saml-impl/src/main/resources/META-INF/services/org.opensaml.core.config.Initializer

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=7568&r1=7567&r2=7568&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertion.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DecorateDelegatedAssertion.java	Tue Jun 16 22:39:15 2015
@@ -17,11 +17,13 @@
 
 package net.shibboleth.idp.saml.saml2.profile.delegation.impl;
 
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import net.shibboleth.idp.profile.AbstractProfileAction;
 import net.shibboleth.idp.profile.context.RelyingPartyContext;
@@ -51,6 +53,7 @@
 import org.opensaml.profile.action.ActionSupport;
 import org.opensaml.profile.action.EventIds;
 import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.saml.common.messaging.context.AttributeConsumingServiceContext;
 import org.opensaml.saml.common.messaging.context.SAMLMetadataContext;
 import org.opensaml.saml.criterion.RoleDescriptorCriterion;
 import org.opensaml.saml.saml2.core.Assertion;
@@ -63,6 +66,7 @@
 import org.opensaml.saml.saml2.core.Conditions;
 import org.opensaml.saml.saml2.core.KeyInfoConfirmationDataType;
 import org.opensaml.saml.saml2.core.NameID;
+import org.opensaml.saml.saml2.core.Response;
 import org.opensaml.saml.saml2.core.Subject;
 import org.opensaml.saml.saml2.core.SubjectConfirmation;
 import org.opensaml.saml.saml2.core.SubjectConfirmationData;
@@ -80,6 +84,7 @@
 import org.opensaml.xmlsec.keyinfo.KeyInfoGenerator;
 import org.opensaml.xmlsec.keyinfo.KeyInfoGeneratorFactory;
 import org.opensaml.xmlsec.keyinfo.KeyInfoGeneratorManager;
+import org.opensaml.xmlsec.keyinfo.NamedKeyInfoGeneratorManager;
 import org.opensaml.xmlsec.signature.KeyInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -116,20 +121,20 @@
     /** Default delegation request value. */
     private DelegationRequest defaultDelegationRequested = DelegationRequest.REQUESTED_OPTIONAL;
     
+    /** The URL at which the IdP will accept Liberty ID-WSF SSOS requests. */
+    private String libertySSOSEndpointURL;
+    
     /** Strategy used to lookup the RelyingPartyContext. */
     @Nonnull private Function<ProfileRequestContext,RelyingPartyContext> relyingPartyContextLookupStrategy;
     
     /** Strategy used to lookup the SAMLMetadataContext. */
     @Nonnull private Function<ProfileRequestContext, SAMLMetadataContext> samlMetadataContextLookupStrategy;
     
-    /** Strategy used to lookup the AttributeConsumingService. */
-    @Nonnull private Function<ProfileRequestContext, AttributeConsumingService> attributeConsumingServiceLookupStrategy;
-    
     /** Strategy used to locate the {@link Assertion}s on which to operate. */
     @Nonnull private Function<ProfileRequestContext,List<Assertion>> assertionLookupStrategy;
     
-    /** The manager used to generated KeyInfo instances from Credentials. */
-    @Nonnull private KeyInfoGeneratorManager keyInfoGeneratorManager;
+    /** The manager used to generate KeyInfo instances from Credentials. */
+    @Nonnull private NamedKeyInfoGeneratorManager keyInfoGeneratorManager;
     
     /** The credential resolver used to resolve HoK Credentials for the peer. */
     @Nonnull private CredentialResolver credentialResolver;
@@ -167,15 +172,20 @@
         
         relyingPartyContextLookupStrategy = new ChildContextLookup<>(RelyingPartyContext.class);
         samlMetadataContextLookupStrategy = new SAMLMetadataContextLookupFunction();
-        

[... 425 lines stripped ...]