[java-identity-provider COMMIT] in /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl: NameIDAudit...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Oct 28 00:29:35 2015
New Revision: 7891

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7891&view=rev
Log:
Extend audit extractors to support additional message types.

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/NameIDAuditExtractor.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/NameIDFormatAuditExtractor.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/NameIDAuditExtractor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/NameIDAuditExtractor.java?rev=7891&r1=7890&r2=7891&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/NameIDAuditExtractor.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/NameIDAuditExtractor.java	Wed Oct 28 00:29:35 2015
@@ -27,6 +27,7 @@
 import org.opensaml.saml.saml1.core.AuthorizationDecisionStatement;
 import org.opensaml.saml.saml1.core.SubjectStatement;
 import org.opensaml.saml.saml2.core.ArtifactResponse;
+import org.opensaml.saml.saml2.core.AuthnRequest;
 import org.opensaml.saml.saml2.core.LogoutRequest;
 
 import com.google.common.base.Function;
@@ -74,6 +75,12 @@
                 
                 if (((LogoutRequest) msg).getNameID() != null) {
                     return ((LogoutRequest) msg).getNameID().getValue();
+                }
+                
+            } else if (msg instanceof AuthnRequest) {
+                if (((AuthnRequest) msg).getSubject() != null &&
+                        ((AuthnRequest) msg).getSubject().getNameID() != null) {
+                    return ((AuthnRequest) msg).getSubject().getNameID().getValue();
                 }
                 
             } else if (msg instanceof org.opensaml.saml.saml1.core.Response) {

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/NameIDFormatAuditExtractor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/NameIDFormatAuditExtractor.java?rev=7891&r1=7890&r2=7891&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/NameIDFormatAuditExtractor.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/audit/impl/NameIDFormatAuditExtractor.java	Wed Oct 28 00:29:35 2015
@@ -27,6 +27,8 @@
 import org.opensaml.saml.saml1.core.AuthorizationDecisionStatement;
 import org.opensaml.saml.saml1.core.SubjectStatement;
 import org.opensaml.saml.saml2.core.ArtifactResponse;
+import org.opensaml.saml.saml2.core.AuthnRequest;
+import org.opensaml.saml.saml2.core.LogoutRequest;
 
 import com.google.common.base.Function;
 
@@ -67,6 +69,18 @@
                     if (format != null) {
                         return format;
                     }
+                }
+                
+            } else if (msg instanceof LogoutRequest) {
+                
+                if (((LogoutRequest) msg).getNameID() != null) {
+                    return ((LogoutRequest) msg).getNameID().getFormat();
+                }
+
+            } else if (msg instanceof AuthnRequest) {
+                if (((AuthnRequest) msg).getSubject() != null &&
+                        ((AuthnRequest) msg).getSubject().getNameID() != null) {
+                    return ((AuthnRequest) msg).getSubject().getNameID().getFormat();
                 }
                 
             } else if (msg instanceof org.opensaml.saml.saml1.core.Response) {