diff options
Diffstat (limited to 'base/ca/src/com/netscape')
-rw-r--r-- | base/ca/src/com/netscape/ca/CAService.java | 27 | ||||
-rw-r--r-- | base/ca/src/com/netscape/ca/CRLIssuingPoint.java | 16 |
2 files changed, 11 insertions, 32 deletions
diff --git a/base/ca/src/com/netscape/ca/CAService.java b/base/ca/src/com/netscape/ca/CAService.java index c9eacfe42..a9b38e7c2 100644 --- a/base/ca/src/com/netscape/ca/CAService.java +++ b/base/ca/src/com/netscape/ca/CAService.java @@ -59,6 +59,8 @@ 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.cms.logging.Logger; +import com.netscape.cms.logging.SignedAuditLogger; import com.netscape.cmscore.base.SubsystemRegistry; import com.netscape.cmscore.connector.HttpConnector; import com.netscape.cmscore.connector.LocalConnector; @@ -103,6 +105,8 @@ import netscape.security.x509.X509ExtensionException; */ public class CAService implements ICAService, IService { + private static Logger signedAuditLogger = SignedAuditLogger.getLogger(); + public static final String CRMF_REQUEST = "CRMFRequest"; public static final String CHALLENGE_PHRASE = "challengePhrase"; public static final String SERIALNO_ARRAY = "serialNoArray"; @@ -117,8 +121,6 @@ public class CAService implements ICAService, IService { private boolean mArchivalRequired = true; private Hashtable<String, ICRLIssuingPoint> mCRLIssuingPoints = new Hashtable<String, ICRLIssuingPoint>(); - private ILogger mSignedAuditLogger = CMS.getSignedAuditLogger(); - public CAService(ICertificateAuthority ca) { mCA = ca; @@ -1154,18 +1156,7 @@ public class CAService implements ICAService, IService { * @param msg signed audit log message */ private void audit(String msg) { - // in this case, do NOT strip preceding/trailing whitespace - // from passed-in String parameters - - if (mSignedAuditLogger == null) { - return; - } - - mSignedAuditLogger.log(ILogger.EV_SIGNED_AUDIT, - null, - ILogger.S_SIGNED_AUDIT, - ILogger.LL_SECURITY, - msg); + signedAuditLogger.log(msg); } protected void audit(AuditEvent event) { @@ -1188,10 +1179,6 @@ public class CAService implements ICAService, IService { * @return id string containing the signed audit log message SubjectID */ private String auditSubjectID() { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String subjectID = null; @@ -1224,10 +1211,6 @@ public class CAService implements ICAService, IService { * @return id string containing the signed audit log message RequesterID */ private String auditRequesterID() { - // if no signed audit object exists, bail - if (mSignedAuditLogger == null) { - return null; - } String requesterID = null; diff --git a/base/ca/src/com/netscape/ca/CRLIssuingPoint.java b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java index be6ffa877..984971513 100644 --- a/base/ca/src/com/netscape/ca/CRLIssuingPoint.java +++ b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java @@ -64,6 +64,8 @@ import com.netscape.certsrv.request.IRequestQueue; import com.netscape.certsrv.request.IRequestVirtualList; import com.netscape.certsrv.request.RequestId; import com.netscape.certsrv.util.IStatsSubsystem; +import com.netscape.cms.logging.Logger; +import com.netscape.cms.logging.SignedAuditLogger; import com.netscape.cmscore.dbs.CRLIssuingPointRecord; import com.netscape.cmscore.dbs.CertRecord; import com.netscape.cmscore.dbs.CertificateRepository; @@ -106,6 +108,9 @@ import netscape.security.x509.X509CertImpl; public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { + private static ILogger mLogger = CMS.getLogger(); + private static Logger signedAuditLogger = SignedAuditLogger.getLogger(); + /* Foreign config param for IssuingDistributionPointExtension. */ public static final String PROP_CACERTS = "onlyContainsCACerts"; @@ -120,8 +125,6 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { public IPublisherProcessor mPublisherProcessor = null; - private ILogger mLogger = CMS.getLogger(); - private IConfigStore mConfigStore; private int mCountMod = 0; @@ -3189,19 +3192,12 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { void audit(AuditEvent event) { - ILogger logger = CMS.getSignedAuditLogger(); - if (logger == null) return; - String messageID = event.getMessage(); Object[] params = event.getParameters(); String message = CMS.getLogMessage(messageID, params); - logger.log(ILogger.EV_SIGNED_AUDIT, - null, - ILogger.S_SIGNED_AUDIT, - ILogger.LL_SECURITY, - message); + signedAuditLogger.log(message); } } |