From c297d987d29755452b192ae1306610733381771a Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Sat, 24 Jun 2017 04:11:41 +0200 Subject: Consolidated log() for audit events. Duplicate log() methods for audit events have been merged into the Logger class. https://pagure.io/dogtagpki/issue/2689 Change-Id: I7a5147ff3221a52a82e69f56faf2156c04256db2 --- base/ca/src/com/netscape/ca/CAService.java | 12 +++------- base/ca/src/com/netscape/ca/CRLIssuingPoint.java | 12 +++------- .../dogtagpki/server/ca/rest/AuthorityService.java | 2 +- .../dogtagpki/server/ca/rest/ProfileService.java | 4 ++-- .../src/com/netscape/certsrv/logging/IAuditor.java | 7 ------ .../src/com/netscape/kra/AsymKeyGenService.java | 12 +++------- .../src/com/netscape/kra/EnrollmentService.java | 12 +++------- .../src/com/netscape/kra/KeyRecoveryAuthority.java | 12 +++------- .../src/com/netscape/kra/NetkeyKeygenService.java | 12 +++------- .../com/netscape/kra/SecurityDataProcessor.java | 12 +++------- .../netscape/kra/SecurityDataRecoveryService.java | 12 +++------- .../kra/src/com/netscape/kra/SymKeyGenService.java | 12 +++------- .../com/netscape/kra/TokenKeyRecoveryService.java | 12 +++------- .../com/netscape/cms/authentication/CMCAuth.java | 11 +++------ .../cms/authentication/CMCUserSignedAuth.java | 11 +++------ .../cms/src/com/netscape/cms/logging/LogFile.java | 11 +++------ .../cms/src/com/netscape/cms/logging/Logger.java | 12 ++++++++++ .../netscape/cms/profile/common/BasicProfile.java | 12 +++------- .../netscape/cms/profile/input/EnrollInput.java | 11 +++------ .../cms/profile/updater/SubsystemGroupUpdater.java | 12 +++------- .../cms/src/com/netscape/cms/realm/PKIRealm.java | 12 +++------- .../netscape/cms/servlet/admin/AdminServlet.java | 26 +++++++--------------- .../cms/servlet/admin/GroupMemberProcessor.java | 2 +- .../com/netscape/cms/servlet/base/CMSServlet.java | 14 ++++-------- .../cms/servlet/base/SubsystemService.java | 19 ++++++++-------- .../cms/servlet/cert/RevocationProcessor.java | 4 ++-- .../cms/servlet/common/CMCOutputTemplate.java | 12 +++------- .../cms/servlet/connector/ConnectorServlet.java | 14 +++--------- .../cms/servlet/processors/CAProcessor.java | 16 +++---------- .../cms/servlet/processors/PKIProcessor.java | 12 +++------- .../netscape/cms/servlet/processors/Processor.java | 4 ++++ .../dogtagpki/server/PKIServerSocketListener.java | 15 +++++-------- .../org/dogtagpki/server/rest/ACLInterceptor.java | 12 +++------- .../org/dogtagpki/server/rest/AuditService.java | 2 +- .../org/dogtagpki/server/rest/GroupService.java | 2 +- .../src/org/dogtagpki/server/rest/UserService.java | 4 ++-- .../src/com/netscape/cmscore/cert/CertUtils.java | 12 +++------- .../src/com/netscape/cmscore/logging/Auditor.java | 21 ----------------- .../cmscore/selftests/SelfTestSubsystem.java | 11 +++------ .../server/tps/processor/TPSProcessor.java | 11 +++------ .../server/tps/rest/AuthenticatorService.java | 3 +-- .../server/tps/rest/ConnectorService.java | 2 +- .../server/tps/rest/ProfileMappingService.java | 2 +- .../dogtagpki/server/tps/rest/ProfileService.java | 3 +-- .../dogtagpki/server/tps/rest/TokenService.java | 6 ++--- 45 files changed, 133 insertions(+), 321 deletions(-) diff --git a/base/ca/src/com/netscape/ca/CAService.java b/base/ca/src/com/netscape/ca/CAService.java index a9b38e7c2..012d87be5 100644 --- a/base/ca/src/com/netscape/ca/CAService.java +++ b/base/ca/src/com/netscape/ca/CAService.java @@ -50,8 +50,8 @@ import com.netscape.certsrv.dbs.ModificationSet; import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.dbs.certdb.ICertRecordList; import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.event.SecurityDataArchivalEvent; import com.netscape.certsrv.profile.EProfileException; import com.netscape.certsrv.profile.IProfile; @@ -1159,14 +1159,8 @@ public class CAService implements ICAService, IService { signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } /** diff --git a/base/ca/src/com/netscape/ca/CRLIssuingPoint.java b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java index 984971513..3ed73ee1c 100644 --- a/base/ca/src/com/netscape/ca/CRLIssuingPoint.java +++ b/base/ca/src/com/netscape/ca/CRLIssuingPoint.java @@ -49,9 +49,9 @@ import com.netscape.certsrv.dbs.certdb.ICertificateRepository; import com.netscape.certsrv.dbs.certdb.IRevocationInfo; import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord; import com.netscape.certsrv.dbs.crldb.ICRLRepository; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.AuditFormat; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.event.DeltaCRLGenerationEvent; import com.netscape.certsrv.logging.event.DeltaCRLPublishingEvent; import com.netscape.certsrv.logging.event.FullCRLGenerationEvent; @@ -3190,14 +3190,8 @@ public class CRLIssuingPoint implements ICRLIssuingPoint, Runnable { return subjectID.trim(); } - void audit(AuditEvent event) { - - String messageID = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(messageID, params); - - signedAuditLogger.log(message); + void audit(LogEvent event) { + signedAuditLogger.log(event); } } diff --git a/base/ca/src/org/dogtagpki/server/ca/rest/AuthorityService.java b/base/ca/src/org/dogtagpki/server/ca/rest/AuthorityService.java index 8502f44ca..062e7f32c 100644 --- a/base/ca/src/org/dogtagpki/server/ca/rest/AuthorityService.java +++ b/base/ca/src/org/dogtagpki/server/ca/rest/AuthorityService.java @@ -399,7 +399,7 @@ public class AuthorityService extends SubsystemService implements AuthorityResou auditor.getSubjectID(), status, auditor.getParamString(ScopeDef.SC_AUTHORITY, op, id, params)); - auditor.log(msg); + signedAuditLogger.log(msg); } } diff --git a/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java b/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java index 8666b9c11..3a68a1c4b 100644 --- a/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java +++ b/base/ca/src/org/dogtagpki/server/ca/rest/ProfileService.java @@ -1191,7 +1191,7 @@ public class ProfileService extends SubsystemService implements ProfileResource status, profileId, op); - auditor.log(msg); + signedAuditLogger.log(msg); } public void auditProfileChange(String scope, String type, String id, String status, Map params) { @@ -1200,7 +1200,7 @@ public class ProfileService extends SubsystemService implements ProfileResource auditor.getSubjectID(), status, auditor.getParamString(scope, type, id, params)); - auditor.log(msg); + signedAuditLogger.log(msg); } } diff --git a/base/common/src/com/netscape/certsrv/logging/IAuditor.java b/base/common/src/com/netscape/certsrv/logging/IAuditor.java index 952122845..497d7bab8 100644 --- a/base/common/src/com/netscape/certsrv/logging/IAuditor.java +++ b/base/common/src/com/netscape/certsrv/logging/IAuditor.java @@ -68,11 +68,4 @@ public interface IAuditor { */ public String getParamString(String scope, String type, String id, Map params); public String getParamString(StringBuilder parameters, Map params); - - /** - * Log audit message. - */ - public void log(String message); - - public void log(AuditEvent event); } diff --git a/base/kra/src/com/netscape/kra/AsymKeyGenService.java b/base/kra/src/com/netscape/kra/AsymKeyGenService.java index 0731a4458..6571044b6 100644 --- a/base/kra/src/com/netscape/kra/AsymKeyGenService.java +++ b/base/kra/src/com/netscape/kra/AsymKeyGenService.java @@ -32,8 +32,8 @@ import com.netscape.certsrv.dbs.keydb.KeyId; import com.netscape.certsrv.key.AsymKeyGenerationRequest; import com.netscape.certsrv.key.KeyRequestResource; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.event.AsymKeyGenerationProcessedEvent; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IService; @@ -220,14 +220,8 @@ public class AsymKeyGenService implements IService { signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } private void auditAsymKeyGenRequestProcessed(String subjectID, String status, RequestId requestID, diff --git a/base/kra/src/com/netscape/kra/EnrollmentService.java b/base/kra/src/com/netscape/kra/EnrollmentService.java index 79c4eb9a8..c60e69a86 100644 --- a/base/kra/src/com/netscape/kra/EnrollmentService.java +++ b/base/kra/src/com/netscape/kra/EnrollmentService.java @@ -48,9 +48,9 @@ import com.netscape.certsrv.dbs.keydb.KeyId; import com.netscape.certsrv.kra.EKRAException; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; import com.netscape.certsrv.kra.ProofOfArchival; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.AuditFormat; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.event.SecurityDataArchivalEvent; import com.netscape.certsrv.logging.event.SecurityDataArchivalProcessedEvent; import com.netscape.certsrv.profile.IEnrollProfile; @@ -998,13 +998,7 @@ public class EnrollmentService implements IService { signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } } diff --git a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java index 190290b5a..5b3afda9d 100644 --- a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java +++ b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java @@ -57,8 +57,8 @@ import com.netscape.certsrv.dbs.replicadb.IReplicaIDRepository; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; import com.netscape.certsrv.kra.IKeyService; import com.netscape.certsrv.listeners.EListenersException; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.event.SecurityDataArchivalEvent; import com.netscape.certsrv.logging.event.SecurityDataArchivalProcessedEvent; import com.netscape.certsrv.logging.event.SecurityDataRecoveryEvent; @@ -1540,14 +1540,8 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } /** diff --git a/base/kra/src/com/netscape/kra/NetkeyKeygenService.java b/base/kra/src/com/netscape/kra/NetkeyKeygenService.java index 0a6aa06c2..f91e2e71c 100644 --- a/base/kra/src/com/netscape/kra/NetkeyKeygenService.java +++ b/base/kra/src/com/netscape/kra/NetkeyKeygenService.java @@ -48,8 +48,8 @@ import com.netscape.certsrv.dbs.keydb.IKeyRecord; import com.netscape.certsrv.dbs.keydb.IKeyRepository; import com.netscape.certsrv.dbs.keydb.KeyId; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.event.SecurityDataArchivalEvent; import com.netscape.certsrv.logging.event.SecurityDataArchivalProcessedEvent; import com.netscape.certsrv.logging.event.SecurityDataExportEvent; @@ -530,13 +530,7 @@ public class NetkeyKeygenService implements IService { signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } } diff --git a/base/kra/src/com/netscape/kra/SecurityDataProcessor.java b/base/kra/src/com/netscape/kra/SecurityDataProcessor.java index f00cb5b3d..c6febd52e 100644 --- a/base/kra/src/com/netscape/kra/SecurityDataProcessor.java +++ b/base/kra/src/com/netscape/kra/SecurityDataProcessor.java @@ -39,8 +39,8 @@ import com.netscape.certsrv.dbs.keydb.KeyId; import com.netscape.certsrv.key.KeyRequestResource; import com.netscape.certsrv.kra.EKRAException; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.event.SecurityDataArchivalProcessedEvent; import com.netscape.certsrv.profile.IEnrollProfile; import com.netscape.certsrv.request.IRequest; @@ -837,14 +837,8 @@ public class SecurityDataProcessor { signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } private void auditArchivalRequestProcessed(String subjectID, String status, RequestId requestID, String clientKeyID, diff --git a/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java b/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java index 4e47ccadf..8a8ed2ef3 100644 --- a/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java +++ b/base/kra/src/com/netscape/kra/SecurityDataRecoveryService.java @@ -23,8 +23,8 @@ import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.dbs.keydb.KeyId; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.event.SecurityDataRecoveryProcessedEvent; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IService; @@ -99,14 +99,8 @@ public class SecurityDataRecoveryService implements IService { return false; //TODO: return true? } - private void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } private void audit(String msg) { diff --git a/base/kra/src/com/netscape/kra/SymKeyGenService.java b/base/kra/src/com/netscape/kra/SymKeyGenService.java index b63c362d0..f798e2f3c 100644 --- a/base/kra/src/com/netscape/kra/SymKeyGenService.java +++ b/base/kra/src/com/netscape/kra/SymKeyGenService.java @@ -36,8 +36,8 @@ import com.netscape.certsrv.dbs.keydb.KeyId; import com.netscape.certsrv.key.KeyRequestResource; import com.netscape.certsrv.key.SymKeyGenerationRequest; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.event.SymKeyGenerationProcessedEvent; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IService; @@ -249,14 +249,8 @@ public class SymKeyGenService implements IService { signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } private void auditSymKeyGenRequestProcessed(String subjectID, String status, RequestId requestID, String clientKeyID, diff --git a/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java b/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java index 46cf5d96b..b801c96a9 100644 --- a/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java +++ b/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java @@ -46,8 +46,8 @@ import com.netscape.certsrv.dbs.keydb.IKeyRepository; import com.netscape.certsrv.dbs.keydb.KeyId; import com.netscape.certsrv.kra.EKRAException; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.event.SecurityDataRecoveryEvent; import com.netscape.certsrv.logging.event.SecurityDataRecoveryProcessedEvent; import com.netscape.certsrv.request.IRequest; @@ -722,13 +722,7 @@ public class TokenKeyRecoveryService implements IService { signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } } diff --git a/base/server/cms/src/com/netscape/cms/authentication/CMCAuth.java b/base/server/cms/src/com/netscape/cms/authentication/CMCAuth.java index 8d70b8dfe..66a356965 100644 --- a/base/server/cms/src/com/netscape/cms/authentication/CMCAuth.java +++ b/base/server/cms/src/com/netscape/cms/authentication/CMCAuth.java @@ -81,6 +81,7 @@ import com.netscape.certsrv.base.IExtendedPluginInfo; import com.netscape.certsrv.base.SessionContext; import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.profile.EProfileException; import com.netscape.certsrv.profile.IProfile; import com.netscape.certsrv.profile.IProfileAuthenticator; @@ -1071,14 +1072,8 @@ public class CMCAuth implements IAuthManager, IExtendedPluginInfo, signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } /** diff --git a/base/server/cms/src/com/netscape/cms/authentication/CMCUserSignedAuth.java b/base/server/cms/src/com/netscape/cms/authentication/CMCUserSignedAuth.java index 4165d50ed..ab9a94ab8 100644 --- a/base/server/cms/src/com/netscape/cms/authentication/CMCUserSignedAuth.java +++ b/base/server/cms/src/com/netscape/cms/authentication/CMCUserSignedAuth.java @@ -83,6 +83,7 @@ import com.netscape.certsrv.base.IExtendedPluginInfo; import com.netscape.certsrv.base.SessionContext; import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.profile.EProfileException; import com.netscape.certsrv.profile.IProfile; import com.netscape.certsrv.profile.IProfileAuthenticator; @@ -1294,14 +1295,8 @@ public class CMCUserSignedAuth implements IAuthManager, IExtendedPluginInfo, signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } /** diff --git a/base/server/cms/src/com/netscape/cms/logging/LogFile.java b/base/server/cms/src/com/netscape/cms/logging/LogFile.java index b28b810f8..1b4aeee0d 100644 --- a/base/server/cms/src/com/netscape/cms/logging/LogFile.java +++ b/base/server/cms/src/com/netscape/cms/logging/LogFile.java @@ -75,6 +75,7 @@ import com.netscape.certsrv.logging.ELogException; import com.netscape.certsrv.logging.ILogEvent; import com.netscape.certsrv.logging.ILogEventListener; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.LogSource; import com.netscape.certsrv.logging.SignedAuditEvent; import com.netscape.certsrv.logging.SystemEvent; @@ -1532,13 +1533,7 @@ public class LogFile implements ILogEventListener, IExtendedPluginInfo { signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } } diff --git a/base/server/cms/src/com/netscape/cms/logging/Logger.java b/base/server/cms/src/com/netscape/cms/logging/Logger.java index 64653c2fa..ecb839f38 100644 --- a/base/server/cms/src/com/netscape/cms/logging/Logger.java +++ b/base/server/cms/src/com/netscape/cms/logging/Logger.java @@ -20,10 +20,12 @@ package com.netscape.cms.logging; import java.util.Hashtable; import java.util.Properties; +import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.logging.ILogEvent; import com.netscape.certsrv.logging.ILogQueue; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.logging.LogCategory; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.LogSource; /** @@ -108,6 +110,16 @@ public class Logger implements ILogger { log(category, null, source, level, msg, null); } + public void log(LogEvent event) { + + String messageID = event.getMessage(); + Object[] params = event.getParameters(); + + String message = CMS.getLogMessage(messageID, params); + + log(message); + } + /** * Logs an event using default log level. * diff --git a/base/server/cms/src/com/netscape/cms/profile/common/BasicProfile.java b/base/server/cms/src/com/netscape/cms/profile/common/BasicProfile.java index bf6193499..ef0b889e0 100644 --- a/base/server/cms/src/com/netscape/cms/profile/common/BasicProfile.java +++ b/base/server/cms/src/com/netscape/cms/profile/common/BasicProfile.java @@ -30,8 +30,8 @@ import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.SessionContext; import com.netscape.certsrv.common.NameValuePairs; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.profile.EProfileException; import com.netscape.certsrv.profile.ERejectException; import com.netscape.certsrv.profile.IPolicyConstraint; @@ -1177,14 +1177,8 @@ public abstract class BasicProfile implements IProfile { signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } /** diff --git a/base/server/cms/src/com/netscape/cms/profile/input/EnrollInput.java b/base/server/cms/src/com/netscape/cms/profile/input/EnrollInput.java index f63f8801c..331988594 100644 --- a/base/server/cms/src/com/netscape/cms/profile/input/EnrollInput.java +++ b/base/server/cms/src/com/netscape/cms/profile/input/EnrollInput.java @@ -32,6 +32,7 @@ import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.SessionContext; import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.profile.EProfileException; import com.netscape.certsrv.profile.IProfile; import com.netscape.certsrv.profile.IProfileContext; @@ -257,14 +258,8 @@ public abstract class EnrollInput implements IProfileInput { signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } /** diff --git a/base/server/cms/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java b/base/server/cms/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java index 453a86c86..795319173 100644 --- a/base/server/cms/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java +++ b/base/server/cms/src/com/netscape/cms/profile/updater/SubsystemGroupUpdater.java @@ -26,8 +26,8 @@ import com.netscape.certsrv.base.ConflictingOperationException; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.base.SessionContext; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.event.ConfigRoleEvent; import com.netscape.certsrv.profile.EProfileException; import com.netscape.certsrv.profile.IEnrollProfile; @@ -265,14 +265,8 @@ public class SubsystemGroupUpdater implements IProfileUpdater { signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } private String auditSubjectID() { diff --git a/base/server/cms/src/com/netscape/cms/realm/PKIRealm.java b/base/server/cms/src/com/netscape/cms/realm/PKIRealm.java index f74b9dac9..7ff0913a0 100644 --- a/base/server/cms/src/com/netscape/cms/realm/PKIRealm.java +++ b/base/server/cms/src/com/netscape/cms/realm/PKIRealm.java @@ -16,8 +16,8 @@ import com.netscape.certsrv.authentication.IAuthToken; import com.netscape.certsrv.authentication.ICertUserDBAuthentication; import com.netscape.certsrv.authentication.IPasswdUserDBAuthentication; import com.netscape.certsrv.base.SessionContext; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.event.AuthFailEvent; import com.netscape.certsrv.logging.event.AuthSuccessEvent; import com.netscape.certsrv.usrgrp.EUsrGrpException; @@ -215,13 +215,7 @@ public class PKIRealm extends RealmBase { signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } } diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java index 5b136be2f..c42b6b776 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java @@ -49,9 +49,9 @@ import com.netscape.certsrv.base.IExtendedPluginInfo; import com.netscape.certsrv.base.SessionContext; import com.netscape.certsrv.common.Constants; import com.netscape.certsrv.common.NameValuePairs; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.IAuditor; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.event.AuthFailEvent; import com.netscape.certsrv.logging.event.AuthSuccessEvent; import com.netscape.certsrv.logging.event.AuthzFailEvent; @@ -60,6 +60,8 @@ import com.netscape.certsrv.logging.event.RoleAssumeEvent; import com.netscape.certsrv.usrgrp.EUsrGrpException; import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.certsrv.usrgrp.IUser; +import com.netscape.cms.logging.Logger; +import com.netscape.cms.logging.SignedAuditLogger; import com.netscape.cms.servlet.base.UserInfo; import com.netscape.cmsutil.util.Utils; @@ -94,9 +96,8 @@ import netscape.security.x509.X509CertImpl; */ public class AdminServlet extends HttpServlet { - /** - * - */ + private static Logger signedAuditLogger = SignedAuditLogger.getLogger(); + private static final long serialVersionUID = 7740464244137421542L; private final static String HDR_AUTHORIZATION = "Authorization"; private final static String HDR_LANG = "accept-language"; @@ -953,22 +954,11 @@ public class AdminServlet extends HttpServlet { * @param msg signed audit log message */ protected void audit(String msg) { - - if (auditor == null) { - return; - } - - auditor.log(msg); + signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } /** diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java index c6ae5b1b4..ae2945111 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/GroupMemberProcessor.java @@ -391,7 +391,7 @@ public class GroupMemberProcessor extends Processor { if (auditor == null) return; - auditor.log(new ConfigRoleEvent( + signedAuditLogger.log(new ConfigRoleEvent( auditor.getSubjectID(), status, auditor.getParamString(ScopeDef.SC_GROUP_MEMBERS, type, id, params))); diff --git a/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java index 84ac2ea31..56a5f44f7 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java @@ -64,9 +64,9 @@ import com.netscape.certsrv.common.ICMSRequest; import com.netscape.certsrv.dbs.certdb.ICertRecord; import com.netscape.certsrv.dbs.certdb.ICertificateRepository; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.logging.LogCategory; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.LogSource; import com.netscape.certsrv.logging.event.AuthFailEvent; import com.netscape.certsrv.logging.event.AuthSuccessEvent; @@ -117,7 +117,7 @@ import netscape.security.x509.X509CertImpl; */ public abstract class CMSServlet extends HttpServlet { - private static Logger signedAuditLogger = SignedAuditLogger.getLogger(); + protected static Logger signedAuditLogger = SignedAuditLogger.getLogger(); private static final long serialVersionUID = -3886300199374147160L; // servlet init params @@ -2026,14 +2026,8 @@ public abstract class CMSServlet extends HttpServlet { signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } /** diff --git a/base/server/cms/src/com/netscape/cms/servlet/base/SubsystemService.java b/base/server/cms/src/com/netscape/cms/servlet/base/SubsystemService.java index 40a8791ed..350ae06b1 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/base/SubsystemService.java +++ b/base/server/cms/src/com/netscape/cms/servlet/base/SubsystemService.java @@ -31,10 +31,15 @@ import com.netscape.certsrv.authorization.IAuthzSubsystem; import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.IAuditor; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.LogSource; +import com.netscape.cms.logging.Logger; +import com.netscape.cms.logging.SignedAuditLogger; public class SubsystemService extends PKIService { + protected static Logger signedAuditLogger = SignedAuditLogger.getLogger(); + protected IAuthzSubsystem authz = (IAuthzSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_AUTHZ); protected IAuditor auditor = CMS.getAuditor(); protected ILogger logger = CMS.getLogger(); @@ -82,14 +87,8 @@ public class SubsystemService extends PKIService { getClass().getSimpleName() + ": " + message); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - auditor.log(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } public void audit(String message, String scope, String type, String id, Map params, String status) { @@ -100,7 +99,7 @@ public class SubsystemService extends PKIService { status, auditor.getParamString(scope, type, id, params)); - auditor.log(auditMessage); + signedAuditLogger.log(auditMessage); } public void auditConfigTokenGeneral(String status, String service, Map params, String info) { @@ -112,6 +111,6 @@ public class SubsystemService extends PKIService { service, auditor.getParamString(null, params), info); - auditor.log(msg); + signedAuditLogger.log(msg); } } diff --git a/base/server/cms/src/com/netscape/cms/servlet/cert/RevocationProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/cert/RevocationProcessor.java index 570aea294..e5488d414 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/cert/RevocationProcessor.java +++ b/base/server/cms/src/com/netscape/cms/servlet/cert/RevocationProcessor.java @@ -490,7 +490,7 @@ public class RevocationProcessor extends CertProcessor { serialNumber == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : serialNumber.toHexString(), requestType); - auditor.log(auditMessage); + signedAuditLogger.log(auditMessage); } public void auditChangeRequestProcessed(String status) { @@ -506,7 +506,7 @@ public class RevocationProcessor extends CertProcessor { || requestStatus == RequestStatus.REJECTED || requestStatus == RequestStatus.CANCELED)) return; - auditor.log(new CertStatusChangeRequestProcessedEvent( + signedAuditLogger.log(new CertStatusChangeRequestProcessedEvent( auditor.getSubjectID(), status, requestID == null ? ILogger.UNIDENTIFIED : requestID.toString(), diff --git a/base/server/cms/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java b/base/server/cms/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java index 656d3d758..3c133d88d 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java +++ b/base/server/cms/src/com/netscape/cms/servlet/common/CMCOutputTemplate.java @@ -76,9 +76,9 @@ import com.netscape.certsrv.base.SessionContext; import com.netscape.certsrv.ca.ICertificateAuthority; 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.AuditFormat; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.event.CertStatusChangeRequestProcessedEvent; import com.netscape.certsrv.profile.IEnrollProfile; import com.netscape.certsrv.request.IRequest; @@ -1324,14 +1324,8 @@ public class CMCOutputTemplate { return bpid; } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } protected void audit(String msg) { 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 a547eec3f..4cdbed7b5 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 @@ -51,6 +51,7 @@ import com.netscape.certsrv.connector.IRequestEncoder; import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.AuditFormat; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.event.CertRequestProcessedEvent; import com.netscape.certsrv.profile.EProfileException; import com.netscape.certsrv.profile.IEnrollProfile; @@ -59,8 +60,6 @@ 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.base.CMSServlet; import com.netscape.cms.servlet.common.CMSRequest; @@ -87,7 +86,6 @@ import netscape.security.x509.X509CertInfo; public class ConnectorServlet extends CMSServlet { private static ILogger mLogger = CMS.getLogger(); - private static Logger signedAuditLogger = SignedAuditLogger.getLogger(); private static final long serialVersionUID = 1221916495803185863L; public static final String INFO = "Connector Servlet"; @@ -990,14 +988,8 @@ public class ConnectorServlet extends CMSServlet { signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } /** 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 79bd7c4c6..4e2a90814 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 @@ -51,8 +51,8 @@ import com.netscape.certsrv.base.SessionContext; import com.netscape.certsrv.ca.ICertificateAuthority; 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.logging.LogEvent; import com.netscape.certsrv.logging.event.AuthFailEvent; import com.netscape.certsrv.logging.event.AuthSuccessEvent; import com.netscape.certsrv.logging.event.AuthzFailEvent; @@ -68,8 +68,6 @@ import com.netscape.certsrv.usrgrp.ICertUserLocator; import com.netscape.certsrv.usrgrp.IGroup; import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.certsrv.util.IStatsSubsystem; -import com.netscape.cms.logging.Logger; -import com.netscape.cms.logging.SignedAuditLogger; import com.netscape.cms.servlet.common.AuthCredentials; import com.netscape.cms.servlet.common.CMSGateway; import com.netscape.cms.servlet.common.ServletUtils; @@ -78,8 +76,6 @@ import netscape.security.x509.X509CertImpl; public class CAProcessor extends Processor { - private static Logger signedAuditLogger = SignedAuditLogger.getLogger(); - public final static String ARG_REQUEST_OWNER = "requestOwner"; public final static String HDR_LANG = "accept-language"; public final static String ARG_PROFILE = "profile"; @@ -891,14 +887,8 @@ public class CAProcessor extends Processor { signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } /** diff --git a/base/server/cms/src/com/netscape/cms/servlet/processors/PKIProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/PKIProcessor.java index fb4389528..9d8f0bf20 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/processors/PKIProcessor.java +++ b/base/server/cms/src/com/netscape/cms/servlet/processors/PKIProcessor.java @@ -30,9 +30,9 @@ import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.IArgBlock; import com.netscape.certsrv.base.SessionContext; import com.netscape.certsrv.common.ICMSRequest; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.logging.LogCategory; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.request.IRequest; import com.netscape.cms.logging.Logger; import com.netscape.cms.logging.SignedAuditLogger; @@ -309,14 +309,8 @@ public class PKIProcessor implements IPKIProcessor { signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } /** diff --git a/base/server/cms/src/com/netscape/cms/servlet/processors/Processor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/Processor.java index 2648a4bc4..40a77bd1b 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/processors/Processor.java +++ b/base/server/cms/src/com/netscape/cms/servlet/processors/Processor.java @@ -13,9 +13,13 @@ import com.netscape.certsrv.base.EPropertyNotFound; import com.netscape.certsrv.logging.IAuditor; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.logging.LogSource; +import com.netscape.cms.logging.Logger; +import com.netscape.cms.logging.SignedAuditLogger; public class Processor { + protected static Logger signedAuditLogger = SignedAuditLogger.getLogger(); + protected ILogger logger = CMS.getLogger(); protected IAuditor auditor = CMS.getAuditor(); diff --git a/base/server/cms/src/org/dogtagpki/server/PKIServerSocketListener.java b/base/server/cms/src/org/dogtagpki/server/PKIServerSocketListener.java index d74231755..596902f98 100644 --- a/base/server/cms/src/org/dogtagpki/server/PKIServerSocketListener.java +++ b/base/server/cms/src/org/dogtagpki/server/PKIServerSocketListener.java @@ -35,11 +35,12 @@ import org.slf4j.LoggerFactory; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.logging.AuditEvent; -import com.netscape.certsrv.logging.IAuditor; +import com.netscape.cms.logging.SignedAuditLogger; public class PKIServerSocketListener implements SSLSocketListener { private static Logger logger = LoggerFactory.getLogger(PKIServerSocketListener.class); + private static SignedAuditLogger signedAuditLogger = SignedAuditLogger.getLogger(); /** * The socketInfos map is a storage for socket information that may not be available @@ -74,8 +75,6 @@ public class PKIServerSocketListener implements SSLSocketListener { logger.debug(" - server: " + serverIP); logger.debug(" - subject: " + subjectID); - IAuditor auditor = CMS.getAuditor(); - String auditMessage = CMS.getLogMessage( AuditEvent.ACCESS_SESSION_TERMINATED, clientIP, @@ -83,7 +82,7 @@ public class PKIServerSocketListener implements SSLSocketListener { subjectID, reason); - auditor.log(auditMessage); + signedAuditLogger.log(auditMessage); } catch (Exception e) { logger.error(e.getMessage(), e); @@ -135,8 +134,6 @@ public class PKIServerSocketListener implements SSLSocketListener { logger.debug(" - server: " + serverIP); logger.debug(" - subject: " + subjectID); - IAuditor auditor = CMS.getAuditor(); - String auditMessage = CMS.getLogMessage( eventType, clientIP, @@ -144,7 +141,7 @@ public class PKIServerSocketListener implements SSLSocketListener { subjectID, reason); - auditor.log(auditMessage); + signedAuditLogger.log(auditMessage); } catch (Exception e) { logger.error(e.getMessage(), e); @@ -178,15 +175,13 @@ public class PKIServerSocketListener implements SSLSocketListener { info.put("subjectID", subjectID); socketInfos.put(socket, info); - IAuditor auditor = CMS.getAuditor(); - String auditMessage = CMS.getLogMessage( AuditEvent.ACCESS_SESSION_ESTABLISH_SUCCESS, clientIP, serverIP, subjectID); - auditor.log(auditMessage); + signedAuditLogger.log(auditMessage); } catch (Exception e) { logger.error(e.getMessage(), e); diff --git a/base/server/cms/src/org/dogtagpki/server/rest/ACLInterceptor.java b/base/server/cms/src/org/dogtagpki/server/rest/ACLInterceptor.java index 3d2ee5e28..ca19ef188 100644 --- a/base/server/cms/src/org/dogtagpki/server/rest/ACLInterceptor.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/ACLInterceptor.java @@ -45,8 +45,8 @@ import com.netscape.certsrv.authorization.EAuthzUnknownRealm; import com.netscape.certsrv.authorization.IAuthzSubsystem; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.ForbiddenException; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.logging.event.AuthzFailEvent; import com.netscape.certsrv.logging.event.AuthzSuccessEvent; import com.netscape.cms.logging.Logger; @@ -336,13 +336,7 @@ public class ACLInterceptor implements ContainerRequestFilter { signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } } diff --git a/base/server/cms/src/org/dogtagpki/server/rest/AuditService.java b/base/server/cms/src/org/dogtagpki/server/rest/AuditService.java index 7c296517b..d28a917f3 100644 --- a/base/server/cms/src/org/dogtagpki/server/rest/AuditService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/AuditService.java @@ -412,7 +412,7 @@ public class AuditService extends SubsystemService implements AuditResource { */ public void auditTPSConfigSignedAudit(String status, Map params) { - auditor.log(new ConfigSignedAuditEvent( + signedAuditLogger.log(new ConfigSignedAuditEvent( servletRequest.getUserPrincipal().getName(), status, auditor.getParamString(null, params))); diff --git a/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java b/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java index 6292cf800..4274668a2 100644 --- a/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java @@ -435,7 +435,7 @@ public class GroupService extends SubsystemService implements GroupResource { if (auditor == null) return; - auditor.log(new ConfigRoleEvent( + signedAuditLogger.log(new ConfigRoleEvent( auditor.getSubjectID(), status, auditor.getParamString(ScopeDef.SC_GROUPS, type, id, params))); diff --git a/base/server/cms/src/org/dogtagpki/server/rest/UserService.java b/base/server/cms/src/org/dogtagpki/server/rest/UserService.java index ec690d6a0..b261ea9ae 100644 --- a/base/server/cms/src/org/dogtagpki/server/rest/UserService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/UserService.java @@ -1230,7 +1230,7 @@ public class UserService extends SubsystemService implements UserResource { if (auditor == null) return; - auditor.log(new ConfigRoleEvent( + signedAuditLogger.log(new ConfigRoleEvent( auditor.getSubjectID(), status, auditor.getParamString(ScopeDef.SC_USERS, type, id, params))); @@ -1240,7 +1240,7 @@ public class UserService extends SubsystemService implements UserResource { if (auditor == null) return; - auditor.log(new ConfigRoleEvent( + signedAuditLogger.log(new ConfigRoleEvent( auditor.getSubjectID(), status, auditor.getParamString(ScopeDef.SC_USER_CERTS, type, id, params))); 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 7519d6274..d80723783 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,7 @@ 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.certsrv.logging.LogEvent; import com.netscape.cms.logging.Logger; import com.netscape.cms.logging.SignedAuditLogger; import com.netscape.cmsutil.util.Utils; @@ -1095,14 +1096,7 @@ public class CertUtils { signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(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 339f4dc63..a711dd116 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/logging/Auditor.java +++ b/base/server/cmscore/src/com/netscape/cmscore/logging/Auditor.java @@ -24,13 +24,10 @@ import java.util.Map; import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.SessionContext; import com.netscape.certsrv.common.Constants; -import com.netscape.certsrv.logging.AuditEvent; 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 @@ -39,8 +36,6 @@ public class Auditor implements IAuditor { public final static Auditor auditor = new Auditor(); - private static Logger signedAuditLogger = SignedAuditLogger.getLogger(); - public static IAuditor getAuditor() { return auditor; } @@ -201,20 +196,4 @@ public class Auditor implements IAuditor { return parameters.toString(); } - - @Override - public void log(String message) { - signedAuditLogger.log(message); - } - - @Override - public void log(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - log(message); - } } 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 c95994c74..fa38eac52 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java +++ b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestSubsystem.java @@ -41,6 +41,7 @@ import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ELogException; import com.netscape.certsrv.logging.ILogEventListener; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.selftests.EDuplicateSelfTestException; import com.netscape.certsrv.selftests.EInvalidSelfTestException; import com.netscape.certsrv.selftests.EMissingSelfTestException; @@ -121,14 +122,8 @@ public class SelfTestSubsystem signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } /** diff --git a/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java b/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java index 1ef236117..2613ee699 100644 --- a/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java +++ b/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java @@ -94,6 +94,7 @@ import com.netscape.certsrv.base.EPropertyNotFound; import com.netscape.certsrv.base.IConfigStore; import com.netscape.certsrv.common.Constants; import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.LogEvent; import com.netscape.certsrv.tps.token.TokenStatus; import com.netscape.cms.logging.Logger; import com.netscape.cms.logging.SignedAuditLogger; @@ -4277,14 +4278,8 @@ public class TPSProcessor { signedAuditLogger.log(msg); } - protected void audit(AuditEvent event) { - - String template = event.getMessage(); - Object[] params = event.getParameters(); - - String message = CMS.getLogMessage(template, params); - - audit(message); + protected void audit(LogEvent event) { + signedAuditLogger.log(event); } public static void main(String[] args) { diff --git a/base/tps/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java b/base/tps/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java index 6efe4cbb9..f28c6339c 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java @@ -482,7 +482,6 @@ public class AuthenticatorService extends SubsystemService implements Authentica authenticatorID, auditor.getParamString(null, params), info); - auditor.log(msg); - + signedAuditLogger.log(msg); } } diff --git a/base/tps/src/org/dogtagpki/server/tps/rest/ConnectorService.java b/base/tps/src/org/dogtagpki/server/tps/rest/ConnectorService.java index 3e1e5df2e..6813a0afe 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/ConnectorService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/ConnectorService.java @@ -479,7 +479,7 @@ public class ConnectorService extends SubsystemService implements ConnectorResou connectorID, auditor.getParamString(null, params), info); - auditor.log(msg); + signedAuditLogger.log(msg); } } diff --git a/base/tps/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java b/base/tps/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java index 9bbb61686..0bb17b5a8 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java @@ -456,7 +456,7 @@ public class ProfileMappingService extends SubsystemService implements ProfileMa resolverID, auditor.getParamString(null, params), info); - auditor.log(msg); + signedAuditLogger.log(msg); } diff --git a/base/tps/src/org/dogtagpki/server/tps/rest/ProfileService.java b/base/tps/src/org/dogtagpki/server/tps/rest/ProfileService.java index 43e14bea0..b6c49386e 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/ProfileService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/ProfileService.java @@ -478,8 +478,7 @@ public class ProfileService extends SubsystemService implements ProfileResource profileID, auditor.getParamString(null, params), info); - auditor.log(msg); - + signedAuditLogger.log(msg); } } diff --git a/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java b/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java index 73d0a647f..23f08808a 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java @@ -822,8 +822,7 @@ public class TokenService extends SubsystemService implements TokenResource { tokenID, auditor.getParamString(null, params), info); - auditor.log(msg); - + signedAuditLogger.log(msg); } /* @@ -842,7 +841,6 @@ public class TokenService extends SubsystemService implements TokenResource { newReason, auditor.getParamString(null, params), info); - auditor.log(msg); - + signedAuditLogger.log(msg); } } -- cgit