diff options
Diffstat (limited to 'base/server/cmscore/src')
5 files changed, 27 insertions, 59 deletions
diff --git a/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java b/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java index 4d0384a2b..7650998f5 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java +++ b/base/server/cmscore/src/com/netscape/cmscore/apps/CMSEngine.java @@ -62,7 +62,6 @@ import org.mozilla.jss.util.PasswordCallback; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import com.netscape.certsrv.authentication.ISharedToken; import com.netscape.certsrv.acls.ACL; import com.netscape.certsrv.acls.ACLEntry; import com.netscape.certsrv.acls.EACLsException; @@ -70,6 +69,7 @@ import com.netscape.certsrv.acls.IACL; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.apps.ICMSEngine; import com.netscape.certsrv.apps.ICommandQueue; +import com.netscape.certsrv.authentication.ISharedToken; import com.netscape.certsrv.authority.IAuthority; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; @@ -118,7 +118,6 @@ import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestQueue; import com.netscape.certsrv.request.RequestStatus; import com.netscape.cms.logging.Logger; -import com.netscape.cms.logging.SignedAuditLogger; import com.netscape.cmscore.authentication.AuthSubsystem; import com.netscape.cmscore.authentication.VerifiedCert; import com.netscape.cmscore.authentication.VerifiedCerts; @@ -1953,10 +1952,6 @@ public class CMSEngine implements ICMSEngine { return Auditor.getAuditor(); } - public ILogger getSignedAuditLogger() { - return SignedAuditLogger.getLogger(); - } - /** * starts up subsystems in a subsystem list.. */ diff --git a/base/server/cmscore/src/com/netscape/cmscore/cert/CertUtils.java b/base/server/cmscore/src/com/netscape/cmscore/cert/CertUtils.java index 6691f7ab5..7519d6274 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/cert/CertUtils.java +++ b/base/server/cmscore/src/com/netscape/cmscore/cert/CertUtils.java @@ -43,6 +43,8 @@ import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.logging.Logger; +import com.netscape.cms.logging.SignedAuditLogger; import com.netscape.cmsutil.util.Utils; import netscape.security.extensions.NSCertTypeExtension; @@ -73,6 +75,9 @@ import netscape.security.x509.X509Key; * @version $Revision$, $Date$ */ public class CertUtils { + + private static Logger signedAuditLogger = SignedAuditLogger.getLogger(); + public static final String CERT_NEW_REQUEST_HEADER = "-----BEGIN NEW CERTIFICATE REQUEST-----"; public static final String CERT_NEW_REQUEST_TRAILER = "-----END NEW CERTIFICATE REQUEST-----"; public static final String CERT_REQUEST_HEADER = "-----BEGIN CERTIFICATE REQUEST-----"; @@ -83,8 +88,6 @@ public class CertUtils { "-----BEGIN CERTIFICATE REVOCATION LIST-----"; public static final String END_CRL_HEADER = "-----END CERTIFICATE REVOCATION LIST-----"; - - protected static ILogger mSignedAuditLogger = CMS.getSignedAuditLogger(); /** * Remove the header and footer in the PKCS10 request. */ @@ -1089,17 +1092,7 @@ public class CertUtils { * @param msg signed audit log message */ private static 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) { diff --git a/base/server/cmscore/src/com/netscape/cmscore/logging/Auditor.java b/base/server/cmscore/src/com/netscape/cmscore/logging/Auditor.java index 896256184..339f4dc63 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/logging/Auditor.java +++ b/base/server/cmscore/src/com/netscape/cmscore/logging/Auditor.java @@ -29,6 +29,8 @@ import com.netscape.certsrv.logging.IAuditor; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.usrgrp.IGroup; import com.netscape.certsrv.usrgrp.IUGSubsystem; +import com.netscape.cms.logging.Logger; +import com.netscape.cms.logging.SignedAuditLogger; /** * @author Endi S. Dewata @@ -37,7 +39,7 @@ public class Auditor implements IAuditor { public final static Auditor auditor = new Auditor(); - public ILogger signedAuditLogger = CMS.getSignedAuditLogger(); + private static Logger signedAuditLogger = SignedAuditLogger.getLogger(); public static IAuditor getAuditor() { return auditor; @@ -45,8 +47,6 @@ public class Auditor implements IAuditor { @Override public String getSubjectID() { - // if no signed audit object exists, bail - if (signedAuditLogger == null) return null; SessionContext context = SessionContext.getExistingContext(); if (context == null) return ILogger.UNIDENTIFIED; @@ -60,8 +60,6 @@ public class Auditor implements IAuditor { @Override public String getGroups(String subjectID) { - // if no signed audit object exists, bail - if (signedAuditLogger == null) return null; if (subjectID == null || subjectID.equals(ILogger.UNIDENTIFIED)) return ILogger.SIGNED_AUDIT_EMPTY_VALUE; @@ -95,9 +93,6 @@ public class Auditor implements IAuditor { @Override public String getParamString(String scope, String type, String id, Map<String, String> params) { - // if no signed audit object exists, bail - if (signedAuditLogger == null) - return null; StringBuilder parameters = new StringBuilder(); // always identify the scope of the request @@ -209,15 +204,7 @@ public class Auditor implements IAuditor { @Override public void log(String message) { - - if (signedAuditLogger == null) return; - - signedAuditLogger.log( - ILogger.EV_SIGNED_AUDIT, - null, - ILogger.S_SIGNED_AUDIT, - ILogger.LL_SECURITY, - message); + signedAuditLogger.log(message); } @Override diff --git a/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java index e1d6e1572..c95994c74 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java +++ b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java @@ -47,6 +47,8 @@ import com.netscape.certsrv.selftests.EMissingSelfTestException; import com.netscape.certsrv.selftests.ESelfTestException; import com.netscape.certsrv.selftests.ISelfTest; import com.netscape.certsrv.selftests.ISelfTestSubsystem; +import com.netscape.cms.logging.Logger; +import com.netscape.cms.logging.SignedAuditLogger; ////////////////////// // class definition // @@ -62,6 +64,11 @@ import com.netscape.certsrv.selftests.ISelfTestSubsystem; */ public class SelfTestSubsystem implements ISelfTestSubsystem { + + private static ILogEventListener mLogger; + private static ILogger mErrorLogger = CMS.getLogger(); + private static Logger signedAuditLogger = SignedAuditLogger.getLogger(); + //////////////////////// // default parameters // //////////////////////// @@ -77,9 +84,7 @@ public class SelfTestSubsystem @SuppressWarnings("unused") private ISubsystem mOwner; private IConfigStore mConfig = null; - private ILogEventListener mLogger = null; - private ILogger mErrorLogger = CMS.getLogger(); - private ILogger mSignedAuditLogger = CMS.getSignedAuditLogger(); + private String mRootPrefix = null; private String mPrefix = null; @@ -113,18 +118,7 @@ public class SelfTestSubsystem * @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) { @@ -953,8 +947,6 @@ public class SelfTestSubsystem * @param msg self test log message */ public void log(ILogEventListener logger, String msg) { - // in this case, do NOT strip preceding/trailing whitespace - // from passed-in String parameters if (logger != null) { // log the message to the "selftests.log" log diff --git a/base/server/cmscore/src/com/netscape/cmscore/session/SessionTimer.java b/base/server/cmscore/src/com/netscape/cmscore/session/SessionTimer.java index c6db13190..18e038a33 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/session/SessionTimer.java +++ b/base/server/cmscore/src/com/netscape/cmscore/session/SessionTimer.java @@ -25,10 +25,15 @@ import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.ISecurityDomainSessionTable; import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.cms.logging.Logger; +import com.netscape.cms.logging.SignedAuditLogger; public class SessionTimer extends TimerTask { + + private static Logger signedAuditLogger = SignedAuditLogger.getLogger(); + private ISecurityDomainSessionTable m_sessiontable = null; - private ILogger mSignedAuditLogger = CMS.getSignedAuditLogger(); + public SessionTimer(ISecurityDomainSessionTable table) { super(); m_sessiontable = table; @@ -64,11 +69,7 @@ public class SessionTimer extends TimerTask { ILogger.SUCCESS, auditParams); - mSignedAuditLogger.log(ILogger.EV_SIGNED_AUDIT, - null, - ILogger.S_SIGNED_AUDIT, - ILogger.LL_SECURITY, - auditMessage); + signedAuditLogger.log(auditMessage); } } |