Make sure archivalID is passed through archival

There was some confusion in the previous commit for archival
logging.  The archivalID is the id provided by the CA for the archival
and is its requestID.  This allows the cert request operation
to be tracked through the archival.

Made sure therefore, that we have two fields - one for the archivalID
and one for the requestId (which is the KRA archival request ID)

In addition, some of the archival events occur in the CA component
just before the request id sent to the KRA.  These events will not
be displayed unless the audit event is added to the CA CS.cfg.

Change-Id: I3904d42ae677d5916385e0120f0e25311b4d9d08

1 files changed, 17 insertions, 5 deletions

diff --git a/base/ca/src/com/netscape/ca/CAService.java b/base/ca/src/com/netscape/ca/CAService.java
index 45fae66d4..c9eacfe42 100644
--- a/base/ca/src/com/netscape/ca/CAService.java
+++ b/base/ca/src/com/netscape/ca/CAService.java
@@ -58,6 +58,7 @@ import com.netscape.certsrv.profile.IProfile;
 import com.netscape.certsrv.profile.IProfileSubsystem;
 import com.netscape.certsrv.request.IRequest;
 import com.netscape.certsrv.request.IService;
+import com.netscape.certsrv.request.RequestId;
 import com.netscape.cmscore.base.SubsystemRegistry;
 import com.netscape.cmscore.connector.HttpConnector;
 import com.netscape.cmscore.connector.LocalConnector;
@@ -371,6 +372,7 @@ public class CAService implements ICAService, IService {
     public boolean serviceRequest(IRequest request) {
         String auditSubjectID = auditSubjectID();
         String auditRequesterID = auditRequesterID();
+        RequestId requestId = request.getRequestId();
 
         boolean completed = false;
 
@@ -422,7 +424,9 @@ public class CAService implements ICAService, IService {
                 audit(new SecurityDataArchivalEvent(
                         auditSubjectID,
                         ILogger.SUCCESS,
-                        auditRequesterID));
+                        auditRequesterID,
+                        requestId,
+                        null));
 
                 boolean sendStatus = mKRAConnector.send(request);
 
@@ -437,7 +441,9 @@ public class CAService implements ICAService, IService {
                         audit(new SecurityDataArchivalEvent(
                                 auditSubjectID,
                                 ILogger.FAILURE,
-                                auditRequesterID));
+                                auditRequesterID,
+                                requestId,
+                                null));
 
                         return true;
                     } else {
@@ -451,7 +457,9 @@ public class CAService implements ICAService, IService {
                         audit(new SecurityDataArchivalEvent(
                                 auditSubjectID,
                                 ILogger.FAILURE,
-                                auditRequesterID));
+                                auditRequesterID,
+                                requestId,
+                                null));
 
                         return true;
                     }
@@ -474,7 +482,9 @@ public class CAService implements ICAService, IService {
                 audit(new SecurityDataArchivalEvent(
                         auditSubjectID,
                         ILogger.FAILURE,
-                        auditRequesterID));
+                        auditRequesterID,
+                        requestId,
+                        null));
             }
 
             return true;
@@ -490,7 +500,9 @@ public class CAService implements ICAService, IService {
             audit(new SecurityDataArchivalEvent(
                     auditSubjectID,
                     ILogger.SUCCESS,
-                    auditRequesterID));
+                    auditRequesterID,
+                    requestId,
+                    null));
         }
 
         return completed;