Refactored CertRequestProcessedEvent to use AuditEvent attributes.

The CertRequestProcessedEvent constructors have been modified to
log the info attributes using the new AuditEvent attributes.

The logging property for CERT_REQUEST_PROCESSED event has been
modified to accept a list of attributes as a single string instead
of individual info attributes.

The CERT_REQUEST_PROCESSED constant in AuditEvent has been replaced
with a constant in CertRequestProcessedEvent class which points to
the new logging property.

https://pagure.io/dogtagpki/issue/2655

Change-Id: I981212af7fca58916c73ccdeba9919a4d051af3c

3 files changed, 19 insertions, 12 deletions

diff --git a/base/common/src/com/netscape/certsrv/logging/AuditEvent.java b/base/common/src/com/netscape/certsrv/logging/AuditEvent.java
index ff5d344d9..523b204d7 100644
--- a/base/common/src/com/netscape/certsrv/logging/AuditEvent.java
+++ b/base/common/src/com/netscape/certsrv/logging/AuditEvent.java
@@ -103,8 +103,6 @@ public class AuditEvent implements IBundleLogEvent {
             "LOGGING_SIGNED_AUDIT_NON_PROFILE_CERT_REQUEST_5";
     public final static String PROFILE_CERT_REQUEST =
             "LOGGING_SIGNED_AUDIT_PROFILE_CERT_REQUEST_5";
-    public final static String CERT_REQUEST_PROCESSED =
-            "LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED_5";
     public final static String CERT_STATUS_CHANGE_REQUEST =
             "LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_5";
     public final static String CERT_STATUS_CHANGE_REQUEST_PROCESSED =
diff --git a/base/common/src/com/netscape/certsrv/logging/event/CertRequestProcessedEvent.java b/base/common/src/com/netscape/certsrv/logging/event/CertRequestProcessedEvent.java
index a17f7d500..51556727c 100644
--- a/base/common/src/com/netscape/certsrv/logging/event/CertRequestProcessedEvent.java
+++ b/base/common/src/com/netscape/certsrv/logging/event/CertRequestProcessedEvent.java
@@ -30,6 +30,9 @@ public class CertRequestProcessedEvent extends AuditEvent {
 
     private static final long serialVersionUID = 1L;
 
+    private final static String LOGGING_PROPERTY =
+            "LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED";
+
     public final static String SIGNED_AUDIT_CERT_REQUEST_REASON = "requestNotes";
 
     public CertRequestProcessedEvent(
@@ -39,14 +42,16 @@ public class CertRequestProcessedEvent extends AuditEvent {
             String infoName,
             String infoValue) {
 
-        super(CERT_REQUEST_PROCESSED);
+        super(LOGGING_PROPERTY);
+
+        setAttribute("InfoName", infoName);
+        setAttribute("InfoValue", infoValue);
 
         setParameters(new Object[] {
                 subjectID,
                 outcome,
                 requesterID,
-                infoName,
-                infoValue
+                getAttributeList()
         });
     }
 
@@ -57,14 +62,16 @@ public class CertRequestProcessedEvent extends AuditEvent {
             String infoName,
             X509CertImpl x509cert) {
 
-        super(CERT_REQUEST_PROCESSED);
+        super(LOGGING_PROPERTY);
+
+        setAttribute("InfoName", infoName);
+        setAttribute("InfoValue", auditInfoCertValue(x509cert));
 
         setParameters(new Object[] {
                 subjectID,
                 outcome,
                 requesterID,
-                infoName,
-                auditInfoCertValue(x509cert)
+                getAttributeList()
         });
     }
 
@@ -75,14 +82,16 @@ public class CertRequestProcessedEvent extends AuditEvent {
             String infoName,
             IRequest request) {
 
-        super(CERT_REQUEST_PROCESSED);
+        super(LOGGING_PROPERTY);
+
+        setAttribute("InfoName", infoName);
+        setAttribute("InfoValue", auditInfoValue(request));
 
         setParameters(new Object[] {
                 subjectID,
                 outcome,
                 requesterID,
-                infoName,
-                auditInfoValue(request)
+                getAttributeList()
         });
     }
 
diff --git a/base/server/cmsbundle/src/LogMessages.properties b/base/server/cmsbundle/src/LogMessages.properties
index d3ac06a54..1a5b37a6a 100644
--- a/base/server/cmsbundle/src/LogMessages.properties
+++ b/base/server/cmsbundle/src/LogMessages.properties
@@ -2088,7 +2088,7 @@ LOGGING_SIGNED_AUDIT_PROFILE_CERT_REQUEST_5=<type=PROFILE_CERT_REQUEST>:[AuditEv
 # InfoValue must contain the certificate (in case of success), a reject reason in
 #        text, or a cancel reason in text
 #
-LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED_5=<type=CERT_REQUEST_PROCESSED>:[AuditEvent=CERT_REQUEST_PROCESSED][SubjectID={0}][Outcome={1}][ReqID={2}][InfoName={3}][InfoValue={4}] certificate request processed
+LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED=<type=CERT_REQUEST_PROCESSED>:[AuditEvent=CERT_REQUEST_PROCESSED][SubjectID={0}][Outcome={1}][ReqID={2}]{3} certificate request processed
 #
 # LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST
 # - used when a certificate status change request (e.g. revocation)