[java-identity-provider] branch master updated: Add more general admin flow audit logging in parent flow.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=e8431fba7bd57ad2b8132eb79c3a3fec548317af

The following commit(s) were added to refs/heads/master by this push:
       new  e8431fb   Add more general admin flow audit logging in parent flow.
e8431fb is described below

commit e8431fba7bd57ad2b8132eb79c3a3fec548317af
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Aug 1 15:48:55 2018 -0400

    Add more general admin flow audit logging in parent flow.
---
 idp-conf/src/main/resources/system/conf/audit-system.xml             | 4 ++++
 .../src/main/resources/system/flows/admin/admin-abstract-beans.xml   | 3 +++
 .../src/main/resources/system/flows/admin/admin-abstract-flow.xml    | 1 +
 idp-conf/src/main/resources/system/flows/admin/unlock-keys-beans.xml | 5 +----
 idp-conf/src/main/resources/system/flows/admin/unlock-keys-flow.xml  | 1 -
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/idp-conf/src/main/resources/system/conf/audit-system.xml b/idp-conf/src/main/resources/system/conf/audit-system.xml
index 2e19168..00bf7c5 100644
--- a/idp-conf/src/main/resources/system/conf/audit-system.xml
+++ b/idp-conf/src/main/resources/system/conf/audit-system.xml
@@ -813,5 +813,9 @@
             </map>
         </property>
     </bean>
+
+    <bean id="shibboleth.DefaultAdminAuditExtractors"
+          class="org.springframework.beans.factory.config.MapFactoryBean"
+          parent="shibboleth.DefaultErrorViewAuditExtractors" />
     
 </beans>
diff --git a/idp-conf/src/main/resources/system/flows/admin/admin-abstract-beans.xml b/idp-conf/src/main/resources/system/flows/admin/admin-abstract-beans.xml
index 3ff1a3e..4a10b95 100644
--- a/idp-conf/src/main/resources/system/flows/admin/admin-abstract-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/admin/admin-abstract-beans.xml
@@ -103,6 +103,9 @@
     <!-- Declares audit field extractor functions injected into beans that populate the audit context. -->
     <import resource="../../conf/audit-system.xml" />
         
+    <bean id="AdminPopulateAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
+        p:fieldExtractors="#{getObject('shibboleth.AdminAuditExtractors') ?: getObject('shibboleth.DefaultAdminAuditExtractors')}" />
+        
     <bean id="WriteAuditLog" class="net.shibboleth.idp.profile.audit.impl.WriteAuditLog" scope="prototype"
         p:activationCondition-ref="shibboleth.ProfileAuditingCondition"
         p:formattingMap-ref="shibboleth.AuditFormattingMap"
diff --git a/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml b/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml
index ff679fe..f5293ba 100644
--- a/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/admin/admin-abstract-flow.xml
@@ -87,6 +87,7 @@
     </action-state>
 
     <action-state id="PopulateClientStorageSaveContext">
+        <evaluate expression="AdminPopulateAuditContext" />
         <evaluate expression="PopulateClientStorageSaveContext" />
         <evaluate expression="'proceed'" />
 
diff --git a/idp-conf/src/main/resources/system/flows/admin/unlock-keys-beans.xml b/idp-conf/src/main/resources/system/flows/admin/unlock-keys-beans.xml
index 5fa1c57..481736d 100644
--- a/idp-conf/src/main/resources/system/flows/admin/unlock-keys-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/admin/unlock-keys-beans.xml
@@ -29,10 +29,7 @@
         factory-method="constant" c:_0="keys" />
     
     <!--  Work beans. -->
-    
-    <bean id="PostResponsePopulateAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
-        p:fieldExtractors="#{getObject('shibboleth.PostResponseAuditExtractors') ?: getObject('shibboleth.DefaultPostResponseAuditExtractors')}" />
-    
+        
     <bean id="UnlockDataSealers" class="net.shibboleth.idp.admin.impl.UnlockDataSealers" scope="prototype"
         p:httpServletRequest-ref="shibboleth.HttpServletRequest"
         p:keyStrategies="#{getObject('shibboleth.unlock-keys.KeyStrategies')}" />
diff --git a/idp-conf/src/main/resources/system/flows/admin/unlock-keys-flow.xml b/idp-conf/src/main/resources/system/flows/admin/unlock-keys-flow.xml
index ef21d73..06dd0cb 100644
--- a/idp-conf/src/main/resources/system/flows/admin/unlock-keys-flow.xml
+++ b/idp-conf/src/main/resources/system/flows/admin/unlock-keys-flow.xml
@@ -17,7 +17,6 @@
 
     <action-state id="DoProfileWork">
         <evaluate expression="CheckAccess" />
-        <evaluate expression="PostResponsePopulateAuditContext" />
         <evaluate expression="'proceed'" />
         
         <transition on="proceed" to="CheckIfDone" />

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.