[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/intercept/consent-intercept-config.xml sy...

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Dec  2 17:40:43 2014
New Revision: 7037

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7037&view=rev
Log:
IDP-523 Checkpoint work on consent auditing including attribute release.

Modified:
    trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml
    trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-flow.xml

Modified: trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml?rev=7037&r1=7036&r2=7037&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml Tue Dec  2 17:40:43 2014
@@ -66,17 +66,42 @@
     -->
 
     <!--
-    This bean defines a mapping between audit log categories and formatting strings.
+    These beans define mappings between audit log categories and formatting strings.
+    -->
 
+    <!--
     For terms-of-use acceptance, the default entry is :
-     'YYYYMMDDTHHMMSSZ|TermsAccepted|jdoe|example-tou-1|rHo...rrw=|true'
+     'YYYYMMDDTHHMMSSZ|TermsAccepted|jdoe|example-tou-1|rHo...rrw='
 
     For terms-of-use refusal, the default entry is :
-     'YYYYMMDDTHHMMSSZ|TermsRejected|jdoe|example-tou-1|rHo...rrw=|false'
+     'YYYYMMDDTHHMMSSZ|TermsRejected|jdoe|example-tou-1|rHo...rrw='
+    -->
+    <util:map id="shibboleth.consent.terms-of-use.AuditFormattingMap">
+        <entry key="Shibboleth-Consent-Audit" value="%T|%SP|%e|%u|%CCI|%CCV" />
+    </util:map>
 
-    -->
-    <util:map id="shibboleth.ConsentAuditFormattingMap">
-        <entry key="Shibboleth-Consent-Audit" value="%T|%e|%u|%CCI|%CCV|%CCA" />
+    <!--
+    For attribute-release consent, the default entry is :
+     'YYYYMMDDTHHMMSSZ|https://sp.example.org|AttributeReleaseConsent|jdoe|email,eduPersonAffiliation|false,false'
+     -->
+    <util:map id="shibboleth.consent.attribute-release.AuditFormattingMap">
+        <entry key="Shibboleth-Consent-Audit" value="%T|%SP|%e|%u|%CCI|%CCA" />
+    </util:map>
+
+    <!--
+    For revocation of attribute-release consent, the default entry is :
+     'YYYYMMDDTHHMMSSZ|https://sp.example.org|ClearAttributeReleaseConsent|jdoe'
+     -->
+    <util:map id="shibboleth.consent.attribute-release.revoke.AuditFormattingMap">
+        <entry key="Shibboleth-Consent-Audit" value="%T|%SP|%e|%u" />
+    </util:map>
+
+    <!--
+    For global attribute-release consent, the default entry is :
+     'YYYYMMDDTHHMMSSZ|GlobalAttributeReleaseConsent|jdoe'
+     -->
+    <util:map id="shibboleth.consent.attribute-release.global.AuditFormattingMap">
+        <entry key="Shibboleth-Consent-Audit" value="%T|%e|%u" />
     </util:map>
 
     <!--
@@ -85,6 +110,12 @@
     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.PreConsentAuditExtractors" parent="shibboleth.DefaultPreConsentAuditExtractors" lazy-init="true">
+        <property name="sourceMap">
+            <map merge="true">
+            </map>
+        </property>
+    </bean>
 
     <bean id="shibboleth.ConsentAuditExtractors" parent="shibboleth.DefaultConsentAuditExtractors" lazy-init="true">
         <property name="sourceMap">

Modified: trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml?rev=7037&r1=7036&r2=7037&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/profile-intercept-system.xml Tue Dec  2 17:40:43 2014
@@ -66,6 +66,35 @@
         </constructor-arg>
     </bean>
 
+    <!-- Default pre-consent audit extractors. -->
+    <bean id="shibboleth.DefaultPreConsentAuditExtractors"
+            class="org.springframework.beans.factory.config.MapFactoryBean" abstract="true">
+        <property name="sourceMap">
+            <map>
+                <entry>
+                    <key>
+                        <util:constant static-field="net.shibboleth.idp.profile.IdPAuditFields.USERNAME"/>
+                    </key>
+                    <bean class="com.google.common.base.Functions" factory-method="compose"

[... 222 lines stripped ...]