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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Nov  6 20:45:35 2014
New Revision: 6856

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6856&view=rev
Log:
IDP-501 - support multiple audit logging formats

Modified:
    trunk/idp-conf/src/main/resources/conf/audit.xml
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/reload-service-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/resolvertest-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/status-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/logout/logout-propagation-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-back-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContext.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLog.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContextTest.java
    trunk/idp-profile-impl/src/test/java/net/shibboleth/idp/profile/audit/impl/WriteAuditLogTest.java

Modified: trunk/idp-conf/src/main/resources/conf/audit.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/audit.xml?rev=6856&r1=6855&r2=6856&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/audit.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/audit.xml Thu Nov  6 20:45:35 2014
@@ -9,11 +9,25 @@
 
 	default-init-method="initialize" default-destroy-method="destroy">
 
-    <!-- TODO: explain this stuff -->
+    <!--
+    This bean defines a mapping between audit log categories and formatting strings. The default entry is
+    for compatibility with V2 audit logging.
+    -->
+    <util:map id="shibboleth.AuditFormattingMap">
+        <entry key="Shibboleth-Audit" value="%T|%b|%I|%SP|%P|%IDP|%bb|%III|%u|%ac|%attr|%n|%i" />
+    </util:map>
 
+    <!-- Allows auditing to be disabled selectively for particular profiles/flows. -->
     <util:list id="shibboleth.AuditSuppressedProfiles">
         <value>http://shibboleth.net/ns/profiles/status</value>
     </util:list>
+
+    <!--
+    The beans below need to be defined, even if left empty. They can be ignored in most cases.
+    
+    If you write your own function to extract a new piece of data for auditing, you can install it into one or more
+    of the maps below to add it to the auditing framework, keyed by an audit field label to be used in formatting.
+    -->
 
     <bean id="shibboleth.PostDecodeAuditExtractors" parent="shibboleth.DefaultPostDecodeAuditExtractors" lazy-init="true">
         <property name="sourceMap">

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=6856&r1=6855&r2=6856&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Thu Nov  6 20:45:35 2014
@@ -145,8 +145,6 @@
 
 #Set true to generate audit log entries for errors trapped locally
 #idp.logging.auditLocalErrors=false
-# Format of audit log entries, defaults to V2-compatible
-#idp.logging.audit=%T|%b|%I|%SP|%P|%IDP|%bb|%III|%u|%ac|%attr|%n|%i
 
 # Message freshness and replay cache tuning
 #idp.policy.messageLifetime = PT3M

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml?rev=6856&r1=6855&r2=6856&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/reload-metadata-beans.xml Thu Nov  6 20:45:35 2014
@@ -42,11 +42,11 @@
     
     <bean id="WriteAuditLog" class="net.shibboleth.idp.profile.audit.impl.WriteAuditLog" scope="prototype"
         p:activationCondition-ref="shibboleth.ProfileAuditingCondition"
-        p:format="%{idp.logging.audit:%T|%b|%I|%SP|%P|%IDP|%bb|%III|%u|%ac|%attr|%n|%i}" />
+        p:formattingMap-ref="shibboleth.AuditFormattingMap" />
 
     <bean id="WriteAuditLogForLocalError" class="net.shibboleth.idp.profile.audit.impl.WriteAuditLog" scope="prototype"
         p:activationCondition="%{idp.logging.auditLocalErrors:false}"
-        p:format="%{idp.logging.audit:%T|%b|%I|%SP|%P|%IDP|%bb|%III|%u|%ac|%attr|%n|%i}" />

[... 729 lines stripped ...]