From 41fcfc470c6462bc069774c74ecfe2fe09cf6ac3 Mon Sep 17 00:00:00 2001
From: "Endi S. Dewata" <edewata@redhat.com>
Date: Thu, 20 Apr 2017 04:24:18 +0200
Subject: Refactored ConnectorServlet.auditInfoCertValue().

The ConnectorServlet.auditInfoCertValue() has been refactored to
accept X509CertImpl like CAProcessor.auditInfoCertValue().

Change-Id: I42f4a17a20f43a8c9dd2b329b07de3a23da7ca33
---
 .../cms/servlet/connector/ConnectorServlet.java      | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'base/server/cms/src')

diff --git a/base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java b/base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
index 9c75cc14a..6732e9286 100644
--- a/base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
+++ b/base/server/cms/src/com/netscape/cms/servlet/connector/ConnectorServlet.java
@@ -424,9 +424,6 @@ public class ConnectorServlet extends CMSServlet {
         String auditCertificateSubjectName = ILogger.SIGNED_AUDIT_EMPTY_VALUE;
         String subject = null;
 
-        // additional parms for LOGGING_SIGNED_AUDIT_CERT_REQUEST_PROCESSED
-        String auditInfoCertValue = ILogger.SIGNED_AUDIT_EMPTY_VALUE;
-
         // "normalize" the "auditSubjectID"
         if (auditSubjectID != null) {
             auditSubjectID = auditSubjectID.trim();
@@ -622,8 +619,9 @@ public class ConnectorServlet extends CMSServlet {
                 queue.processRequest(thisreq);
 
                 if (isProfileRequest(thisreq)) {
-                    // reset the "auditInfoCertValue"
-                    auditInfoCertValue = auditInfoCertValue(thisreq);
+
+                    X509CertImpl x509cert = thisreq.getExtDataInCert(IEnrollProfile.REQUEST_ISSUED_CERT);
+                    String auditInfoCertValue = auditInfoCertValue(x509cert);
 
                     if (auditInfoCertValue != null) {
                         if (!(auditInfoCertValue.equals(
@@ -643,8 +641,9 @@ public class ConnectorServlet extends CMSServlet {
                 }
             } catch (EBaseException eAudit1) {
                 if (isProfileRequest(thisreq)) {
-                    // reset the "auditInfoCertValue"
-                    auditInfoCertValue = auditInfoCertValue(thisreq);
+
+                    X509CertImpl x509cert = thisreq.getExtDataInCert(IEnrollProfile.REQUEST_ISSUED_CERT);
+                    String auditInfoCertValue = auditInfoCertValue(x509cert);
 
                     if (auditInfoCertValue != null) {
                         if (!(auditInfoCertValue.equals(
@@ -1068,18 +1067,15 @@ public class ConnectorServlet extends CMSServlet {
      * "X509CertImpl" for a signed audit log message.
      * <P>
      *
-     * @param request a 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;
         }
-- 
cgit