[java-identity-provider COMMIT] in /trunk: idp-admin-api/.project idp-admin-api/src/main/java/net/shibboleth/idp/admi...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug 15 23:01:58 2016
New Revision: 8325

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8325&view=rev
Log:
IDP-961 - Use of IdP's authentication flow to protect itself

https://issues.shibboleth.net/jira/browse/IDP-961

Convert descriptor to interface, further work on implementation.

Added:
    trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java   (with props)
    trunk/idp-admin-impl/src/main/java/net/
    trunk/idp-admin-impl/src/main/java/net/shibboleth/
    trunk/idp-admin-impl/src/main/java/net/shibboleth/idp/
    trunk/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/
    trunk/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/
    trunk/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/package-info.java   (with props)
Modified:
    trunk/idp-admin-api/.project
    trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/AdministrativeFlowDescriptor.java

Modified: trunk/idp-admin-api/.project
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-admin-api/.project?rev=8325&r1=8324&r2=8325&view=diff
==============================================================================
Binary files - no diff available.

Modified: trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/AdministrativeFlowDescriptor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/AdministrativeFlowDescriptor.java?rev=8325&r1=8324&r2=8325&view=diff
==============================================================================
--- trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/AdministrativeFlowDescriptor.java	(original)
+++ trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/AdministrativeFlowDescriptor.java	Mon Aug 15 23:01:58 2016
@@ -17,38 +17,11 @@
 
 package net.shibboleth.idp.admin;
 
-import java.security.Principal;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import org.opensaml.saml.ext.saml2mdui.UIInfo;
+
 import net.shibboleth.idp.authn.config.AuthenticationProfileConfiguration;
-import net.shibboleth.idp.profile.config.AbstractProfileConfiguration;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
-
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotLive;
-import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
-import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.logic.FunctionSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
-
-import org.opensaml.profile.context.ProfileRequestContext;
-
-import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
 
 /**
  * A descriptor for an administrative flow.
@@ -61,136 +34,28 @@
  * 
  * @since 3.3.0
  */
-public class AdministrativeFlowDescriptor extends AbstractProfileConfiguration
-        implements AuthenticationProfileConfiguration {
-    
-    /** Whether this flow supports non-browser clients. */
-    private Predicate<ProfileRequestContext> supportsNonBrowserPredicate;
-    
-    /** Whether access to flow should be recorded in audit log. */
-    private Predicate<ProfileRequestContext> auditedPredicate;
+public interface AdministrativeFlowDescriptor extends AuthenticationProfileConfiguration {
 
-    /** Whether user authentication is required. */
-    private Predicate<ProfileRequestContext> authenticatedPredicate;
-    
-    /** Whether to populate the context tree with pseudo-"relying-party" tree. */
-    private Predicate<ProfileRequestContext> contextDecoratedPredicate;
-    
-    /** Lookup strategy for access control policy to apply. */
-    @Nonnull private Function<ProfileRequestContext,String> policyNameLookupStrategy;
-
-    /** Whether attributes should be resolved in the course of the flow. */
-    @Nonnull private Predicate<ProfileRequestContext> resolveAttributesPredicate;
-    
-    /** Selects, and limits, the authentication flows to use for requests by supported principals. */
-    @Nullable private Function<ProfileRequestContext,Collection<Principal>>
-            defaultAuthenticationMethodsLookupStrategy;
-
-    /** Filters the usable authentication flows. */
-    @Nullable private Function<ProfileRequestContext,Set<String>> authenticationFlowsLookupStrategy;
-
-    /** Enables post-authentication interceptor flows. */

[... 335 lines stripped ...]