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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Aug 18 16:51:35 2014
New Revision: 6441

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6441&view=rev
Log:
IDP-375 - add NameID audit extraction

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/NameIDAuditExtractor.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/conf/audit-system.xml
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContext.java

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=6441&r1=6440&r2=6441&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 Mon Aug 18 16:51:35 2014
@@ -159,6 +159,18 @@
                         </constructor-arg>
                     </bean>
                 </entry>
+                <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.Outbound" />
+                        </constructor-arg>
+                    </bean>
+                </entry>
             </map>
         </property>
     </bean>

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContext.java?rev=6441&r1=6440&r2=6441&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContext.java (original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/audit/impl/PopulateAuditContext.java Mon Aug 18 16:51:35 2014
@@ -191,7 +191,9 @@
                     log.debug("{} Adding {} value(s) for field '{}'", getLogPrefix(), ((Collection) values).size(),
                             entry.getKey());
                     for (final Object value : (Collection) values) {
-                        auditCtx.getFieldValues(entry.getKey()).add(value.toString());
+                        if (value != null) {
+                            auditCtx.getFieldValues(entry.getKey()).add(value.toString());
+                        }
                     }
                 } else {
                     log.debug("{} Adding 1 value for field '{}'", getLogPrefix(), entry.getKey());