[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 Oct 28 00:30:54 2015
New Revision: 7892

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7892&view=rev
Log:
Fix double extraction of username audit field during logout requests.

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/saml/saml2/slo-front-abstract-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=7892&r1=7891&r2=7892&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/audit.xml	(original)
+++ trunk/idp-conf/src/main/resources/conf/audit.xml	Wed Oct 28 00:30:54 2015
@@ -57,6 +57,13 @@
             </map>
         </property>
     </bean>
+
+    <bean id="shibboleth.LogoutRequestAuditExtractors" parent="shibboleth.DefaultLogoutRequestAuditExtractors" lazy-init="true">
+        <property name="sourceMap">
+            <map merge="true">
+            </map>
+        </property>
+    </bean>
     
     <bean id="shibboleth.LogoutAuditExtractors" parent="shibboleth.DefaultLogoutAuditExtractors" 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=7892&r1=7891&r2=7892&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 Oct 28 00:30:54 2015
@@ -357,6 +357,38 @@
         </property>
     </bean>
     
+    <bean id="shibboleth.DefaultLogoutRequestAuditExtractors"
+            class="org.springframework.beans.factory.config.MapFactoryBean">
+        <property name="sourceMap">
+            <map>
+                <entry>
+                    <key>
+                        <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.NAMEID"/>
+                    </key>
+                    <bean class="net.shibboleth.idp.saml.audit.impl.NameIDAuditExtractor">
+                        <constructor-arg>
+                            <bean class="com.google.common.base.Functions" factory-method="compose"
+                                c:g-ref="shibboleth.MessageLookup.SAMLObject"
+                                c:f-ref="shibboleth.MessageContextLookup.Inbound" />
+                        </constructor-arg>
+                    </bean>
+                </entry>
+                <entry>
+                    <key>
+                        <util:constant static-field="net.shibboleth.idp.saml.profile.SAMLAuditFields.NAMEID_FORMAT"/>
+                    </key>
+                    <bean class="net.shibboleth.idp.saml.audit.impl.NameIDFormatAuditExtractor">
+                        <constructor-arg>
+                            <bean class="com.google.common.base.Functions" factory-method="compose"
+                                c:g-ref="shibboleth.MessageLookup.SAMLObject"
+                                c:f-ref="shibboleth.MessageContextLookup.Inbound" />
+                        </constructor-arg>
+                    </bean>
+                </entry>
+            </map>
+        </property>
+    </bean>
+    
     <bean id="shibboleth.DefaultLogoutAuditExtractors"
             class="org.springframework.beans.factory.config.MapFactoryBean" abstract="true">
         <property name="sourceMap">

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml?rev=7892&r1=7891&r2=7892&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-front-abstract-beans.xml	Wed Oct 28 00:30:54 2015
@@ -41,7 +41,7 @@
     
     <bean id="LogoutPopulateAuditContext"
         class="net.shibboleth.idp.profile.audit.impl.PopulateAuditContext" scope="prototype"
-        p:fieldExtractors-ref="shibboleth.LogoutAuditExtractors"
+        p:fieldExtractors="#{getObject('shibboleth.LogoutRequestAuditExtractors') ?: getObject('shibboleth.DefaultLogoutRequestAuditExtractors')}"
         p:formattingMap-ref="shibboleth.AuditFormattingMap" />
         
     <bean id="PopulateMultiRPContextFromLogoutContext"