[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/admin.xml conf/idp.properties system/flow...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Aug 24 09:18:48 2016
New Revision: 8350

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

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

Rework resolvertest flow to integrate with admin flow framework.
Move default view into system location.

Added:
    trunk/idp-conf/src/main/resources/system/views/resolvertest.vm
      - copied, changed from r8344, trunk/idp-conf/src/main/resources/views/resolvertest.vm
Modified:
    trunk/idp-conf/src/main/resources/conf/admin.xml
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/flows/admin/admin-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-flow.xml
    trunk/idp-conf/src/main/resources/views/resolvertest.vm

Modified: trunk/idp-conf/src/main/resources/conf/admin.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/admin.xml?rev=8350&r1=8349&r2=8350&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/admin.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/admin.xml	Wed Aug 24 09:18:48 2016
@@ -29,6 +29,12 @@
             c:id="http://shibboleth.net/ns/profiles/reload-metadata"
             p:loggingId="%{idp.service.logging.serviceReload:Reload}"
             p:policyName="%{idp.reload.accessPolicy:AccessByIPAddress}" />
+
+        <!-- AttributeResolver Debugging -->
+        <bean parent="shibboleth.AdminFlow"
+            c:id="http://shibboleth.net/ns/profiles/resolvertest"
+            p:loggingId="%{idp.service.logging.resolvertest:ResolverTest}"
+            p:policyName="%{idp.resolvertest.accessPolicy:AccessByIPAddress}" />
     
     </util:list>
 

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=8350&r1=8349&r2=8350&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties	(original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties	Wed Aug 24 09:18:48 2016
@@ -169,11 +169,6 @@
 # Set to custom bean for alternate storage of artifact map state
 #idp.artifact.StorageService = shibboleth.StorageService
 
-# Name of access control policy for various admin flows
-idp.status.accessPolicy = AccessByIPAddress
-idp.resolvertest.accessPolicy = AccessByIPAddress
-idp.reload.accessPolicy = AccessByIPAddress
-
 # Comma-delimited languages to use if not match can be found with the
 # browser-supported languages, defaults to an empty list.
 idp.ui.fallbackLanguages=en,fr,de

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=8350&r1=8349&r2=8350&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	Wed Aug 24 09:18:48 2016
@@ -53,13 +53,11 @@
 
     <bean id="ResolveAttributes" class="net.shibboleth.idp.profile.impl.ResolveAttributes" scope="prototype"
         c:resolverService-ref="shibboleth.AttributeResolverService"
-        p:maskFailures="%{idp.service.attribute.resolver.maskFailures:true}"
-        p:attributeContextCreationStrategy-ref="shibboleth.ChildLookupOrCreate.AttributeContext" />
+        p:maskFailures="%{idp.service.attribute.resolver.maskFailures:true}" />
 
     <bean id="PopulateClientStorageSaveContext"
         class="org.opensaml.storage.impl.client.PopulateClientStorageSaveContext" scope="prototype"
         p:storageServices="#{ getObject('shibboleth.ClientStorageServices') ?: getObject('shibboleth.DefaultClientStorageServices') }" />
-
 
     <!-- General access check that applies a fixed policy with no operation/resource. -->
     

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml?rev=8350&r1=8349&r2=8350&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml	Wed Aug 24 09:18:48 2016
@@ -18,19 +18,20 @@
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 

[... 166 lines stripped ...]