[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 Oct 27 20:58:20 2015
New Revision: 7889

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7889&view=rev
Log:
IDP-671: Port SAML 2 delegation support from v2 extension (IdP)

Add unit tests for various delegation-related actions. 

Added:
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddAuthnStatementToAssertionFromInboundAssertionTokenTest.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddDelegationPolicyToAssertionTest.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddDelegationRestrictionToAssertionsTest.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DelegatedAssertionLookupStrategyTest.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/EvaluateDelegationPolicyTest.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/FinalizeSAMLTokenProcessingTest.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/PopulateLibertyContextTest.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/ProcessDelegatedAssertionTest.java   (with props)
Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddDelegationPolicyToAssertion.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddDelegationRestrictionToAssertions.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/DelegatedAssertionLookupStrategy.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/FinalizeSAMLTokenProcessing.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddDelegationPolicyToAssertion.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/AddDelegationPolicyToAssertion.java?rev=7889&r1=7888&r2=7889&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddDelegationPolicyToAssertion.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddDelegationPolicyToAssertion.java	Tue Oct 27 20:58:20 2015
@@ -153,12 +153,13 @@
                             .getMaximumTokenDelegationChainLength();
                 } else {
                     log.debug("Profile config was not BrowserSSOProfileConfiguration, can't evaluate: {}", 
-                            relyingPartyContext.getProfileConfig().getClass().getName());
+                            relyingPartyContext.getProfileConfig() != null ? 
+                                    relyingPartyContext.getProfileConfig().getClass().getName() : "null");
                 }
             }
         }
-        log.debug("Unable to resolve max delegation chain length, returning default: {}", 
-                DEFAULT_POLICY_MAX_CHAIN_LENGTH);
+        log.debug("Unable to resolve max delegation chain length from inbound token or profile config, " 
+                + "returning default: {}", DEFAULT_POLICY_MAX_CHAIN_LENGTH);
         return DEFAULT_POLICY_MAX_CHAIN_LENGTH;
     }
 

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddDelegationRestrictionToAssertions.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/AddDelegationRestrictionToAssertions.java?rev=7889&r1=7888&r2=7889&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddDelegationRestrictionToAssertions.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/delegation/impl/AddDelegationRestrictionToAssertions.java	Tue Oct 27 20:58:20 2015
@@ -16,6 +16,8 @@
  */
 
 package net.shibboleth.idp.saml.saml2.profile.delegation.impl;
+
+import java.util.List;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -77,8 +79,8 @@
     /** Strategy used to locate the SAMLPresenterEntityContext. */
     @Nonnull private Function<ProfileRequestContext,SAMLPresenterEntityContext> presenterContextLookupStrategy;
     
-    /** Response to modify. */
-    @Nullable private Response response;
+    /** List of assertions to modify. */
+    @Nullable private List<Assertion> assertions;
     
     /** The delegated Assertion that was attested. */
     @Nullable private Assertion attestedAssertion;
@@ -134,16 +136,22 @@
             return false;

[... 137 lines stripped ...]