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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Aug 17 20:40:12 2016
New Revision: 8328

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

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

Action to set up administrative flows using descriptor class.

Added:
    trunk/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTree.java   (with props)
    trunk/idp-admin-impl/src/test/java/net/
    trunk/idp-admin-impl/src/test/java/net/shibboleth/
    trunk/idp-admin-impl/src/test/java/net/shibboleth/idp/
    trunk/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/
    trunk/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/
    trunk/idp-admin-impl/src/test/java/net/shibboleth/idp/admin/impl/InitializeAdministrativeProfileContextTreeTest.java   (with props)
Modified:
    trunk/idp-admin-api/pom.xml
    trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/AdministrativeFlowDescriptor.java
    trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java
    trunk/idp-admin-impl/pom.xml

Modified: trunk/idp-admin-api/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-admin-api/pom.xml?rev=8328&r1=8327&r2=8328&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=8328&r1=8327&r2=8328&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	Wed Aug 17 20:40:12 2016
@@ -58,14 +58,6 @@
     boolean isAuthenticated();
     
     /**
-     * Get whether to decorate the profile request context tree with emulated relying party and user interface
-     * contexts to support e.g., login interfaces (default is false).
-     * 
-     * @return whether the context tree will be decorated
-     */
-    boolean isContextDecorated();
-    
-    /**
      * Get the user interface details for this profile.
      * 
      * @return user interface details

Modified: trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java?rev=8328&r1=8327&r2=8328&view=diff
==============================================================================
--- trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java	(original)
+++ trunk/idp-admin-api/src/main/java/net/shibboleth/idp/admin/BasicAdministrativeFlowDescriptor.java	Wed Aug 17 20:40:12 2016
@@ -34,12 +34,21 @@
 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.Positive;
 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.LangBearingString;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
+import org.opensaml.core.xml.XMLObjectBuilderFactory;
+import org.opensaml.core.xml.config.XMLObjectProviderRegistrySupport;
 import org.opensaml.profile.context.ProfileRequestContext;
+import org.opensaml.saml.common.SAMLObjectBuilder;
+import org.opensaml.saml.ext.saml2mdui.Description;
+import org.opensaml.saml.ext.saml2mdui.DisplayName;
+import org.opensaml.saml.ext.saml2mdui.InformationURL;
+import org.opensaml.saml.ext.saml2mdui.PrivacyStatementURL;
 import org.opensaml.saml.ext.saml2mdui.UIInfo;
 
 import com.google.common.base.Function;
@@ -73,11 +82,8 @@
     /** Whether user authentication is required. */
     private Predicate<ProfileRequestContext> authenticatedPredicate;
     
-    /** Whether to populate the context tree with pseudo-"relying-party" tree. */
-    private Predicate<ProfileRequestContext> contextDecoratedPredicate;
-    
     /** Expose user interface details. */
-    private UIInfo uiInfo;
+    @Nonnull private final UIInfo uiInfo;
     
     /** Lookup strategy for access control policy to apply. */
     @Nonnull private Function<ProfileRequestContext,String> policyNameLookupStrategy;
@@ -94,6 +100,9 @@
 
     /** Enables post-authentication interceptor flows. */

[... 248 lines stripped ...]