[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system/flows/status: status-beans.xml status-fl...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Aug 26 18:03:27 2014
New Revision: 6474

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6474&view=rev
Log:
Add auditing to status flow, and rework end states to match SAML flow.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/status/status-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/status/status-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/status/status-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/status/status-beans.xml?rev=6474&r1=6473&r2=6474&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/status/status-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/status/status-beans.xml Tue Aug 26 18:03:27 2014
@@ -28,6 +28,13 @@
         p:accessControlService-ref="shibboleth.AccessControlService"
         p:policyName="%{idp.status.accessPolicy}" />
     
+    <bean id="WriteAuditLog" class="net.shibboleth.idp.profile.audit.impl.WriteAuditLog" scope="prototype"
+        p:format="%{idp.service.logging.audit:%T|%b|%I|%SP|%P|%IDP|%bb|%III|%u|%ac|%attr|%n|%i}" />
+
+    <bean id="WriteAuditLogForLocalError" class="net.shibboleth.idp.profile.audit.impl.WriteAuditLog" scope="prototype"
+        p:activationCondition="%{idp.service.logging.auditLocalErrors:false}"
+        p:format="%{idp.service.logging.audit:%T|%b|%I|%SP|%P|%IDP|%bb|%III|%u|%ac|%attr|%n|%i}" />
+    
     <bean id="MapEventToView"
         class="net.shibboleth.idp.profile.context.navigate.SpringEventToViewLookupFunction"
         p:defaultView-ref="shibboleth.DefaultErrorView"

Modified: trunk/idp-conf/src/main/resources/system/flows/status/status-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/status/status-flow.xml?rev=6474&r1=6473&r2=6474&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/status/status-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/status/status-flow.xml Tue Aug 26 18:03:27 2014
@@ -14,6 +14,7 @@
 
     <end-state id="Status" view="status">
         <on-entry>
+            <evaluate expression="WriteAuditLog" />
             <evaluate expression="T(java.lang.Runtime).getRuntime()" result="requestScope.runtime" />
             <evaluate expression="T(java.lang.System)" result="requestScope.System" />
             <evaluate expression="T(net.shibboleth.idp.Version)" result="requestScope.Version" />
@@ -26,21 +27,17 @@
         </on-entry>
     </end-state>
 
-    <!-- Populates inputs to error views and dispatches based on the error event. -->
-    <action-state id="HandleErrorWithView">
+    <!-- Unsuccessful terminal state. -->
+    
+    <end-state id="HandleErrorWithView" view="#{MapEventToView.apply(currentEvent)}">
         <on-entry>
+            <evaluate expression="WriteAuditLogForLocalError" />
             <evaluate expression="opensamlProfileRequestContext" result="requestScope.profileRequestContext" />
             <evaluate expression="T(net.shibboleth.utilities.java.support.codec.HTMLEncoder)" result="requestScope.encoder" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="requestScope.request" />
             <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="requestScope.response" />
         </on-entry>
-        
-        <evaluate expression="currentEvent" />
-        
-        <transition to="error" />
-    </action-state>
-
-    <end-state id="error" view="#{MapEventToView.apply(currentEvent)}" />
+    </end-state>
 
     <!-- Default is to turn non-proceed events into an error. -->
     <global-transitions>