From da87f5893a66a85126fa807225cd79359d654252 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Sat, 24 Jun 2017 05:17:31 +0200 Subject: Fixed audit events class hierarchy. The audit events classes have been modified to inherit from SignedAuditEvent class since AuditEvent class is actually used for transaction log. https://pagure.io/dogtagpki/issue/2689 Change-Id: If41c99c1d165075d330033d44799145c784c2905 --- .../com/netscape/certsrv/logging/AuditEvent.java | 44 ---------------------- .../netscape/certsrv/logging/SignedAuditEvent.java | 34 +++++++++++++++++ .../logging/event/AsymKeyGenerationEvent.java | 4 +- .../event/AsymKeyGenerationProcessedEvent.java | 4 +- .../certsrv/logging/event/AuthFailEvent.java | 9 +++-- .../certsrv/logging/event/AuthSuccessEvent.java | 9 +++-- .../certsrv/logging/event/AuthzFailEvent.java | 9 ++++- .../certsrv/logging/event/AuthzSuccessEvent.java | 9 ++++- .../logging/event/CertRequestProcessedEvent.java | 4 +- .../CertStatusChangeRequestProcessedEvent.java | 4 +- .../certsrv/logging/event/ConfigRoleEvent.java | 9 +++-- .../logging/event/ConfigSignedAuditEvent.java | 9 +++-- .../logging/event/ConfigTrustedPublicKeyEvent.java | 4 +- .../logging/event/DeltaCRLGenerationEvent.java | 4 +- .../logging/event/DeltaCRLPublishingEvent.java | 4 +- .../logging/event/FullCRLGenerationEvent.java | 4 +- .../logging/event/FullCRLPublishingEvent.java | 4 +- .../certsrv/logging/event/RoleAssumeEvent.java | 9 +++-- .../logging/event/ScheduleCRLGenerationEvent.java | 4 +- .../logging/event/SecurityDataArchivalEvent.java | 4 +- .../event/SecurityDataArchivalProcessedEvent.java | 4 +- .../logging/event/SecurityDataExportEvent.java | 4 +- .../logging/event/SecurityDataInfoEvent.java | 4 +- .../logging/event/SecurityDataRecoveryEvent.java | 4 +- .../event/SecurityDataRecoveryProcessedEvent.java | 4 +- .../SecurityDataRecoveryStateChangeEvent.java | 4 +- .../event/SecurityDataStatusChangeEvent.java | 4 +- .../logging/event/ServerSideKeyGenEvent.java | 4 +- .../event/ServerSideKeyGenProcessedEvent.java | 4 +- .../logging/event/SymKeyGenerationEvent.java | 4 +- .../event/SymKeyGenerationProcessedEvent.java | 4 +- 31 files changed, 122 insertions(+), 107 deletions(-) diff --git a/base/common/src/com/netscape/certsrv/logging/AuditEvent.java b/base/common/src/com/netscape/certsrv/logging/AuditEvent.java index 995b9dea4..8d8a6b748 100644 --- a/base/common/src/com/netscape/certsrv/logging/AuditEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/AuditEvent.java @@ -17,9 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging; -import java.util.LinkedHashMap; -import java.util.Map; - /** * The log event object that carries message detail of a log event * that goes into the Transaction log. Note that the name of this @@ -38,8 +35,6 @@ public class AuditEvent extends LogEvent { "LOGGING_SIGNED_AUDIT_AUDIT_LOG_SHUTDOWN_2"; public final static String CIMC_CERT_VERIFICATION = "LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION_3"; - public final static String ROLE_ASSUME = - "LOGGING_SIGNED_AUDIT_ROLE_ASSUME_3"; public final static String CONFIG_CERT_POLICY = "LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY_3"; public final static String CONFIG_CERT_PROFILE = @@ -50,12 +45,8 @@ public class AuditEvent extends LogEvent { "LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE_3"; public final static String CONFIG_AUTH = "LOGGING_SIGNED_AUDIT_CONFIG_AUTH_3"; - public final static String CONFIG_ROLE = - "LOGGING_SIGNED_AUDIT_CONFIG_ROLE_3"; public final static String CONFIG_ACL = "LOGGING_SIGNED_AUDIT_CONFIG_ACL_3"; - public final static String CONFIG_SIGNED_AUDIT = - "LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT_3"; public final static String CONFIG_ENCRYPTION = "LOGGING_SIGNED_AUDIT_CONFIG_ENCRYPTION_3"; public final static String CONFIG_DRM = @@ -79,20 +70,8 @@ public class AuditEvent extends LogEvent { public final static String CERT_STATUS_CHANGE_REQUEST = "LOGGING_SIGNED_AUDIT_CERT_STATUS_CHANGE_REQUEST_5"; - public final static String AUTHZ_SUCCESS = - "LOGGING_SIGNED_AUDIT_AUTHZ_SUCCESS_4"; - public final static String AUTHZ_SUCCESS_INFO = - "LOGGING_SIGNED_AUDIT_AUTHZ_SUCCESS_5"; - public final static String AUTHZ_FAIL = - "LOGGING_SIGNED_AUDIT_AUTHZ_FAIL_4"; - public final static String AUTHZ_FAIL_INFO = - "LOGGING_SIGNED_AUDIT_AUTHZ_FAIL_5"; public final static String INTER_BOUNDARY = "LOGGING_SIGNED_AUDIT_INTER_BOUNDARY_SUCCESS_5"; - public final static String AUTH_FAIL = - "LOGGING_SIGNED_AUDIT_AUTH_FAIL_4"; - public final static String AUTH_SUCCESS = - "LOGGING_SIGNED_AUDIT_AUTH_SUCCESS_3"; public final static String CERT_PROFILE_APPROVAL = "LOGGING_SIGNED_AUDIT_CERT_PROFILE_APPROVAL_4"; public final static String PROOF_OF_POSSESSION = @@ -215,8 +194,6 @@ public class AuditEvent extends LogEvent { private static final long serialVersionUID = -844306657733902324L; - protected Map attributes = new LinkedHashMap<>(); - /** * Constructs a message event *

@@ -293,25 +270,4 @@ public class AuditEvent extends LogEvent { public AuditEvent(String msgFormat, Object params[]) { super(msgFormat, params); } - - public void setAttribute(String name, Object value) { - attributes.put(name, value); - } - - public String getAttributeList() { - - StringBuilder sb = new StringBuilder(); - - for (String name : attributes.keySet()) { - Object value = attributes.get(name); - - sb.append("["); - sb.append(name); - sb.append("="); - sb.append(value); - sb.append("]"); - } - - return sb.toString(); - } } diff --git a/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java b/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java index 08f9e7f64..b60306752 100644 --- a/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/SignedAuditEvent.java @@ -17,6 +17,9 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging; +import java.util.LinkedHashMap; +import java.util.Map; + /** * The log event object that carries message detail of a log event * that goes into the Signed Audit Event log. This log has the @@ -31,6 +34,8 @@ public class SignedAuditEvent extends LogEvent { private static final long serialVersionUID = 4287822756516673931L; + protected Map attributes = new LinkedHashMap<>(); + /** * Constructs a SignedAuditEvent message event. *

@@ -107,4 +112,33 @@ public class SignedAuditEvent extends LogEvent { public SignedAuditEvent(String msgFormat, Object params[]) { super(msgFormat, params); } + + public void setAttribute(String name, Object value) { + attributes.put(name, value); + } + + public Object getAttribute(String name) { + return attributes.get(name); + } + + public Map getAttributes() { + return attributes; + } + + public String getAttributeList() { + + StringBuilder sb = new StringBuilder(); + + for (String name : attributes.keySet()) { + Object value = attributes.get(name); + + sb.append("["); + sb.append(name); + sb.append("="); + sb.append(value == null ? ILogger.SIGNED_AUDIT_EMPTY_VALUE : value); + sb.append("]"); + } + + return sb.toString(); + } } diff --git a/base/common/src/com/netscape/certsrv/logging/event/AsymKeyGenerationEvent.java b/base/common/src/com/netscape/certsrv/logging/event/AsymKeyGenerationEvent.java index f3236d626..eb7ccb307 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/AsymKeyGenerationEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/AsymKeyGenerationEvent.java @@ -17,10 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging.event; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; import com.netscape.certsrv.request.RequestId; -public class AsymKeyGenerationEvent extends AuditEvent { +public class AsymKeyGenerationEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/AsymKeyGenerationProcessedEvent.java b/base/common/src/com/netscape/certsrv/logging/event/AsymKeyGenerationProcessedEvent.java index ba242de9e..a5f49c139 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/AsymKeyGenerationProcessedEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/AsymKeyGenerationProcessedEvent.java @@ -18,10 +18,10 @@ package com.netscape.certsrv.logging.event; import com.netscape.certsrv.dbs.keydb.KeyId; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; import com.netscape.certsrv.request.RequestId; -public class AsymKeyGenerationProcessedEvent extends AuditEvent { +public class AsymKeyGenerationProcessedEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/AuthFailEvent.java b/base/common/src/com/netscape/certsrv/logging/event/AuthFailEvent.java index a2c7d8d4f..fa281d31c 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/AuthFailEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/AuthFailEvent.java @@ -17,19 +17,22 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging.event; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; -public class AuthFailEvent extends AuditEvent { +public class AuthFailEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; + public final static String LOGGING_PROPERTY = + "LOGGING_SIGNED_AUDIT_AUTH_FAIL_4"; + public AuthFailEvent( String subjectID, String outcome, String authManagerID, String attemptedUID) { - super(AUTH_FAIL); + super(LOGGING_PROPERTY); setParameters(new Object[] { subjectID, diff --git a/base/common/src/com/netscape/certsrv/logging/event/AuthSuccessEvent.java b/base/common/src/com/netscape/certsrv/logging/event/AuthSuccessEvent.java index 5d4f97311..bf4aa0ead 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/AuthSuccessEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/AuthSuccessEvent.java @@ -17,18 +17,21 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging.event; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; -public class AuthSuccessEvent extends AuditEvent { +public class AuthSuccessEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; + public final static String LOGGING_PROPERTY = + "LOGGING_SIGNED_AUDIT_AUTH_SUCCESS_3"; + public AuthSuccessEvent( String subjectID, String outcome, String authManagerID) { - super(AUTH_SUCCESS); + super(LOGGING_PROPERTY); setParameters(new Object[] { subjectID, diff --git a/base/common/src/com/netscape/certsrv/logging/event/AuthzFailEvent.java b/base/common/src/com/netscape/certsrv/logging/event/AuthzFailEvent.java index 1e4491954..50a574c03 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/AuthzFailEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/AuthzFailEvent.java @@ -17,12 +17,17 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging.event; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; -public class AuthzFailEvent extends AuditEvent { +public class AuthzFailEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; + public final static String AUTHZ_FAIL = + "LOGGING_SIGNED_AUDIT_AUTHZ_FAIL_4"; + public final static String AUTHZ_FAIL_INFO = + "LOGGING_SIGNED_AUDIT_AUTHZ_FAIL_5"; + public AuthzFailEvent( String subjectID, String outcome, diff --git a/base/common/src/com/netscape/certsrv/logging/event/AuthzSuccessEvent.java b/base/common/src/com/netscape/certsrv/logging/event/AuthzSuccessEvent.java index 05e505c73..8a0831ddf 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/AuthzSuccessEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/AuthzSuccessEvent.java @@ -17,12 +17,17 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging.event; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; -public class AuthzSuccessEvent extends AuditEvent { +public class AuthzSuccessEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; + public final static String AUTHZ_SUCCESS = + "LOGGING_SIGNED_AUDIT_AUTHZ_SUCCESS_4"; + public final static String AUTHZ_SUCCESS_INFO = + "LOGGING_SIGNED_AUDIT_AUTHZ_SUCCESS_5"; + public AuthzSuccessEvent( String subjectID, String outcome, diff --git a/base/common/src/com/netscape/certsrv/logging/event/CertRequestProcessedEvent.java b/base/common/src/com/netscape/certsrv/logging/event/CertRequestProcessedEvent.java index d095ab62f..2ed977e04 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/CertRequestProcessedEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/CertRequestProcessedEvent.java @@ -19,14 +19,14 @@ package com.netscape.certsrv.logging.event; import java.security.cert.CertificateEncodingException; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.SignedAuditEvent; import com.netscape.certsrv.request.IRequest; import com.netscape.cmsutil.util.Utils; import netscape.security.x509.X509CertImpl; -public class CertRequestProcessedEvent extends AuditEvent { +public class CertRequestProcessedEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/CertStatusChangeRequestProcessedEvent.java b/base/common/src/com/netscape/certsrv/logging/event/CertStatusChangeRequestProcessedEvent.java index f583ad2bc..4d2ebb72a 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/CertStatusChangeRequestProcessedEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/CertStatusChangeRequestProcessedEvent.java @@ -17,11 +17,11 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging.event; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.SignedAuditEvent; import com.netscape.certsrv.request.RequestStatus; -public class CertStatusChangeRequestProcessedEvent extends AuditEvent { +public class CertStatusChangeRequestProcessedEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/ConfigRoleEvent.java b/base/common/src/com/netscape/certsrv/logging/event/ConfigRoleEvent.java index 695712b68..ba89484bc 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/ConfigRoleEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/ConfigRoleEvent.java @@ -17,18 +17,21 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging.event; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; -public class ConfigRoleEvent extends AuditEvent { +public class ConfigRoleEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; + public final static String LOGGING_PROPERTY = + "LOGGING_SIGNED_AUDIT_CONFIG_ROLE_3"; + public ConfigRoleEvent( String subjectID, String outcome, String params) { - super(CONFIG_ROLE); + super(LOGGING_PROPERTY); setParameters(new Object[] { subjectID, diff --git a/base/common/src/com/netscape/certsrv/logging/event/ConfigSignedAuditEvent.java b/base/common/src/com/netscape/certsrv/logging/event/ConfigSignedAuditEvent.java index 32de44343..8d472ad67 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/ConfigSignedAuditEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/ConfigSignedAuditEvent.java @@ -17,18 +17,21 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging.event; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; -public class ConfigSignedAuditEvent extends AuditEvent { +public class ConfigSignedAuditEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; + public final static String LOGGING_PROPERTY = + "LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT_3"; + public ConfigSignedAuditEvent( String subjectID, String outcome, String params) { - super(CONFIG_SIGNED_AUDIT); + super(LOGGING_PROPERTY); setParameters(new Object[] { subjectID, diff --git a/base/common/src/com/netscape/certsrv/logging/event/ConfigTrustedPublicKeyEvent.java b/base/common/src/com/netscape/certsrv/logging/event/ConfigTrustedPublicKeyEvent.java index b0dd78140..3b6f76639 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/ConfigTrustedPublicKeyEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/ConfigTrustedPublicKeyEvent.java @@ -17,9 +17,9 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging.event; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; -public class ConfigTrustedPublicKeyEvent extends AuditEvent { +public class ConfigTrustedPublicKeyEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/DeltaCRLGenerationEvent.java b/base/common/src/com/netscape/certsrv/logging/event/DeltaCRLGenerationEvent.java index ba04a332a..54d73fa3a 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/DeltaCRLGenerationEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/DeltaCRLGenerationEvent.java @@ -19,10 +19,10 @@ package com.netscape.certsrv.logging.event; import java.math.BigInteger; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.SignedAuditEvent; -public class DeltaCRLGenerationEvent extends AuditEvent { +public class DeltaCRLGenerationEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/DeltaCRLPublishingEvent.java b/base/common/src/com/netscape/certsrv/logging/event/DeltaCRLPublishingEvent.java index d6521d7d1..0d37512c9 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/DeltaCRLPublishingEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/DeltaCRLPublishingEvent.java @@ -19,10 +19,10 @@ package com.netscape.certsrv.logging.event; import java.math.BigInteger; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.SignedAuditEvent; -public class DeltaCRLPublishingEvent extends AuditEvent { +public class DeltaCRLPublishingEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/FullCRLGenerationEvent.java b/base/common/src/com/netscape/certsrv/logging/event/FullCRLGenerationEvent.java index 9dd47dd45..b05092663 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/FullCRLGenerationEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/FullCRLGenerationEvent.java @@ -19,10 +19,10 @@ package com.netscape.certsrv.logging.event; import java.math.BigInteger; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.SignedAuditEvent; -public class FullCRLGenerationEvent extends AuditEvent { +public class FullCRLGenerationEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/FullCRLPublishingEvent.java b/base/common/src/com/netscape/certsrv/logging/event/FullCRLPublishingEvent.java index a3764c0a2..98d3cc7f2 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/FullCRLPublishingEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/FullCRLPublishingEvent.java @@ -19,10 +19,10 @@ package com.netscape.certsrv.logging.event; import java.math.BigInteger; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.SignedAuditEvent; -public class FullCRLPublishingEvent extends AuditEvent { +public class FullCRLPublishingEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/RoleAssumeEvent.java b/base/common/src/com/netscape/certsrv/logging/event/RoleAssumeEvent.java index 271589397..a5357bde4 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/RoleAssumeEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/RoleAssumeEvent.java @@ -17,18 +17,21 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging.event; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; -public class RoleAssumeEvent extends AuditEvent { +public class RoleAssumeEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; + public final static String LOGGING_PROPERTY = + "LOGGING_SIGNED_AUDIT_ROLE_ASSUME_3"; + public RoleAssumeEvent( String subjectID, String outcome, String groups) { - super(ROLE_ASSUME); + super(LOGGING_PROPERTY); setParameters(new Object[] { subjectID, diff --git a/base/common/src/com/netscape/certsrv/logging/event/ScheduleCRLGenerationEvent.java b/base/common/src/com/netscape/certsrv/logging/event/ScheduleCRLGenerationEvent.java index 5b2a4610b..446570619 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/ScheduleCRLGenerationEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/ScheduleCRLGenerationEvent.java @@ -17,10 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging.event; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.SignedAuditEvent; -public class ScheduleCRLGenerationEvent extends AuditEvent { +public class ScheduleCRLGenerationEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataArchivalEvent.java b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataArchivalEvent.java index adc8d5bd8..48f04f227 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataArchivalEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataArchivalEvent.java @@ -17,10 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging.event; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; import com.netscape.certsrv.request.RequestId; -public class SecurityDataArchivalEvent extends AuditEvent { +public class SecurityDataArchivalEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataArchivalProcessedEvent.java b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataArchivalProcessedEvent.java index 0ec21ae7f..b37817111 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataArchivalProcessedEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataArchivalProcessedEvent.java @@ -18,10 +18,10 @@ package com.netscape.certsrv.logging.event; import com.netscape.certsrv.dbs.keydb.KeyId; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; import com.netscape.certsrv.request.RequestId; -public class SecurityDataArchivalProcessedEvent extends AuditEvent { +public class SecurityDataArchivalProcessedEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataExportEvent.java b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataExportEvent.java index a2c7939dc..19fe07a3a 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataExportEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataExportEvent.java @@ -18,10 +18,10 @@ package com.netscape.certsrv.logging.event; import com.netscape.certsrv.dbs.keydb.KeyId; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; import com.netscape.certsrv.request.RequestId; -public class SecurityDataExportEvent extends AuditEvent { +public class SecurityDataExportEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataInfoEvent.java b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataInfoEvent.java index 82c049e3b..508ee4f36 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataInfoEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataInfoEvent.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.logging.event; import com.netscape.certsrv.dbs.keydb.KeyId; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; -public class SecurityDataInfoEvent extends AuditEvent { +public class SecurityDataInfoEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataRecoveryEvent.java b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataRecoveryEvent.java index 97e3c9641..72749d030 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataRecoveryEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataRecoveryEvent.java @@ -18,10 +18,10 @@ package com.netscape.certsrv.logging.event; import com.netscape.certsrv.dbs.keydb.KeyId; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; import com.netscape.certsrv.request.RequestId; -public class SecurityDataRecoveryEvent extends AuditEvent { +public class SecurityDataRecoveryEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataRecoveryProcessedEvent.java b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataRecoveryProcessedEvent.java index 8e5ad4b81..252d1672c 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataRecoveryProcessedEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataRecoveryProcessedEvent.java @@ -18,10 +18,10 @@ package com.netscape.certsrv.logging.event; import com.netscape.certsrv.dbs.keydb.KeyId; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; import com.netscape.certsrv.request.RequestId; -public class SecurityDataRecoveryProcessedEvent extends AuditEvent { +public class SecurityDataRecoveryProcessedEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataRecoveryStateChangeEvent.java b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataRecoveryStateChangeEvent.java index d0e97f8bf..34c24277a 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataRecoveryStateChangeEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataRecoveryStateChangeEvent.java @@ -17,10 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging.event; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; import com.netscape.certsrv.request.RequestId; -public class SecurityDataRecoveryStateChangeEvent extends AuditEvent { +public class SecurityDataRecoveryStateChangeEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataStatusChangeEvent.java b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataStatusChangeEvent.java index 082516c02..81774ea15 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/SecurityDataStatusChangeEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/SecurityDataStatusChangeEvent.java @@ -18,9 +18,9 @@ package com.netscape.certsrv.logging.event; import com.netscape.certsrv.dbs.keydb.KeyId; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; -public class SecurityDataStatusChangeEvent extends AuditEvent { +public class SecurityDataStatusChangeEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/ServerSideKeyGenEvent.java b/base/common/src/com/netscape/certsrv/logging/event/ServerSideKeyGenEvent.java index 0894716be..b96069491 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/ServerSideKeyGenEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/ServerSideKeyGenEvent.java @@ -17,10 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging.event; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; import com.netscape.certsrv.request.RequestId; -public class ServerSideKeyGenEvent extends AuditEvent { +public class ServerSideKeyGenEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/ServerSideKeyGenProcessedEvent.java b/base/common/src/com/netscape/certsrv/logging/event/ServerSideKeyGenProcessedEvent.java index 71ed3ed87..1f7ea2c03 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/ServerSideKeyGenProcessedEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/ServerSideKeyGenProcessedEvent.java @@ -17,10 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging.event; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; import com.netscape.certsrv.request.RequestId; -public class ServerSideKeyGenProcessedEvent extends AuditEvent { +public class ServerSideKeyGenProcessedEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/SymKeyGenerationEvent.java b/base/common/src/com/netscape/certsrv/logging/event/SymKeyGenerationEvent.java index c1b865232..a2d2ca0df 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/SymKeyGenerationEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/SymKeyGenerationEvent.java @@ -17,10 +17,10 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.logging.event; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; import com.netscape.certsrv.request.RequestId; -public class SymKeyGenerationEvent extends AuditEvent { +public class SymKeyGenerationEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; diff --git a/base/common/src/com/netscape/certsrv/logging/event/SymKeyGenerationProcessedEvent.java b/base/common/src/com/netscape/certsrv/logging/event/SymKeyGenerationProcessedEvent.java index ad36d4484..aa5058950 100644 --- a/base/common/src/com/netscape/certsrv/logging/event/SymKeyGenerationProcessedEvent.java +++ b/base/common/src/com/netscape/certsrv/logging/event/SymKeyGenerationProcessedEvent.java @@ -18,10 +18,10 @@ package com.netscape.certsrv.logging.event; import com.netscape.certsrv.dbs.keydb.KeyId; -import com.netscape.certsrv.logging.AuditEvent; +import com.netscape.certsrv.logging.SignedAuditEvent; import com.netscape.certsrv.request.RequestId; -public class SymKeyGenerationProcessedEvent extends AuditEvent { +public class SymKeyGenerationProcessedEvent extends SignedAuditEvent { private static final long serialVersionUID = 1L; -- cgit