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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Sep 15 12:53:07 2016
New Revision: 8395

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8395&view=rev
Log:
Relocate admin flow configuration to hide it better.
Install an initial metric registry globally.
Add draft flow and some configuration for REST-based metric access.

Added:
    trunk/idp-conf/src/main/resources/conf/admin/
    trunk/idp-conf/src/main/resources/conf/admin/general-admin.xml
      - copied, changed from r8390, trunk/idp-conf/src/main/resources/conf/admin.xml
    trunk/idp-conf/src/main/resources/conf/admin/metrics.xml   (with props)
    trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml
      - copied, changed from r8390, trunk/idp-conf/src/main/resources/system/conf/admin-system.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/metrics-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/admin/metrics-flow.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/admin.xml
    trunk/idp-conf/src/main/resources/system/conf/admin-system.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml

Copied: trunk/idp-conf/src/main/resources/conf/admin/general-admin.xml (from r8390, 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/general-admin.xml?p2=trunk/idp-conf/src/main/resources/conf/admin/general-admin.xml&p1=trunk/idp-conf/src/main/resources/conf/admin.xml&r1=8390&r2=8395&rev=8395&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/admin.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/admin/general-admin.xml	Thu Sep 15 12:53:07 2016
@@ -36,6 +36,12 @@
             p:loggingId="%{idp.service.logging.resolvertest:ResolverTest}"
             p:policyName="%{idp.resolvertest.accessPolicy:AccessByIPAddress}" />
     
+        <!-- REST Interface to Metrics -->
+        <bean parent="shibboleth.AdminFlow"
+            c:id="http://shibboleth.net/ns/profiles/metrics"
+            p:loggingId="Metrics"
+            p:policyNameLookupStrategy-ref="shibboleth.metrics.AccessPolicyStrategy" />
+    
     </util:list>
 
 </beans>

Copied: trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml (from r8390, trunk/idp-conf/src/main/resources/system/conf/admin-system.xml)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml?p2=trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml&p1=trunk/idp-conf/src/main/resources/system/conf/admin-system.xml&r1=8390&r2=8395&rev=8395&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/admin-system.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/general-admin-system.xml	Thu Sep 15 12:53:07 2016
@@ -12,7 +12,8 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
 
-    <import resource="../../conf/admin.xml" />
+    <import resource="../../conf/admin/general-admin.xml" />
+    <import resource="../../conf/admin/metrics.xml" />
 
     <!-- A parent bean to default some of the flow boilerplate. -->
 
@@ -21,4 +22,17 @@
             p:servletRequest-ref="shibboleth.HttpServletRequest"
             p:nonBrowserSupported="false" />
 
+    <!-- Function for returning custom access control policies for access to metrics. -->
+
+    <bean id="shibboleth.metrics.AccessPolicyStrategy" parent="shibboleth.ContextFunctions.Expression"
+        c:expression="#custom.get('policyMap').get(#input.getSubcontext(T(net.shibboleth.idp.profile.context.SpringRequestContext)).getRequestContext().getFlowScope().get('metricId')) ?: #custom.get('defaultPolicy')"
+        c:outputType="#{T(java.lang.String)}">
+        <property name="customObject">
+            <map>
+                <entry key="policyMap" value-ref="shibboleth.metrics.AccessPolicyMap" />
+                <entry key="defaultPolicy" value-ref="shibboleth.metrics.DefaultAccessPolicy" />
+            </map>
+        </property>
+    </bean>
+
 </beans>

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=8395&r1=8394&r2=8395&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	Thu Sep 15 12:53:07 2016
@@ -47,7 +47,7 @@
     <import resource="subject-c14n-system.xml" />
     <import resource="profile-intercept-system.xml" />
     <import resource="cas-protocol-system.xml" />
-    <import resource="admin-system.xml" />

[... 38 lines stripped ...]