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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Nov  5 13:56:50 2014
New Revision: 6845

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6845&view=rev
Log:
IDP-506 - Align profile-driven authn flow filtering to intercept filtering

Added:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/config/navigate/AuthenticationFlowsLookupFunction.java   (with props)
Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/config/AuthenticationProfileConfiguration.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/PopulateAuthenticationContext.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java?rev=6845&r1=6844&r2=6845&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java Wed Nov  5 13:56:50 2014
@@ -58,6 +58,9 @@
 public class AuthenticationFlowDescriptor extends AbstractIdentifiableInitializableComponent implements
         PrincipalSupportingComponent, Predicate<ProfileRequestContext>, StorageSerializer<AuthenticationResult> {
 
+    /** Prefix convention for flow IDs. */
+    @Nonnull @NotEmpty public static final String FLOW_ID_PREFIX = "authn/";
+
     /** Additional allowance for storage of result records to avoid race conditions during use. */
     public static final long STORAGE_EXPIRATION_OFFSET;
 

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/config/AuthenticationProfileConfiguration.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/config/AuthenticationProfileConfiguration.java?rev=6845&r1=6844&r2=6845&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/config/AuthenticationProfileConfiguration.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/config/AuthenticationProfileConfiguration.java Wed Nov  5 13:56:50 2014
@@ -41,6 +41,10 @@
     /**
      * Get the allowable authentication flows for this profile.
      * 
+     * <p>The flow IDs returned MUST NOT contain the
+     * {@link net.shibboleth.idp.authn.AuthenticationFlowDescriptor#FLOW_ID_PREFIX}
+     * prefix common to all interceptor flows.</p>
+     * 
      * @return  a set of authentication flow IDs to allow 
      */
     @Nonnull @NonnullElements @NotLive @Unmodifiable Set<String> getAuthenticationFlows();
@@ -48,7 +52,9 @@
     /**
      * Get an ordered list of post-authentication interceptor flows to run for this profile.
      * 
-     * <p>The flow IDs returned MUST NOT contain the "intercept/" prefix common to all interceptor flows.</p>
+     * <p>The flow IDs returned MUST NOT contain the
+     * {@link net.shibboleth.idp.profile.interceptor.ProfileInterceptorFlowDescriptor#FLOW_ID_PREFIX}
+     * prefix common to all interceptor flows.</p>
      * 
      * @return  a set of interceptor flow IDs to enable
      */

Modified: trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/PopulateAuthenticationContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/PopulateAuthenticationContext.java?rev=6845&r1=6844&r2=6845&view=diff
==============================================================================
--- trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/PopulateAuthenticationContext.java (original)
+++ trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/PopulateAuthenticationContext.java Wed Nov  5 13:56:50 2014
@@ -24,16 +24,13 @@
 
 import net.shibboleth.idp.authn.AbstractAuthenticationAction;
 import net.shibboleth.idp.authn.AuthenticationFlowDescriptor;
-import net.shibboleth.idp.authn.config.AuthenticationProfileConfiguration;
+import net.shibboleth.idp.authn.config.navigate.AuthenticationFlowsLookupFunction;
 import net.shibboleth.idp.authn.context.AuthenticationContext;
 import net.shibboleth.idp.authn.principal.PrincipalEvalPredicateFactoryRegistry;
-import net.shibboleth.idp.profile.config.ProfileConfiguration;
-import net.shibboleth.idp.profile.context.RelyingPartyContext;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
-import org.opensaml.messaging.context.navigate.ChildContextLookup;
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,12 +42,10 @@
 
 /**

[... 113 lines stripped ...]