From e74fca2ced2416d656a09613e6e56657f4f88d20 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Thu, 20 Apr 2017 04:29:40 +0200
Subject: [PATCH] Refactored ProfileSubmitCMCServlet.auditInfoCertValue().

The ProfileSubmitCMCServlet.auditInfoCertValue() has been modified
to accept X509CertImpl like CAProcessor.auditInfoCertValue().

Change-Id: Ib3b4c4c19250df73a769590488cb5716a50a065b
---
 .../servlet/profile/ProfileSubmitCMCServlet.java | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
index 83bab5b7ef3..c3ada9a680f 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/profile/ProfileSubmitCMCServlet.java
@@ -642,7 +642,6 @@ public void process(CMSRequest cmsReq) throws EBaseException {
         String auditMessage = null;
         String auditSubjectID = auditSubjectID();
         String auditRequesterID = ILogger.UNIDENTIFIED;
-        String auditInfoCertValue = ILogger.SIGNED_AUDIT_EMPTY_VALUE;
 
         try {
             ///////////////////////////////////////////////
@@ -672,8 +671,8 @@ public void process(CMSRequest cmsReq) throws EBaseException {
                     profile.submit(authToken, reqs[k]);
                     reqs[k].setRequestStatus(RequestStatus.COMPLETE);
 
-                    // reset the "auditInfoCertValue"
-                    auditInfoCertValue = auditInfoCertValue(reqs[k]);
+                    X509CertImpl x509cert = reqs[k].getExtDataInCert(IEnrollProfile.REQUEST_ISSUED_CERT);
+                    String auditInfoCertValue = auditInfoCertValue(x509cert);
 
                     if (auditInfoCertValue != null) {
                         if (!(auditInfoCertValue.equals(
@@ -777,8 +776,8 @@ public void process(CMSRequest cmsReq) throws EBaseException {
                     profile.getRequestQueue().markAsServiced(provedReq);
                     CMS.debug("ProfileSubmitCMCServlet: provedReq set to complete");
 
-                    // reset the "auditInfoCertValue"
-                    auditInfoCertValue = auditInfoCertValue(reqs[0]);
+                    X509CertImpl x509cert = reqs[0].getExtDataInCert(IEnrollProfile.REQUEST_ISSUED_CERT);
+                    String auditInfoCertValue = auditInfoCertValue(x509cert);
 
                     if (auditInfoCertValue != null) {
                         if (!(auditInfoCertValue.equals(
@@ -896,18 +895,15 @@ private String auditRequesterID(IRequest request) {
      * "X509CertImpl" for a signed audit log message.
      * <P>
      *
-     * @param request request containing an X509CertImpl
+     * @param x509cert an X509CertImpl
      * @return cert string containing the certificate
      */
-    private String auditInfoCertValue(IRequest request) {
+    private String auditInfoCertValue(X509CertImpl x509cert) {
         // if no signed audit object exists, bail
         if (mSignedAuditLogger == null) {
             return null;
         }
 
-        X509CertImpl x509cert = request.getExtDataInCert(
-                IEnrollProfile.REQUEST_ISSUED_CERT);
-
         if (x509cert == null) {
             return ILogger.SIGNED_AUDIT_EMPTY_VALUE;
         }