diff options
Diffstat (limited to 'base/server/cms/src/com/netscape/cms/servlet/cert')
4 files changed, 7 insertions, 41 deletions
diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java b/base/server/cms/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java index a66cd9574..7dad38820 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/cert/CMCRevReqServlet.java @@ -981,10 +981,6 @@ public class CMCRevReqServlet extends CMSServlet { * @return id string containing the signed audit log message RequesterID */ private String auditRequesterID(HttpServletRequest req) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String requesterID = null; @@ -1011,10 +1007,6 @@ public class CMCRevReqServlet extends CMSServlet { * @return id string containing the signed audit log message RequesterID */ private String auditSerialNumber(String eeSerialNumber) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String serialNumber = null; @@ -1044,10 +1036,6 @@ public class CMCRevReqServlet extends CMSServlet { * @return string containing REVOKE or ON_HOLD */ private String auditRequestType(int reason) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String requestType = null; diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java index a9a62389f..eab05edff 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java +++ b/base/server/cms/src/com/netscape/cms/servlet/cert/DoRevokeTPS.java @@ -847,10 +847,6 @@ public class DoRevokeTPS extends CMSServlet { * @return id string containing the signed audit log message RequesterID */ private String auditRequesterID(HttpServletRequest req) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String requesterID = null; @@ -878,10 +874,6 @@ public class DoRevokeTPS extends CMSServlet { * @return id string containing the signed audit log message RequesterID */ private String auditSerialNumber(String eeSerialNumber) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String serialNumber = null; @@ -909,10 +901,6 @@ public class DoRevokeTPS extends CMSServlet { * @return string containing REVOKE or ON_HOLD */ private String auditRequestType(int reason) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String requestType = null; diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java b/base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java index 36a6802d6..6a83fcefe 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java +++ b/base/server/cms/src/com/netscape/cms/servlet/cert/DoUnrevokeTPS.java @@ -557,10 +557,6 @@ public class DoUnrevokeTPS extends CMSServlet { * @return id string containing the signed audit log message RequesterID */ private String auditRequesterID(HttpServletRequest req) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String requesterID = null; @@ -588,10 +584,6 @@ public class DoUnrevokeTPS extends CMSServlet { * @return id string containing the signed audit log message RequesterID */ private String auditSerialNumber(String eeSerialNumber) { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String serialNumber = null; diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/base/server/cms/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java index 150c36fb7..e31ed1b2e 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java +++ b/base/server/cms/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java @@ -87,6 +87,8 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestQueue; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.request.RequestStatus; +import com.netscape.cms.logging.Logger; +import com.netscape.cms.logging.SignedAuditLogger; import com.netscape.cms.servlet.profile.SSLClientCertProvider; import com.netscape.cmsutil.crypto.CryptoUtil; import com.netscape.cmsutil.scep.CRSPKIMessage; @@ -136,10 +138,11 @@ import netscape.security.x509.X509Key; * @version $Revision$, $Date$ */ public class CRSEnrollment extends HttpServlet { - /** - * - */ + + private static Logger signedAuditLogger = SignedAuditLogger.getLogger(); + private static final long serialVersionUID = 8483002540957382369L; + protected IProfileSubsystem mProfileSubsystem = null; protected String mProfileId = null; protected ICertAuthority mAuthority; @@ -1502,12 +1505,7 @@ public class CRSEnrollment extends HttpServlet { req.getTransactionID(), "CRSEnrollment", ILogger.SIGNED_AUDIT_EMPTY_VALUE); - ILogger signedAuditLogger = CMS.getSignedAuditLogger(); - if (signedAuditLogger != null) { - signedAuditLogger.log(ILogger.EV_SIGNED_AUDIT, - null, ILogger.S_SIGNED_AUDIT, - ILogger.LL_SECURITY, auditMessage); - } + signedAuditLogger.log(auditMessage); return null; } else { |