diff options
author | Endi S. Dewata <edewata@redhat.com> | 2017-04-20 03:43:06 +0200 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2017-04-20 18:16:12 +0200 |
commit | 4a28ac15f5552d6594b6f6bb58af8f076ab5c46f (patch) | |
tree | 7b4568e2cee01b87473ee98f08a343b5d07e6e04 | |
parent | 17e71d3ec1f52cc2e13590499dd70c5932885b20 (diff) | |
download | pki-4a28ac15f5552d6594b6f6bb58af8f076ab5c46f.tar.gz pki-4a28ac15f5552d6594b6f6bb58af8f076ab5c46f.tar.xz pki-4a28ac15f5552d6594b6f6bb58af8f076ab5c46f.zip |
Refactored CAProcessor.auditInfoCertValue().
The auditInfoCertValue(IRequest) in CAProcessor has been merged
into auditInfoCertValue(X509CertImpl) since they are identical.
Change-Id: Iccdad7a3c1ff3bc05f1f0ac1830eada21337dfca
-rw-r--r-- | base/server/cms/src/com/netscape/cms/servlet/cert/CertProcessor.java | 8 | ||||
-rw-r--r-- | base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java | 57 |
2 files changed, 5 insertions, 60 deletions
diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/CertProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CertProcessor.java index 156060a2c..c16d8e0fa 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/cert/CertProcessor.java +++ b/base/server/cms/src/com/netscape/cms/servlet/cert/CertProcessor.java @@ -36,6 +36,7 @@ import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.profile.EDeferException; import com.netscape.certsrv.profile.ERejectException; +import com.netscape.certsrv.profile.IEnrollProfile; import com.netscape.certsrv.profile.IProfile; import com.netscape.certsrv.profile.IProfileAuthenticator; import com.netscape.certsrv.profile.IProfileContext; @@ -51,6 +52,8 @@ import com.netscape.cms.servlet.processors.CAProcessor; import com.netscape.cms.tomcat.ExternalPrincipal; import com.netscape.cmsutil.ldap.LDAPUtil; +import netscape.security.x509.X509CertImpl; + public class CertProcessor extends CAProcessor { public CertProcessor(String id, Locale locale) throws EPropertyNotFound, EBaseException { @@ -217,7 +220,6 @@ public class CertProcessor extends CAProcessor { String auditMessage = null; String auditSubjectID = auditSubjectID(); String auditRequesterID = ILogger.UNIDENTIFIED; - String auditInfoCertValue = ILogger.SIGNED_AUDIT_EMPTY_VALUE; String errorCode = null; String errorReason = null; @@ -244,8 +246,8 @@ public class CertProcessor extends CAProcessor { profile.submit(authToken, req); req.setRequestStatus(RequestStatus.COMPLETE); - // reset the "auditInfoCertValue" - auditInfoCertValue = auditInfoCertValue(req); + X509CertImpl x509cert = req.getExtDataInCert(IEnrollProfile.REQUEST_ISSUED_CERT); + String auditInfoCertValue = auditInfoCertValue(x509cert); if (auditInfoCertValue != null) { if (!(auditInfoCertValue.equals( diff --git a/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java index 4bc738c04..a98d55571 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java +++ b/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java @@ -53,7 +53,6 @@ import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; -import com.netscape.certsrv.profile.IEnrollProfile; import com.netscape.certsrv.profile.IProfile; import com.netscape.certsrv.profile.IProfileAuthenticator; import com.netscape.certsrv.profile.IProfileSubsystem; @@ -985,62 +984,6 @@ public class CAProcessor extends Processor { return requesterID; } - /** - * Signed Audit Log Info Certificate Value - * - * This method is called to obtain the certificate from the passed in - * "X509CertImpl" for a signed audit log message. - * <P> - * - * @param request request containing an X509CertImpl - * @return cert string containing the certificate - */ - protected String auditInfoCertValue(IRequest request) { - // if no signed audit object exists, bail - if (signedAuditLogger == null) { - return null; - } - - X509CertImpl x509cert = request.getExtDataInCert( - IEnrollProfile.REQUEST_ISSUED_CERT); - - if (x509cert == null) { - return ILogger.SIGNED_AUDIT_EMPTY_VALUE; - } - - byte rawData[] = null; - - try { - rawData = x509cert.getEncoded(); - } catch (CertificateEncodingException e) { - return ILogger.SIGNED_AUDIT_EMPTY_VALUE; - } - - String cert = null; - - // convert "rawData" into "base64Data" - if (rawData != null) { - String base64Data = null; - - base64Data = Utils.base64encode(rawData).trim(); - - // concatenate lines - cert = base64Data.replace("\r", "").replace("\n", ""); - } - - if (cert != null) { - cert = cert.trim(); - - if (cert.equals("")) { - return ILogger.SIGNED_AUDIT_EMPTY_VALUE; - } else { - return cert; - } - } else { - return ILogger.SIGNED_AUDIT_EMPTY_VALUE; - } - } - protected String auditSubjectID() { // if no signed audit object exists, bail if (signedAuditLogger == null) { |