[java-identity-provider COMMIT] in /trunk/idp-conf: pom.xml src/main/resources/conf/admin.xml src/main/resources/syst...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug 22 11:05:40 2016
New Revision: 8337

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

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

Redesign simple admin flows with new parent flow.

Added:
    trunk/idp-conf/src/main/resources/conf/admin.xml
    trunk/idp-conf/src/main/resources/system/conf/admin-system.xml
Modified:
    trunk/idp-conf/pom.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/admin-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/reload-metadata-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/reload-service-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/reload-service-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/status-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/status-flow.xml

Modified: trunk/idp-conf/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/pom.xml?rev=8337&r1=8336&r2=8337&view=diff
==============================================================================
--- trunk/idp-conf/pom.xml	(original)
+++ trunk/idp-conf/pom.xml	Mon Aug 22 11:05:40 2016
@@ -44,6 +44,12 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>idp-profile-impl</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-admin-impl</artifactId>
             <version>${project.version}</version>
             <optional>true</optional>
         </dependency>

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=8337&r1=8336&r2=8337&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml	Mon Aug 22 11:05:40 2016
@@ -40,6 +40,7 @@
 
     <import resource="../../conf/global.xml" />
     <import resource="../../conf/errors.xml" />
+    <import resource="admin-system.xml" />
     <import resource="general-authn-system.xml" />
     <import resource="session-manager-system.xml" />
     <import resource="services-system.xml" />

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/admin-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/admin-abstract-beans.xml?rev=8337&r1=8336&r2=8337&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/admin-abstract-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/admin-abstract-beans.xml	Mon Aug 22 11:05:40 2016
@@ -17,6 +17,65 @@
 
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
+
+    <bean id="InitializeProfileRequestContext"
+        class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
+        p:profileId-ref="shibboleth.AdminProfileId" />
+    
+    <!--
+    The collection selection expression works because Spring converts the first member of a collection into
+    a compatible singleton for a property.
+    -->
+    <bean id="InitializeAdministrativeProfileContextTree"
+            class="net.shibboleth.idp.admin.impl.InitializeAdministrativeProfileContextTree" scope="prototype"
+            p:httpServletRequest-ref="shibboleth.HttpServletRequest"
+            p:administrativeFlowDescriptor="#{@'shibboleth.AvailableAdminFlows'.?[id == @'shibboleth.AdminProfileId']}">
+        <property name="fallbackLanguages">
+            <bean parent="shibboleth.CommaDelimStringArray" c:_0="#{'%{idp.ui.fallbackLanguages:}'.trim()}" />
+        </property>
+    </bean>
+
+    <!-- Session / Authn /Authz -->
+
+    <bean id="PopulateClientStorageLoadContext"
+        class="org.opensaml.storage.impl.client.PopulateClientStorageLoadContext" scope="prototype"
+        p:storageServices="#{ getObject('shibboleth.ClientStorageServices') ?: getObject('shibboleth.DefaultClientStorageServices') }" />
+
+    <bean id="InitializeAuthenticationContext"
+        class="net.shibboleth.idp.saml.profile.impl.InitializeAuthenticationContext" scope="prototype" />
+
+    <bean id="InitialAuthenticationFlag" class="java.lang.Boolean">

[... 336 lines stripped ...]