diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2017-04-12 05:23:15 +0200 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2017-04-12 16:24:34 +0200 |
| commit | 20a307e4683e62b033f7662ed4aa2f18dfad6226 (patch) | |
| tree | a297341f093d22aa7f363ba022e3587bd1fe8e9f /base/server/cms/src/com/netscape/cms/servlet/admin | |
| parent | e0b3e36b6737e872e479624780497373765600f4 (diff) | |
| download | pki-20a307e4683e62b033f7662ed4aa2f18dfad6226.tar.gz pki-20a307e4683e62b033f7662ed4aa2f18dfad6226.tar.xz pki-20a307e4683e62b033f7662ed4aa2f18dfad6226.zip | |
Reorganized audit event constants for configuration.
Change-Id: Ie05572677de0e8eb1244dc6caf2b4a48514a2542
Diffstat (limited to 'base/server/cms/src/com/netscape/cms/servlet/admin')
12 files changed, 352 insertions, 381 deletions
diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java index 1244da12c..8c5da18e4 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/ACLAdminServlet.java @@ -38,6 +38,7 @@ import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.common.OpDef; import com.netscape.certsrv.common.ScopeDef; import com.netscape.certsrv.evaluators.IAccessEvaluator; +import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; /** @@ -55,9 +56,6 @@ public class ACLAdminServlet extends AdminServlet { private final static String INFO = "ACLAdminServlet"; private IAuthzManager mAuthzMgr = null; - private final static String LOGGING_SIGNED_AUDIT_CONFIG_ACL = - "LOGGING_SIGNED_AUDIT_CONFIG_ACL_3"; - /** * initialize the servlet. * <ul> @@ -338,7 +336,7 @@ public class ACLAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ACL, + AuditEvent.CONFIG_ACL, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -363,7 +361,7 @@ public class ACLAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ACL, + AuditEvent.CONFIG_ACL, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -377,7 +375,7 @@ public class ACLAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ACL, + AuditEvent.CONFIG_ACL, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -404,7 +402,7 @@ public class ACLAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ACL, + AuditEvent.CONFIG_ACL, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -502,7 +500,7 @@ public class ACLAdminServlet extends AdminServlet { if (type == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ACL, + AuditEvent.CONFIG_ACL, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -544,7 +542,7 @@ public class ACLAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ACL, + AuditEvent.CONFIG_ACL, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -567,7 +565,7 @@ public class ACLAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ACL, + AuditEvent.CONFIG_ACL, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -587,7 +585,7 @@ public class ACLAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ACL, + AuditEvent.CONFIG_ACL, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -612,7 +610,7 @@ public class ACLAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ACL, + AuditEvent.CONFIG_ACL, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -635,7 +633,7 @@ public class ACLAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ACL, + AuditEvent.CONFIG_ACL, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -660,7 +658,7 @@ public class ACLAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ACL, + AuditEvent.CONFIG_ACL, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -683,7 +681,7 @@ public class ACLAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ACL, + AuditEvent.CONFIG_ACL, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -741,7 +739,7 @@ public class ACLAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ACL, + AuditEvent.CONFIG_ACL, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -762,7 +760,7 @@ public class ACLAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ACL, + AuditEvent.CONFIG_ACL, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -797,7 +795,7 @@ public class ACLAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ACL, + AuditEvent.CONFIG_ACL, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -812,7 +810,7 @@ public class ACLAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ACL, + AuditEvent.CONFIG_ACL, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -836,7 +834,7 @@ public class ACLAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ACL, + AuditEvent.CONFIG_ACL, auditSubjectID, ILogger.FAILURE, auditParams(req)); 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 0350e388b..089fcbe45 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 @@ -122,8 +122,6 @@ public class AdminServlet extends HttpServlet { public static final String CERT_ATTR = "javax.servlet.request.X509Certificate"; - private final static String LOGGING_SIGNED_AUDIT_ROLE_ASSUME = - "LOGGING_SIGNED_AUDIT_ROLE_ASSUME_3"; private final static String CERTUSERDB = IAuthSubsystem.CERTUSERDB_AUTHMGR_ID; private final static String PASSWDUSERDB = @@ -657,7 +655,7 @@ public class AdminServlet extends HttpServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_ROLE_ASSUME, + AuditEvent.ROLE_ASSUME, auditSubjectID, ILogger.FAILURE, auditGroups(auditSubjectID)); @@ -680,7 +678,7 @@ public class AdminServlet extends HttpServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_ROLE_ASSUME, + AuditEvent.ROLE_ASSUME, auditSubjectID, ILogger.FAILURE, auditGroups(auditSubjectID)); @@ -701,7 +699,7 @@ public class AdminServlet extends HttpServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_ROLE_ASSUME, + AuditEvent.ROLE_ASSUME, auditSubjectID, ILogger.FAILURE, auditGroups(auditSubjectID)); @@ -723,7 +721,7 @@ public class AdminServlet extends HttpServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_ROLE_ASSUME, + AuditEvent.ROLE_ASSUME, auditSubjectID, ILogger.SUCCESS, auditGroups(auditSubjectID)); diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java index 71cf8a2ac..253a9cd53 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/AuthAdminServlet.java @@ -43,6 +43,7 @@ import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.common.OpDef; import com.netscape.certsrv.common.ScopeDef; import com.netscape.certsrv.ldap.ILdapAuthInfo; +import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; /** @@ -66,9 +67,6 @@ public class AuthAdminServlet extends AdminServlet { "PASSWORD_CACHE_ADD"; private final static String EDIT = ";" + Constants.EDIT; - private final static String LOGGING_SIGNED_AUDIT_CONFIG_AUTH = - "LOGGING_SIGNED_AUDIT_CONFIG_AUTH_3"; - public AuthAdminServlet() { super(); } @@ -382,7 +380,7 @@ public class AuthAdminServlet extends AdminServlet { if (id == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -399,7 +397,7 @@ public class AuthAdminServlet extends AdminServlet { if (mAuths.getPlugins().containsKey(id)) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -419,7 +417,7 @@ public class AuthAdminServlet extends AdminServlet { if (classPath == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -436,7 +434,7 @@ public class AuthAdminServlet extends AdminServlet { classPath.equals("com.netscape.cmscore.authentication.CertUserDBAuthentication")) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -464,7 +462,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (ClassNotFoundException e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -478,7 +476,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (IllegalArgumentException e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -496,7 +494,7 @@ public class AuthAdminServlet extends AdminServlet { if (IAuthManager.class.isAssignableFrom(newImpl) == false) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -511,7 +509,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (NullPointerException e) { // unlikely, only if newImpl null. // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -534,7 +532,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (EBaseException e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -559,7 +557,7 @@ public class AuthAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -583,7 +581,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -638,7 +636,7 @@ public class AuthAdminServlet extends AdminServlet { if (id == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -655,7 +653,7 @@ public class AuthAdminServlet extends AdminServlet { if (mAuths.getInstances().containsKey(id)) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -676,7 +674,7 @@ public class AuthAdminServlet extends AdminServlet { if (implname == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -703,7 +701,7 @@ public class AuthAdminServlet extends AdminServlet { if (plugin == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -756,7 +754,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (ClassNotFoundException e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -774,7 +772,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (InstantiationException e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -791,7 +789,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (IllegalAccessException e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -813,7 +811,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (EBaseException e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -832,7 +830,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (EBaseException e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -859,7 +857,7 @@ public class AuthAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -871,7 +869,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -883,7 +881,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -986,7 +984,7 @@ public class AuthAdminServlet extends AdminServlet { if (id == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1011,7 +1009,7 @@ public class AuthAdminServlet extends AdminServlet { if (mAuths.getPlugins().containsKey(id) == false) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1034,7 +1032,7 @@ public class AuthAdminServlet extends AdminServlet { if (authMgr.getImplName() == id) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1063,7 +1061,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (EBaseException e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1078,7 +1076,7 @@ public class AuthAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1102,7 +1100,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1158,7 +1156,7 @@ public class AuthAdminServlet extends AdminServlet { if (id == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1183,7 +1181,7 @@ public class AuthAdminServlet extends AdminServlet { if (mAuths.getInstances().containsKey(id) == false) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1216,7 +1214,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (EBaseException e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1238,7 +1236,7 @@ public class AuthAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1262,7 +1260,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1409,7 +1407,7 @@ public class AuthAdminServlet extends AdminServlet { if (id == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1434,7 +1432,7 @@ public class AuthAdminServlet extends AdminServlet { if (!mAuths.getInstances().containsKey(id)) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1453,7 +1451,7 @@ public class AuthAdminServlet extends AdminServlet { if (implname == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1472,7 +1470,7 @@ public class AuthAdminServlet extends AdminServlet { if (plugin == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1548,7 +1546,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (ClassNotFoundException e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1566,7 +1564,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (InstantiationException e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1583,7 +1581,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (IllegalAccessException e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1606,7 +1604,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (EBaseException e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1625,7 +1623,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (EBaseException e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1652,7 +1650,7 @@ public class AuthAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1664,7 +1662,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1676,7 +1674,7 @@ public class AuthAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_AUTH, + AuditEvent.CONFIG_AUTH, auditSubjectID, ILogger.FAILURE, auditParams(req)); diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/CAAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/CAAdminServlet.java index 09c77e557..5ece2c8d5 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/CAAdminServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/CAAdminServlet.java @@ -39,6 +39,7 @@ import com.netscape.certsrv.common.Constants; import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.common.OpDef; import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.request.IRequestListener; import com.netscape.cmsutil.util.Utils; @@ -62,9 +63,6 @@ public class CAAdminServlet extends AdminServlet { private final static String INFO = "CAAdminServlet"; - private final static String LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE = - "LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE_3"; - private ICertificateAuthority mCA = null; protected static final String PROP_ENABLED = "enabled"; @@ -537,7 +535,7 @@ public class CAAdminServlet extends AdminServlet { if (ipId == null || ipId.length() == 0) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -554,7 +552,7 @@ public class CAAdminServlet extends AdminServlet { if (desc == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -587,7 +585,7 @@ public class CAAdminServlet extends AdminServlet { if (ipId.equals(name)) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -601,7 +599,7 @@ public class CAAdminServlet extends AdminServlet { if (!mCA.addCRLIssuingPoint(crlSubStore, ipId, enable, desc)) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -615,7 +613,7 @@ public class CAAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -626,7 +624,7 @@ public class CAAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -638,7 +636,7 @@ public class CAAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -693,7 +691,7 @@ public class CAAdminServlet extends AdminServlet { if (ipId == null || ipId.length() == 0) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -710,7 +708,7 @@ public class CAAdminServlet extends AdminServlet { if (desc == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -762,7 +760,7 @@ public class CAAdminServlet extends AdminServlet { if (!done) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -776,7 +774,7 @@ public class CAAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -787,7 +785,7 @@ public class CAAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -799,7 +797,7 @@ public class CAAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -869,7 +867,7 @@ public class CAAdminServlet extends AdminServlet { if (!done) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -884,7 +882,7 @@ public class CAAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -895,7 +893,7 @@ public class CAAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -907,7 +905,7 @@ public class CAAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1039,7 +1037,7 @@ public class CAAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1050,7 +1048,7 @@ public class CAAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1062,7 +1060,7 @@ public class CAAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1246,7 +1244,7 @@ public class CAAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1260,7 +1258,7 @@ public class CAAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1272,7 +1270,7 @@ public class CAAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CRL_PROFILE, + AuditEvent.CONFIG_CRL_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java index 3e73dc6e1..229c3779a 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/CMSAdminServlet.java @@ -106,14 +106,6 @@ public final class CMSAdminServlet extends AdminServlet { private ILogger mSignedAuditLogger = CMS.getSignedAuditLogger(); private final static byte EOL[] = { Character.LINE_SEPARATOR }; - private final static String LOGGING_SIGNED_AUDIT_CONFIG_ENCRYPTION = - "LOGGING_SIGNED_AUDIT_CONFIG_ENCRYPTION_3"; - private final static String LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY = - "LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY_3"; - private final static String LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION = - "LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION_2"; - private final static String LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION = - "LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION_3"; // CMS must be instantiated before this admin servlet. @@ -574,7 +566,7 @@ public final class CMSAdminServlet extends AdminServlet { if (tokenizer.countTokens() != 2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ENCRYPTION, + AuditEvent.CONFIG_ENCRYPTION, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -599,7 +591,7 @@ public final class CMSAdminServlet extends AdminServlet { } else // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ENCRYPTION, + AuditEvent.CONFIG_ENCRYPTION, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -636,7 +628,7 @@ public final class CMSAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ENCRYPTION, + AuditEvent.CONFIG_ENCRYPTION, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -648,7 +640,7 @@ public final class CMSAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ENCRYPTION, + AuditEvent.CONFIG_ENCRYPTION, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -660,7 +652,7 @@ public final class CMSAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ENCRYPTION, + AuditEvent.CONFIG_ENCRYPTION, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1494,7 +1486,7 @@ public final class CMSAdminServlet extends AdminServlet { } else { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1514,7 +1506,7 @@ public final class CMSAdminServlet extends AdminServlet { } else { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1534,7 +1526,7 @@ public final class CMSAdminServlet extends AdminServlet { if (nickname.equals("")) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1781,7 +1773,7 @@ public final class CMSAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1794,7 +1786,7 @@ public final class CMSAdminServlet extends AdminServlet { CMS.debug("CMSAdminServlet: issueImportCert: EBaseException thrown: " + eAudit1.toString()); // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1807,7 +1799,7 @@ public final class CMSAdminServlet extends AdminServlet { CMS.debug("CMSAdminServlet: issueImportCert: IOException thrown: " + eAudit2.toString()); // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1900,7 +1892,7 @@ public final class CMSAdminServlet extends AdminServlet { if (certpath == null || certpath.equals("")) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1934,7 +1926,7 @@ public final class CMSAdminServlet extends AdminServlet { } catch (IOException ee) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1964,7 +1956,7 @@ public final class CMSAdminServlet extends AdminServlet { } else { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2193,7 +2185,7 @@ public final class CMSAdminServlet extends AdminServlet { verified = true; auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION, + AuditEvent.CIMC_CERT_VERIFICATION, auditSubjectID, ILogger.SUCCESS, nickname); @@ -2203,7 +2195,7 @@ public final class CMSAdminServlet extends AdminServlet { } catch (Exception e) { CMS.debug(e); auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CIMC_CERT_VERIFICATION, + AuditEvent.CIMC_CERT_VERIFICATION, auditSubjectID, ILogger.FAILURE, nickname); @@ -2213,7 +2205,7 @@ public final class CMSAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -2230,7 +2222,7 @@ public final class CMSAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2242,7 +2234,7 @@ public final class CMSAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2319,7 +2311,7 @@ public final class CMSAdminServlet extends AdminServlet { if (certpath == null || certpath.equals("")) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2352,7 +2344,7 @@ public final class CMSAdminServlet extends AdminServlet { } catch (IOException ee) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2386,7 +2378,7 @@ public final class CMSAdminServlet extends AdminServlet { } catch (Exception e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2405,7 +2397,7 @@ public final class CMSAdminServlet extends AdminServlet { } catch (EBaseException e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2426,7 +2418,7 @@ public final class CMSAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -2437,7 +2429,7 @@ public final class CMSAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2449,7 +2441,7 @@ public final class CMSAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2952,7 +2944,7 @@ public final class CMSAdminServlet extends AdminServlet { jssSubSystem.setRootCertTrust(nickname, serialno, issuername, trust); } catch (EBaseException e) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2964,7 +2956,7 @@ public final class CMSAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -3020,7 +3012,7 @@ public final class CMSAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -3032,7 +3024,7 @@ public final class CMSAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -3044,7 +3036,7 @@ public final class CMSAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_TRUSTED_PUBLIC_KEY, + AuditEvent.CONFIG_TRUSTED_PUBLIC_KEY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -3132,7 +3124,7 @@ public final class CMSAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION, + AuditEvent.SELFTESTS_EXECUTION, auditSubjectID, ILogger.FAILURE); @@ -3185,7 +3177,7 @@ public final class CMSAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION, + AuditEvent.SELFTESTS_EXECUTION, auditSubjectID, ILogger.FAILURE); @@ -3215,7 +3207,7 @@ public final class CMSAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION, + AuditEvent.SELFTESTS_EXECUTION, auditSubjectID, ILogger.FAILURE); @@ -3268,7 +3260,7 @@ public final class CMSAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION, + AuditEvent.SELFTESTS_EXECUTION, auditSubjectID, ILogger.FAILURE); @@ -3316,7 +3308,7 @@ public final class CMSAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION, + AuditEvent.SELFTESTS_EXECUTION, auditSubjectID, ILogger.SUCCESS); @@ -3336,7 +3328,7 @@ public final class CMSAdminServlet extends AdminServlet { } catch (EMissingSelfTestException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION, + AuditEvent.SELFTESTS_EXECUTION, auditSubjectID, ILogger.FAILURE); @@ -3347,7 +3339,7 @@ public final class CMSAdminServlet extends AdminServlet { } catch (ESelfTestException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION, + AuditEvent.SELFTESTS_EXECUTION, auditSubjectID, ILogger.FAILURE); @@ -3358,7 +3350,7 @@ public final class CMSAdminServlet extends AdminServlet { } catch (IOException eAudit3) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_SELFTESTS_EXECUTION, + AuditEvent.SELFTESTS_EXECUTION, auditSubjectID, ILogger.FAILURE); 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 f974db425..00f960e8e 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 @@ -43,8 +43,8 @@ import com.netscape.certsrv.group.GroupMemberCollection; import com.netscape.certsrv.group.GroupMemberData; import com.netscape.certsrv.group.GroupNotFoundException; import com.netscape.certsrv.group.GroupResource; +import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.AuditFormat; -import com.netscape.certsrv.logging.IAuditor; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.usrgrp.IGroup; import com.netscape.certsrv.usrgrp.IUGSubsystem; @@ -388,6 +388,6 @@ public class GroupMemberProcessor extends Processor { } public void audit(String type, String id, Map<String, String> params, String status) { - audit(IAuditor.LOGGING_SIGNED_AUDIT_CONFIG_ROLE, ScopeDef.SC_GROUP_MEMBERS, type, id, params, status); + audit(AuditEvent.CONFIG_ROLE, ScopeDef.SC_GROUP_MEMBERS, type, id, params, status); } } diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java index 3f9f558e0..5583d126c 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/KRAAdminServlet.java @@ -32,6 +32,7 @@ import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.common.OpDef; import com.netscape.certsrv.common.ScopeDef; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; /** @@ -54,9 +55,6 @@ public class KRAAdminServlet extends AdminServlet { private IKeyRecoveryAuthority mKRA = null; - private final static String LOGGING_SIGNED_AUDIT_CONFIG_DRM = - "LOGGING_SIGNED_AUDIT_CONFIG_DRM_3"; - /** * Constructs KRA servlet. */ @@ -204,7 +202,7 @@ public class KRAAdminServlet extends AdminServlet { mKRA.setNoOfRequiredAgents(number); } catch (NumberFormatException e) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_DRM, + AuditEvent.CONFIG_DRM, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -218,7 +216,7 @@ public class KRAAdminServlet extends AdminServlet { commit(true); auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_DRM, + AuditEvent.CONFIG_DRM, auditSubjectID, ILogger.SUCCESS, auditParams(req)); diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/LogAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/LogAdminServlet.java index 13ba52c15..c4245205e 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/LogAdminServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/LogAdminServlet.java @@ -36,6 +36,7 @@ import com.netscape.certsrv.common.Constants; import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.common.OpDef; import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ELogException; import com.netscape.certsrv.logging.ELogNotFound; import com.netscape.certsrv.logging.ELogPluginNotFound; @@ -64,10 +65,6 @@ public class LogAdminServlet extends AdminServlet { private ILogSubsystem mSys = null; private final static String SIGNED_AUDIT_LOG_TYPE = "SignedAudit"; - private final static String LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT = - "LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT_3"; - private final static String LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE = - "LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE_4"; /** * Constructs Log servlet. @@ -439,7 +436,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -458,7 +455,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -479,7 +476,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -508,7 +505,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -524,7 +521,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -544,7 +541,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -561,7 +558,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -588,7 +585,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -612,7 +609,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -637,7 +634,7 @@ public class LogAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -709,7 +706,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -727,7 +724,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -744,7 +741,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -766,7 +763,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -789,7 +786,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -849,7 +846,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -868,7 +865,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -887,7 +884,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -912,7 +909,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -928,7 +925,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -950,7 +947,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -974,7 +971,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -999,7 +996,7 @@ public class LogAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1103,7 +1100,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1122,7 +1119,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1158,7 +1155,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1175,7 +1172,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1200,7 +1197,7 @@ public class LogAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1265,7 +1262,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1283,7 +1280,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1308,7 +1305,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1339,7 +1336,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1356,7 +1353,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1381,7 +1378,7 @@ public class LogAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1472,7 +1469,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1491,7 +1488,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1512,7 +1509,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1534,7 +1531,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1673,7 +1670,7 @@ public class LogAdminServlet extends AdminServlet { // file (regardless of logType) if (!(newLogPath.equals(origLogPath))) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE, + AuditEvent.LOG_PATH_CHANGE, auditSubjectID, ILogger.FAILURE, logType, @@ -1686,7 +1683,7 @@ public class LogAdminServlet extends AdminServlet { // file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1775,7 +1772,7 @@ public class LogAdminServlet extends AdminServlet { // (regardless of logType) if (!(newLogPath.equals(origLogPath))) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE, + AuditEvent.LOG_PATH_CHANGE, auditSubjectID, ILogger.FAILURE, logType, @@ -1801,7 +1798,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1827,7 +1824,7 @@ public class LogAdminServlet extends AdminServlet { // (regardless of logType) if (!(newLogPath.equals(origLogPath))) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE, + AuditEvent.LOG_PATH_CHANGE, auditSubjectID, ILogger.FAILURE, logType, @@ -1852,7 +1849,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1878,7 +1875,7 @@ public class LogAdminServlet extends AdminServlet { // (regardless of logType) if (!(newLogPath.equals(origLogPath))) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE, + AuditEvent.LOG_PATH_CHANGE, auditSubjectID, ILogger.FAILURE, logType, @@ -1903,7 +1900,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1937,7 +1934,7 @@ public class LogAdminServlet extends AdminServlet { // (regardless of logType) if (!(newLogPath.equals(origLogPath))) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE, + AuditEvent.LOG_PATH_CHANGE, auditSubjectID, ILogger.FAILURE, logType, @@ -1962,7 +1959,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1996,7 +1993,7 @@ public class LogAdminServlet extends AdminServlet { // (regardless of logType) if (!(newLogPath.equals(origLogPath))) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE, + AuditEvent.LOG_PATH_CHANGE, auditSubjectID, ILogger.SUCCESS, logType, @@ -2021,7 +2018,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -2042,7 +2039,7 @@ public class LogAdminServlet extends AdminServlet { // (regardless of logType) if (!(newLogPath.equals(origLogPath))) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE, + AuditEvent.LOG_PATH_CHANGE, auditSubjectID, ILogger.FAILURE, logType, @@ -2067,7 +2064,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2088,7 +2085,7 @@ public class LogAdminServlet extends AdminServlet { // (regardless of logType) if (!(newLogPath.equals(origLogPath))) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_LOG_PATH_CHANGE, + AuditEvent.LOG_PATH_CHANGE, auditSubjectID, ILogger.FAILURE, logType, @@ -2113,7 +2110,7 @@ public class LogAdminServlet extends AdminServlet { // store a message in the signed audit log file if (logType.equals(SIGNED_AUDIT_LOG_TYPE)) { auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_SIGNED_AUDIT, + AuditEvent.CONFIG_SIGNED_AUDIT, auditSubjectID, ILogger.FAILURE, auditParams(req)); diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java index a7ff92274..ee1c3a260 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/OCSPAdminServlet.java @@ -34,6 +34,7 @@ import com.netscape.certsrv.common.Constants; import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.common.OpDef; import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.ocsp.IOCSPAuthority; import com.netscape.certsrv.ocsp.IOCSPStore; @@ -57,9 +58,6 @@ public class OCSPAdminServlet extends AdminServlet { private final static String INFO = "OCSPAdminServlet"; - private final static String LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE = - "LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE_3"; - private IOCSPAuthority mOCSP = null; public OCSPAdminServlet() { @@ -256,7 +254,7 @@ public class OCSPAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE, + AuditEvent.CONFIG_OCSP_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -267,7 +265,7 @@ public class OCSPAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE, + AuditEvent.CONFIG_OCSP_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -279,7 +277,7 @@ public class OCSPAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE, + AuditEvent.CONFIG_OCSP_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -368,7 +366,7 @@ public class OCSPAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE, + AuditEvent.CONFIG_OCSP_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -379,7 +377,7 @@ public class OCSPAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE, + AuditEvent.CONFIG_OCSP_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -391,7 +389,7 @@ public class OCSPAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE, + AuditEvent.CONFIG_OCSP_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -503,7 +501,7 @@ public class OCSPAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE, + AuditEvent.CONFIG_OCSP_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -514,7 +512,7 @@ public class OCSPAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE, + AuditEvent.CONFIG_OCSP_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -526,7 +524,7 @@ public class OCSPAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_OCSP_PROFILE, + AuditEvent.CONFIG_OCSP_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java index 1fe9c870c..7a09e8325 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/PolicyAdminServlet.java @@ -41,6 +41,7 @@ import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.common.OpDef; import com.netscape.certsrv.common.ScopeDef; import com.netscape.certsrv.kra.IKeyRecoveryAuthority; +import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.ra.IRegistrationAuthority; @@ -83,9 +84,6 @@ public class PolicyAdminServlet extends AdminServlet { public static String COMMA = ","; public static String MISSING_POLICY_ORDERING = "Missing policy ordering"; - private final static String LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY = - "LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY_3"; - /** * Constructs administration servlet. */ @@ -506,7 +504,7 @@ public class PolicyAdminServlet extends AdminServlet { if (id == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -522,7 +520,7 @@ public class PolicyAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -535,7 +533,7 @@ public class PolicyAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -547,7 +545,7 @@ public class PolicyAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -628,7 +626,7 @@ public class PolicyAdminServlet extends AdminServlet { if (id == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -644,7 +642,7 @@ public class PolicyAdminServlet extends AdminServlet { if (classPath == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -659,7 +657,7 @@ public class PolicyAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -670,7 +668,7 @@ public class PolicyAdminServlet extends AdminServlet { } catch (Exception e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -682,7 +680,7 @@ public class PolicyAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -735,7 +733,7 @@ public class PolicyAdminServlet extends AdminServlet { if (id == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -751,7 +749,7 @@ public class PolicyAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -764,7 +762,7 @@ public class PolicyAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -776,7 +774,7 @@ public class PolicyAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -875,7 +873,7 @@ public class PolicyAdminServlet extends AdminServlet { if (id == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -892,7 +890,7 @@ public class PolicyAdminServlet extends AdminServlet { if (implName == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -925,7 +923,7 @@ public class PolicyAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -956,7 +954,7 @@ public class PolicyAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -967,7 +965,7 @@ public class PolicyAdminServlet extends AdminServlet { } catch (Exception e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -979,7 +977,7 @@ public class PolicyAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1032,7 +1030,7 @@ public class PolicyAdminServlet extends AdminServlet { if (policyOrder == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1047,7 +1045,7 @@ public class PolicyAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1058,7 +1056,7 @@ public class PolicyAdminServlet extends AdminServlet { } catch (Exception e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1070,7 +1068,7 @@ public class PolicyAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1123,7 +1121,7 @@ public class PolicyAdminServlet extends AdminServlet { if (id == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1140,7 +1138,7 @@ public class PolicyAdminServlet extends AdminServlet { if (implName == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1172,7 +1170,7 @@ public class PolicyAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1208,7 +1206,7 @@ public class PolicyAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1219,7 +1217,7 @@ public class PolicyAdminServlet extends AdminServlet { } catch (Exception e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1231,7 +1229,7 @@ public class PolicyAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_POLICY, + AuditEvent.CONFIG_CERT_POLICY, auditSubjectID, ILogger.FAILURE, auditParams(req)); diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java index b418baf41..c4b40c094 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/ProfileAdminServlet.java @@ -34,6 +34,7 @@ import com.netscape.certsrv.common.Constants; import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.common.OpDef; import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.profile.EProfileException; import com.netscape.certsrv.profile.IPolicyConstraint; @@ -88,9 +89,6 @@ public class ProfileAdminServlet extends AdminServlet { public static String MISSING_POLICY_ORDERING = "Missing policy ordering"; public static String BAD_CONFIGURATION_VAL = "Invalid configuration value."; - private final static String LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE = - "LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE_3"; - /** * Constructs administration servlet. */ @@ -425,7 +423,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -475,7 +473,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -492,7 +490,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -503,7 +501,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -566,7 +564,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -599,7 +597,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -617,7 +615,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -628,7 +626,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -691,7 +689,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -725,7 +723,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -743,7 +741,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -754,7 +752,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -826,7 +824,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -848,7 +846,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -863,7 +861,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -874,7 +872,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -948,7 +946,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -965,7 +963,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (EBaseException e1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -980,7 +978,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -991,7 +989,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1065,7 +1063,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1082,7 +1080,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (EBaseException e1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1097,7 +1095,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1108,7 +1106,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1170,7 +1168,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1219,7 +1217,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (Exception e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1233,7 +1231,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1244,7 +1242,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1306,7 +1304,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1356,7 +1354,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (Exception e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1371,7 +1369,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1382,7 +1380,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1444,7 +1442,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1488,7 +1486,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (Exception e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1502,7 +1500,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1513,7 +1511,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1575,7 +1573,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1607,7 +1605,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (Exception e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1621,7 +1619,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1632,7 +1630,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1694,7 +1692,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1727,7 +1725,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (Exception e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1741,7 +1739,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1752,7 +1750,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1814,7 +1812,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1861,7 +1859,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (Exception e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1876,7 +1874,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1887,7 +1885,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2278,7 +2276,7 @@ public class ProfileAdminServlet extends AdminServlet { if (id == null) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2294,7 +2292,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (EProfileException e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2307,7 +2305,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -2318,7 +2316,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2391,7 +2389,7 @@ public class ProfileAdminServlet extends AdminServlet { if (id == null || id.trim().equals("") || !isValidId(id)) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2441,7 +2439,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (EBaseException e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2480,7 +2478,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2493,7 +2491,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -2504,7 +2502,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2563,7 +2561,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2591,7 +2589,7 @@ public class ProfileAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -2607,7 +2605,7 @@ public class ProfileAdminServlet extends AdminServlet { } catch (IOException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_CERT_PROFILE, + AuditEvent.CONFIG_CERT_PROFILE, auditSubjectID, ILogger.FAILURE, auditParams(req)); diff --git a/base/server/cms/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java b/base/server/cms/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java index cce1ce3f4..1c38b887f 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/admin/UsrGrpAdminServlet.java @@ -48,6 +48,7 @@ import com.netscape.certsrv.common.Constants; import com.netscape.certsrv.common.NameValuePairs; import com.netscape.certsrv.common.OpDef; import com.netscape.certsrv.common.ScopeDef; +import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.AuditFormat; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.password.IPasswordCheck; @@ -87,9 +88,6 @@ public class UsrGrpAdminServlet extends AdminServlet { private final static String BACK_SLASH = "\\"; - private final static String LOGGING_SIGNED_AUDIT_CONFIG_ROLE = - "LOGGING_SIGNED_AUDIT_CONFIG_ROLE_3"; - private IUGSubsystem mMgr = null; private static String[] mMultiRoleGroupEnforceList = null; @@ -682,7 +680,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -701,7 +699,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -720,7 +718,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -743,7 +741,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -770,7 +768,7 @@ public class UsrGrpAdminServlet extends AdminServlet { if (!passwdCheck.isGoodPassword(pword)) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -823,7 +821,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -846,7 +844,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -872,7 +870,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -886,7 +884,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -907,7 +905,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -921,7 +919,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -933,7 +931,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -993,7 +991,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1016,7 +1014,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1056,7 +1054,7 @@ public class UsrGrpAdminServlet extends AdminServlet { if (p7certs.length == 0) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1091,7 +1089,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1157,7 +1155,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1173,7 +1171,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1195,7 +1193,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1211,7 +1209,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1227,7 +1225,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1241,7 +1239,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } catch (ConflictingOperationException e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1257,7 +1255,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1283,7 +1281,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1346,7 +1344,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1368,7 +1366,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1386,7 +1384,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1400,7 +1398,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1426,7 +1424,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1497,7 +1495,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1519,7 +1517,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1539,7 +1537,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } else { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1561,7 +1559,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1573,7 +1571,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } catch (Exception ex) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1587,7 +1585,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1599,7 +1597,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1660,7 +1658,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1698,7 +1696,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1710,7 +1708,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } catch (Exception e) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1725,7 +1723,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1737,7 +1735,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1798,7 +1796,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1817,7 +1815,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1828,7 +1826,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1840,7 +1838,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1903,7 +1901,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1956,7 +1954,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } else { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -1980,7 +1978,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -1993,7 +1991,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2008,7 +2006,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2020,7 +2018,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2152,7 +2150,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2176,7 +2174,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2201,7 +2199,7 @@ public class UsrGrpAdminServlet extends AdminServlet { if (!passwdCheck.isGoodPassword(pword)) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2232,7 +2230,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.SUCCESS, auditParams(req)); @@ -2246,7 +2244,7 @@ public class UsrGrpAdminServlet extends AdminServlet { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2260,7 +2258,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } catch (EBaseException eAudit1) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); @@ -2272,7 +2270,7 @@ public class UsrGrpAdminServlet extends AdminServlet { } catch (IOException eAudit2) { // store a message in the signed audit log file auditMessage = CMS.getLogMessage( - LOGGING_SIGNED_AUDIT_CONFIG_ROLE, + AuditEvent.CONFIG_ROLE, auditSubjectID, ILogger.FAILURE, auditParams(req)); |