[java-identity-provider] branch master updated: Pull rarely used audit beans from default file.

[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=628a01c23caa2705447e07e006b99692968f5482

The following commit(s) were added to refs/heads/master by this push:
       new  628a01c   Pull rarely used audit beans from default file.
628a01c is described below

commit 628a01c23caa2705447e07e006b99692968f5482
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Sep 6 19:40:54 2018 -0400

    Pull rarely used audit beans from default file.
---
 .../conf/intercept/consent-intercept-config.xml      | 20 --------------------
 .../flows/intercept/attribute-release-beans.xml      |  6 +++---
 .../system/flows/intercept/terms-of-use-beans.xml    |  4 ++--
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml b/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml
index ca183a7..4e52be0 100644
--- a/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml
+++ b/idp-conf/src/main/resources/conf/intercept/consent-intercept-config.xml
@@ -100,26 +100,6 @@
     </util:map>
 
     <!--
-    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.consent.PreConsentAuditExtractors" parent="shibboleth.consent.DefaultPreConsentAuditExtractors" lazy-init="true">
-        <property name="sourceMap">
-            <map merge="true">
-            </map>
-        </property>
-    </bean>
-
-    <bean id="shibboleth.consent.ConsentAuditExtractors" parent="shibboleth.consent.DefaultConsentAuditExtractors" lazy-init="true">
-        <property name="sourceMap">
-            <map merge="true">
-            </map>
-        </property>
-    </bean>
-
-    <!--
     Specify custom symbolic replacements for attribute names to shrink the size of results saved to client-side storage 
     such as cookies.
     -->
diff --git a/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml b/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
index a3c7de5..e55b1ae 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
@@ -80,7 +80,7 @@
     <!-- Serializer for consent records with symbolics support. -->
     <bean id="shibboleth.consent.ConsentSerializer"
         class="net.shibboleth.idp.consent.storage.impl.ConsentSerializer"
-        p:symbolics-ref="shibboleth.consent.AttributeSymbolics" />
+        p:symbolics="#{getObject('shibboleth.consent.AttributeSymbolics') ?: getObject('shibboleth.consent.DefaultAttributeSymbolics')}" />
 
     <!-- Default comparator which orders attributes according to the whitelist. -->
     <bean id="DefaultAttributeIDComparator"
@@ -102,7 +102,7 @@
 
     <bean id="PopulatePreConsentAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
         p:auditContextCreationStrategy-ref="shibboleth.consent.ChildLookup.ConsentAuditContext"
-        p:fieldExtractors-ref="shibboleth.consent.PreConsentAuditExtractors"
+        p:fieldExtractors="#{getObject('shibboleth.consent.PreConsentAuditExtractors') ?: getObject('shibboleth.consent.DefaultPreConsentAuditExtractors')}"
         p:formattingMap-ref="shibboleth.consent.attribute-release.AuditFormattingMap" />
 
     <bean id="PopulateConsentContext"
@@ -132,7 +132,7 @@
 
     <bean id="PopulateConsentAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
         p:auditContextCreationStrategy-ref="shibboleth.consent.ChildLookup.ConsentAuditContext"
-        p:fieldExtractors-ref="shibboleth.consent.ConsentAuditExtractors"
+        p:fieldExtractors="#{getObject('shibboleth.consent.ConsentAuditExtractors') ?: getObject('shibboleth.consent.DefaultConsentAuditExtractors')}"
         p:formattingMap-ref="shibboleth.consent.attribute-release.AuditFormattingMap" />
 
     <bean id="ExtractConsent"
diff --git a/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml b/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml
index 986d4d0..118028f 100644
--- a/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml
+++ b/idp-conf/src/main/resources/system/flows/intercept/terms-of-use-beans.xml
@@ -75,7 +75,7 @@
         
     <bean id="PopulatePreConsentAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
         p:auditContextCreationStrategy-ref="shibboleth.consent.ChildLookup.ConsentAuditContext"
-        p:fieldExtractors-ref="shibboleth.consent.PreConsentAuditExtractors"
+        p:fieldExtractors="#{getObject('shibboleth.consent.PreConsentAuditExtractors') ?: getObject('shibboleth.consent.DefaultPreConsentAuditExtractors')}"
         p:formattingMap-ref="shibboleth.consent.terms-of-use.AuditFormattingMap" />
 
     <bean id="ReadConsentFromStorage"
@@ -93,7 +93,7 @@
 
     <bean id="PopulateConsentAuditContext" parent="shibboleth.AbstractPopulateAuditContext"
         p:auditContextCreationStrategy-ref="shibboleth.consent.ChildLookup.ConsentAuditContext"
-        p:fieldExtractors-ref="shibboleth.consent.ConsentAuditExtractors"
+        p:fieldExtractors="#{getObject('shibboleth.consent.ConsentAuditExtractors') ?: getObject('shibboleth.consent.DefaultConsentAuditExtractors')}"
         p:formattingMap-ref="shibboleth.consent.terms-of-use.AuditFormattingMap" />
 
     <bean id="WriteConsentAuditLog" class="net.shibboleth.idp.profile.audit.impl.WriteAuditLog" scope="prototype"

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