[java-identity-provider COMMIT] in /trunk: idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAct...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar 29 12:02:29 2016
New Revision: 8185

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8185&view=rev
Log:
Move principal evaluation machinery down to RequestedPrincipalContext.
Deprecate original location on AuthenticationContext.

Added:
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/RequestedPrincipalContextPrincipalEvalTest.java
      - copied, changed from r8183, trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/AuthenticationContextPrincipalEvalTest.java
Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationContext.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/RequestedPrincipalContext.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/FinalizeAuthentication.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/PopulateAuthenticationContext.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectAuthenticationFlow.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAAS.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/FinalizeAuthenticationTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/SelectAuthenticationFlowTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUserAgentAddressTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/impl/ValidateUsernamePasswordAgainstJAASTest.java
    trunk/idp-authn-impl/src/test/java/net/shibboleth/idp/authn/principal/impl/AuthenticationContextPrincipalEvalTest.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java?rev=8185&r1=8184&r2=8185&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java	(original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AbstractValidationAction.java	Tue Mar 29 12:02:29 2016
@@ -265,8 +265,7 @@
             log.debug("{} Request contains principal requirements, evaluating for compatibility", getLogPrefix());
             for (Principal p : rpCtx.getRequestedPrincipals()) {
                 final PrincipalEvalPredicateFactory factory =
-                        authenticationContext.getPrincipalEvalPredicateFactoryRegistry().lookup(
-                                p.getClass(), rpCtx.getOperator());
+                        rpCtx.getPrincipalEvalPredicateFactoryRegistry().lookup(p.getClass(), rpCtx.getOperator());
                 if (factory != null) {
                     PrincipalEvalPredicate predicate = factory.getPredicate(p);
                     if (predicate.apply(this)) {

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationContext.java?rev=8185&r1=8184&r2=8185&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationContext.java	(original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/context/AuthenticationContext.java	Tue Mar 29 12:02:29 2016
@@ -19,19 +19,15 @@
 
 import java.security.Principal;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Set;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import net.shibboleth.idp.authn.AuthenticationResult;
 import net.shibboleth.idp.authn.AuthenticationFlowDescriptor;
-import net.shibboleth.idp.authn.principal.PrincipalEvalPredicateFactory;
 import net.shibboleth.idp.authn.principal.PrincipalEvalPredicateFactoryRegistry;
 import net.shibboleth.idp.authn.principal.PrincipalSupportingComponent;
 import net.shibboleth.utilities.java.support.annotation.constraint.Live;
@@ -71,12 +67,16 @@
 
     /** Authentication results associated with an active session and available for (re)use. */
     @Nonnull @NonnullElements private final Map<String,AuthenticationResult> activeResults;
-        
-    /** The registry of predicate factories for custom principal evaluation. */
-    @Nonnull private PrincipalEvalPredicateFactoryRegistry evalRegistry;
 
     /** Previously attempted flows (could be failures or intermediate results). */
     @Nonnull @NonnullElements private final Map<String,AuthenticationFlowDescriptor> intermediateFlows;
+    
+    /**

[... 857 lines stripped ...]