[java-identity-provider COMMIT] in /trunk: idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/CASAuditFields.j...

[noreply at shibboleth.net]

Author: serac
Date: Tue Jul 14 16:53:17 2015
New Revision: 7636

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7636&view=rev
Log:
IDP-679 Initial work on CAS protocol audit logging.

https://issues.shibboleth.net/jira/browse/IDP-679
Protocol error details have been added to TicketValidationResponse for
consistency with other data that needs to be logged for audit.

Added:
    trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/CASAuditFields.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/GatewayLookupFunction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/RenewLookupFunction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/ServiceLookupFunction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/audit/TicketLookupFunction.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/PopulateProtocolErrorAction.java
Modified:
    trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/ProtocolError.java
    trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/TicketValidationResponse.java
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/flow/BuildSamlValidationFailureMessageAction.java
    trunk/idp-conf/src/main/resources/system/conf/audit-system.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/cas-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/cas-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/views/cas/proxyFailure.vm
    trunk/idp-conf/src/main/resources/system/views/cas/validateFailure.vm

Modified: trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/ProtocolError.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/ProtocolError.java?rev=7636&r1=7635&r2=7636&view=diff
==============================================================================
--- trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/ProtocolError.java	(original)
+++ trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/ProtocolError.java	Tue Jul 14 16:53:17 2015
@@ -19,6 +19,8 @@
 
 import org.springframework.webflow.core.collection.LocalAttributeMap;
 import org.springframework.webflow.execution.Event;
+
+import javax.annotation.Nonnull;
 
 /**
  * CAS protocol errors.
@@ -92,6 +94,14 @@
         this.detailCode = detailCode;
     }
 
+    @Nonnull public String getCode() {
+        return code;
+    }
+
+    @Nonnull public String getDetailCode() {
+        return detailCode;
+    }
+
     /**
      * Creates a Spring webflow event whose ID is given by {@link #name()}} and contains the following attributes:
      *
@@ -106,7 +116,7 @@
      *
      * @return Spring webflow event.
      */
-    public Event event(final Object source) {
+    @Nonnull public Event event(final Object source) {
         final LocalAttributeMap attributes = new LocalAttributeMap();
         attributes.put("code", this.code);
         attributes.put("detailCode", this.detailCode);

Modified: trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/TicketValidationResponse.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/TicketValidationResponse.java?rev=7636&r1=7635&r2=7636&view=diff
==============================================================================
--- trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/TicketValidationResponse.java	(original)
+++ trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/protocol/TicketValidationResponse.java	Tue Jul 14 16:53:17 2015
@@ -30,7 +30,13 @@
  * @author Marvin S. Addison
  */
 public class TicketValidationResponse {
-    @Nonnull private String userName;
+    /** CAS protocol error code populated on ticket validation failure. */
+    @Nullable private String errorCode;
+
+    /** CAS protocol error detail populated on ticket validation failure. */
+    @Nullable private String errorDetail;
+
+    @Nullable private String userName;
 
     @Nonnull private Map<String, List<String>> attributes = new HashMap<>();
 
@@ -38,7 +44,27 @@
 
     @Nonnull private List<String> proxies = new ArrayList<>();
 
-    @Nonnull public String getUserName() {
+
+    /** @return Non-null error code on a ticket validation failure condition. */
+    @Nullable public String getErrorCode() {
+        return errorCode;
+    }
+
+    public void setErrorCode(@Nonnull String code) {
+        this.errorCode = code;
+    }
+
+    /** @return Non-null error detail on a ticket validation failure condition. */
+    @Nullable public String getErrorDetail() {
+        return errorDetail;
+    }
+
+    public void setErrorDetail(@Nonnull String code) {
+        this.errorDetail = code;
+    }
+
+    /** @return Non-null subject principal on ticket validation success. */
+    @Nullable public String getUserName() {
         return userName;
     }
 
@@ -48,7 +74,7 @@
     }
 

[... 165 lines stripped ...]