diff options
author | Endi S. Dewata <edewata@redhat.com> | 2017-04-12 02:28:31 +0200 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2017-04-12 16:22:13 +0200 |
commit | e22d0e99aa33bccc3e4041f5ed501fedf0dcae49 (patch) | |
tree | 3a46b2700919b58dc05feba3d097030857ecbc5e /base/tps/src | |
parent | 2a73c978784d58b11375aa724cbd2c04607eafc1 (diff) | |
download | pki-e22d0e99aa33bccc3e4041f5ed501fedf0dcae49.tar.gz pki-e22d0e99aa33bccc3e4041f5ed501fedf0dcae49.tar.xz pki-e22d0e99aa33bccc3e4041f5ed501fedf0dcae49.zip |
Added audit event constants for TPS.
Change-Id: Id7845ebf2a14cebe25189a8363cee759030a16cb
Diffstat (limited to 'base/tps/src')
8 files changed, 40 insertions, 33 deletions
diff --git a/base/tps/src/org/dogtagpki/server/tps/processor/TPSEnrollProcessor.java b/base/tps/src/org/dogtagpki/server/tps/processor/TPSEnrollProcessor.java index 672f53d83..118bf505a 100644 --- a/base/tps/src/org/dogtagpki/server/tps/processor/TPSEnrollProcessor.java +++ b/base/tps/src/org/dogtagpki/server/tps/processor/TPSEnrollProcessor.java @@ -15,12 +15,6 @@ import java.util.Map; import java.util.Random; import java.util.zip.DataFormatException; -import netscape.security.provider.RSAPublicKey; -//import org.mozilla.jss.pkcs11.PK11ECPublicKey; -import netscape.security.util.BigInt; -import netscape.security.x509.RevocationReason; -import netscape.security.x509.X509CertImpl; - import org.dogtagpki.server.tps.TPSSession; import org.dogtagpki.server.tps.TPSSubsystem; import org.dogtagpki.server.tps.TPSTokenPolicy; @@ -59,15 +53,21 @@ import org.mozilla.jss.pkcs11.PK11PubKey; import org.mozilla.jss.pkcs11.PK11RSAPublicKey; import org.mozilla.jss.pkix.primitive.SubjectPublicKeyInfo; -import sun.security.pkcs11.wrapper.PKCS11Constants; - import com.netscape.certsrv.apps.CMS; import com.netscape.certsrv.base.EBaseException; import com.netscape.certsrv.base.EPropertyNotFound; import com.netscape.certsrv.base.IConfigStore; +import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.tps.token.TokenStatus; import com.netscape.cmsutil.util.Utils; +import netscape.security.provider.RSAPublicKey; +//import org.mozilla.jss.pkcs11.PK11ECPublicKey; +import netscape.security.util.BigInt; +import netscape.security.x509.RevocationReason; +import netscape.security.x509.X509CertImpl; +import sun.security.pkcs11.wrapper.PKCS11Constants; + public class TPSEnrollProcessor extends TPSProcessor { public TPSEnrollProcessor(TPSSession session) { @@ -3683,13 +3683,13 @@ public class TPSEnrollProcessor extends TPSProcessor { String auditType = ""; switch (op) { case "retrieval": - auditType = "LOGGING_SIGNED_AUDIT_TOKEN_CERT_RETRIEVAL_9"; + auditType = AuditEvent.TOKEN_CERT_RETRIEVAL; break; case "renewal": - auditType = "LOGGING_SIGNED_AUDIT_TOKEN_CERT_RENEWAL_9"; + auditType = AuditEvent.TOKEN_CERT_RENEWAL; break; default: - auditType = "LOGGING_SIGNED_AUDIT_TOKEN_CERT_ENROLLMENT_9"; + auditType = AuditEvent.TOKEN_CERT_ENROLLMENT; } String auditMessage = CMS.getLogMessage( @@ -3719,7 +3719,7 @@ public class TPSEnrollProcessor extends TPSProcessor { serialNum = serial.toString(); String auditMessage = CMS.getLogMessage( - "LOGGING_SIGNED_AUDIT_TOKEN_KEY_RECOVERY_10", + AuditEvent.TOKEN_KEY_RECOVERY, (session != null) ? session.getIpAddress() : null, subjectID, aInfo.getCUIDhexStringPlain(), diff --git a/base/tps/src/org/dogtagpki/server/tps/processor/TPSPinResetProcessor.java b/base/tps/src/org/dogtagpki/server/tps/processor/TPSPinResetProcessor.java index fe3f80151..b309657ae 100644 --- a/base/tps/src/org/dogtagpki/server/tps/processor/TPSPinResetProcessor.java +++ b/base/tps/src/org/dogtagpki/server/tps/processor/TPSPinResetProcessor.java @@ -33,6 +33,7 @@ import org.dogtagpki.tps.msg.BeginOpMsg; import org.dogtagpki.tps.msg.EndOpMsg.TPSStatus; import com.netscape.certsrv.apps.CMS; +import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.tps.token.TokenStatus; public class TPSPinResetProcessor extends TPSProcessor { @@ -197,10 +198,10 @@ public class TPSPinResetProcessor extends TPSProcessor { String auditType = ""; switch (status) { case "success": - auditType = "LOGGING_SIGNED_AUDIT_TOKEN_PIN_RESET_SUCCESS_6"; + auditType = AuditEvent.TOKEN_PIN_RESET_SUCCESS; break; default: - auditType = "LOGGING_SIGNED_AUDIT_TOKEN_PIN_RESET_FAILURE_6"; + auditType = AuditEvent.TOKEN_PIN_RESET_FAILURE; } String auditMessage = CMS.getLogMessage( 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 7d17f36b7..910a26371 100644 --- a/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java +++ b/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java @@ -33,8 +33,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import netscape.security.x509.RevocationReason; - import org.dogtagpki.server.tps.TPSSession; import org.dogtagpki.server.tps.TPSSubsystem; import org.dogtagpki.server.tps.authentication.AuthUIParameter; @@ -95,12 +93,15 @@ import com.netscape.certsrv.base.EBaseException; 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.ILogger; import com.netscape.certsrv.tps.token.TokenStatus; import com.netscape.cms.servlet.tks.SecureChannelProtocol; import com.netscape.cmsutil.crypto.CryptoUtil; import com.netscape.symkey.SessionKey; +import netscape.security.x509.RevocationReason; + public class TPSProcessor { public static final int RESULT_NO_ERROR = 0; @@ -4054,9 +4055,9 @@ public class TPSProcessor { String status, String authMgrId) { - String auditType = "LOGGING_SIGNED_AUDIT_TOKEN_AUTH_FAILURE_9"; + String auditType = AuditEvent.TOKEN_AUTH_FAILURE; if (status.equals("success")) - auditType = "LOGGING_SIGNED_AUDIT_TOKEN_AUTH_SUCCESS_9"; + auditType = AuditEvent.TOKEN_AUTH_SUCCESS; String auditMessage = CMS.getLogMessage( auditType, @@ -4078,7 +4079,7 @@ public class TPSProcessor { protected void auditOpRequest(String op, AppletInfo aInfo, String status, String info) { - String auditType = "LOGGING_SIGNED_AUDIT_TOKEN_OP_REQUEST_6"; + String auditType = AuditEvent.TOKEN_OP_REQUEST; String auditMessage = CMS.getLogMessage( auditType, @@ -4100,10 +4101,10 @@ public class TPSProcessor { String auditType = ""; switch (status) { case "success": - auditType = "LOGGING_SIGNED_AUDIT_TOKEN_FORMAT_SUCCESS_9"; + auditType = AuditEvent.TOKEN_FORMAT_SUCCESS; break; default: - auditType = "LOGGING_SIGNED_AUDIT_TOKEN_FORMAT_FAILURE_9"; + auditType = AuditEvent.TOKEN_FORMAT_FAILURE; } String auditMessage = CMS.getLogMessage( @@ -4129,10 +4130,10 @@ public class TPSProcessor { String auditType = ""; switch (status) { case "success": - auditType = "LOGGING_SIGNED_AUDIT_TOKEN_APPLET_UPGRADE_SUCCESS_9"; + auditType = AuditEvent.TOKEN_APPLET_UPGRADE_SUCCESS; break; default: - auditType = "LOGGING_SIGNED_AUDIT_TOKEN_APPLET_UPGRADE_FAILURE_9"; + auditType = AuditEvent.TOKEN_APPLET_UPGRADE_FAILURE; } String auditMessage = CMS.getLogMessage( @@ -4154,7 +4155,7 @@ public class TPSProcessor { String newKeyVersion, String info) { - String auditType = "LOGGING_SIGNED_AUDIT_TOKEN_KEY_CHANGEOVER_REQUIRED_10"; + String auditType = AuditEvent.TOKEN_KEY_CHANGEOVER_REQUIRED; String auditMessage = CMS.getLogMessage( auditType, @@ -4180,10 +4181,10 @@ public class TPSProcessor { String auditType = ""; switch (status) { case "success": - auditType = "LOGGING_SIGNED_AUDIT_TOKEN_KEY_CHANGEOVER_SUCCESS_10"; + auditType = AuditEvent.TOKEN_KEY_CHANGEOVER_SUCCESS; break; default: - auditType = "LOGGING_SIGNED_AUDIT_TOKEN_KEY_CHANGEOVER_FAILURE_10"; + auditType = AuditEvent.TOKEN_KEY_CHANGEOVER_FAILURE; } String auditMessage = CMS.getLogMessage( @@ -4212,7 +4213,7 @@ public class TPSProcessor { String caConnId, String info) { - String auditType = "LOGGING_SIGNED_AUDIT_TOKEN_CERT_STATUS_CHANGE_REQUEST_10"; + String auditType = AuditEvent.TOKEN_CERT_STATUS_CHANGE_REQUEST; /* * requestType is "revoke", "on-hold", or "off-hold" */ 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 50453ee3b..6efe4cbb9 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/AuthenticatorService.java @@ -39,6 +39,7 @@ import com.netscape.certsrv.base.BadRequestException; import com.netscape.certsrv.base.ForbiddenException; import com.netscape.certsrv.base.PKIException; import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.tps.authenticator.AuthenticatorCollection; import com.netscape.certsrv.tps.authenticator.AuthenticatorData; @@ -474,7 +475,7 @@ public class AuthenticatorService extends SubsystemService implements Authentica Map<String, String> params, String info) { String msg = CMS.getLogMessage( - "LOGGING_SIGNED_AUDIT_CONFIG_TOKEN_AUTHENTICATOR_6", + AuditEvent.CONFIG_TOKEN_AUTHENTICATOR, servletRequest.getUserPrincipal().getName(), status, service, 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 01bc1323c..3e1e5df2e 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/ConnectorService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/ConnectorService.java @@ -39,6 +39,7 @@ import com.netscape.certsrv.base.BadRequestException; import com.netscape.certsrv.base.ForbiddenException; import com.netscape.certsrv.base.PKIException; import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.tps.connector.ConnectorCollection; import com.netscape.certsrv.tps.connector.ConnectorData; @@ -471,7 +472,7 @@ public class ConnectorService extends SubsystemService implements ConnectorResou String info) { String msg = CMS.getLogMessage( - "LOGGING_SIGNED_AUDIT_CONFIG_TOKEN_CONNECTOR_6", + AuditEvent.CONFIG_TOKEN_CONNECTOR, servletRequest.getUserPrincipal().getName(), status, service, 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 2c070c086..9bbb61686 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/ProfileMappingService.java @@ -39,6 +39,7 @@ import com.netscape.certsrv.base.BadRequestException; import com.netscape.certsrv.base.ForbiddenException; import com.netscape.certsrv.base.PKIException; import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.tps.profile.ProfileMappingCollection; import com.netscape.certsrv.tps.profile.ProfileMappingData; @@ -448,7 +449,7 @@ public class ProfileMappingService extends SubsystemService implements ProfileMa public void auditMappingResolverChange(String status, String service, String resolverID, Map<String, String> params, String info) { String msg = CMS.getLogMessage( - "LOGGING_SIGNED_AUDIT_CONFIG_TOKEN_MAPPING_RESOLVER_6", + AuditEvent.CONFIG_TOKEN_MAPPING_RESOLVER, servletRequest.getUserPrincipal().getName(), status, service, 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 8058caf6a..43e14bea0 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/ProfileService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/ProfileService.java @@ -39,6 +39,7 @@ import com.netscape.certsrv.base.BadRequestException; import com.netscape.certsrv.base.ForbiddenException; import com.netscape.certsrv.base.PKIException; import com.netscape.certsrv.common.Constants; +import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.tps.profile.ProfileCollection; import com.netscape.certsrv.tps.profile.ProfileData; @@ -470,7 +471,7 @@ public class ProfileService extends SubsystemService implements ProfileResource String info) { String msg = CMS.getLogMessage( - "LOGGING_SIGNED_AUDIT_CONFIG_TOKEN_PROFILE_6", + AuditEvent.CONFIG_TOKEN_PROFILE, servletRequest.getUserPrincipal().getName(), status, service, 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 f3d0d80ef..73d0a647f 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/TokenService.java @@ -44,6 +44,7 @@ import com.netscape.certsrv.base.PKIException; import com.netscape.certsrv.dbs.EDBException; import com.netscape.certsrv.dbs.IDBVirtualList; import com.netscape.certsrv.ldap.LDAPExceptionConverter; +import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.tps.token.TokenCollection; import com.netscape.certsrv.tps.token.TokenData; @@ -814,7 +815,7 @@ public class TokenService extends SubsystemService implements TokenResource { String info) { String msg = CMS.getLogMessage( - "LOGGING_SIGNED_AUDIT_CONFIG_TOKEN_RECORD_6", + AuditEvent.CONFIG_TOKEN_RECORD, servletRequest.getUserPrincipal().getName(), status, service, @@ -832,7 +833,7 @@ public class TokenService extends SubsystemService implements TokenResource { String newReason, Map<String, String> params, String info) { String msg = CMS.getLogMessage( - "LOGGING_SIGNED_AUDIT_TOKEN_STATE_CHANGE_8", + AuditEvent.TOKEN_STATE_CHANGE, servletRequest.getUserPrincipal().getName(), status, oldState.toString(), |