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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Sep 24 16:38:57 2014
New Revision: 6572

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6572&view=rev
Log:
Add a suppression capability for auditing on a per-profile basis.

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

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=6572&r1=6571&r2=6572&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/audit.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/audit.xml Wed Sep 24 16:38:57 2014
@@ -10,6 +10,10 @@
 	default-init-method="initialize" default-destroy-method="destroy">
 
     <!-- TODO: explain this stuff -->
+
+    <util:list id="shibboleth.AuditSuppressedProfiles">
+        <value>http://shibboleth.net/ns/profiles/status</value>
+    </util:list>
 
     <bean id="shibboleth.PostDecodeAuditExtractors" parent="shibboleth.DefaultPostDecodeAuditExtractors" lazy-init="true">
         <property name="sourceMap">

Modified: trunk/idp-conf/src/main/resources/system/conf/audit-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/audit-system.xml?rev=6572&r1=6571&r2=6572&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/audit-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/audit-system.xml Wed Sep 24 16:38:57 2014
@@ -9,6 +9,19 @@
 
 	default-init-method="initialize" default-destroy-method="destroy">
     
+    <bean id="shibboleth.ProfileAuditingCondition" class="com.google.common.base.Predicates" factory-method="not">
+        <constructor-arg>
+            <bean class="net.shibboleth.utilities.java.support.logic.StrategyIndirectedPredicate">
+                <constructor-arg name="objectStrategy">
+                    <bean class="org.opensaml.profile.context.navigate.ProfileIdLookup" />
+                </constructor-arg>
+                <constructor-arg name="collection">
+                    <ref bean="shibboleth.AuditSuppressedProfiles" />
+                </constructor-arg>
+            </bean>
+        </constructor-arg>
+    </bean>
+    
     <!--
     The actual beans used are in user-space, but they inherit from the maps below. We have to use a
     MapFactoryBean instead of util:map because merging isn't supported by the util:map schema.

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=6572&r1=6571&r2=6572&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 Wed Sep 24 16:38:57 2014
@@ -18,6 +18,9 @@
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 
+    <!-- Declares audit field extractor functions injected into beans that populate the audit context. -->
+    <import resource="../../conf/audit-system.xml" />
+
     <bean id="InitializeProfileRequestContext"
         class="net.shibboleth.idp.profile.impl.InitializeProfileRequestContext" scope="prototype"
         p:profileId="http://shibboleth.net/ns/profiles/status" />
@@ -29,6 +32,7 @@
         p:policyName="%{idp.status.accessPolicy}" />
     
     <bean id="WriteAuditLog" class="net.shibboleth.idp.profile.audit.impl.WriteAuditLog" scope="prototype"
+        p:activationCondition-ref="shibboleth.ProfileAuditingCondition"
         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"