diff options
Diffstat (limited to 'base/server/cms/src/com')
3 files changed, 17 insertions, 28 deletions
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 a715c73f6..adf942422 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 @@ -54,6 +54,7 @@ import com.netscape.certsrv.logging.IAuditor; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.logging.event.AuthFailEvent; import com.netscape.certsrv.logging.event.AuthSuccessEvent; +import com.netscape.certsrv.logging.event.AuthzSuccessEvent; import com.netscape.certsrv.usrgrp.EUsrGrpException; import com.netscape.certsrv.usrgrp.IUGSubsystem; import com.netscape.certsrv.usrgrp.IUser; @@ -676,15 +677,11 @@ public class AdminServlet extends HttpServlet { return null; } - // store a message in the signed audit log file - auditMessage = CMS.getLogMessage( - AuditEvent.AUTHZ_SUCCESS, + audit(new AuthzSuccessEvent( auditSubjectID, ILogger.SUCCESS, auditACLResource, - auditOperation); - - audit(auditMessage); + auditOperation)); // store a message in the signed audit log file auditMessage = CMS.getLogMessage( diff --git a/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java b/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java index c23b9d187..c70f55ae6 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java +++ b/base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java @@ -68,6 +68,7 @@ import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.logging.event.AuthFailEvent; import com.netscape.certsrv.logging.event.AuthSuccessEvent; +import com.netscape.certsrv.logging.event.AuthzSuccessEvent; import com.netscape.certsrv.ra.IRegistrationAuthority; import com.netscape.certsrv.request.IRequest; import com.netscape.certsrv.request.IRequestQueue; @@ -1822,14 +1823,12 @@ public abstract class CMSServlet extends HttpServlet { try { authzToken = mAuthz.authorize(authzMgrName, authToken, exp); if (authzToken != null) { - auditMessage = CMS.getLogMessage( - AuditEvent.AUTHZ_SUCCESS, + + audit(new AuthzSuccessEvent( auditSubjectID, ILogger.SUCCESS, auditACLResource, - auditOperation); - - audit(auditMessage); + auditOperation)); // store a message in the signed audit log file auditMessage = CMS.getLogMessage( @@ -1955,15 +1954,12 @@ public abstract class CMSServlet extends HttpServlet { operation); if (authzTok != null) { - // store a message in the signed audit log file - auditMessage = CMS.getLogMessage( - AuditEvent.AUTHZ_SUCCESS, + + audit(new AuthzSuccessEvent( auditSubjectID, ILogger.SUCCESS, auditACLResource, - auditOperation); - - audit(auditMessage); + auditOperation)); // store a message in the signed audit log file auditMessage = CMS.getLogMessage( diff --git a/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java b/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java index a28bee17c..8760caf4d 100644 --- a/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java +++ b/base/server/cms/src/com/netscape/cms/servlet/processors/CAProcessor.java @@ -55,6 +55,7 @@ import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; import com.netscape.certsrv.logging.event.AuthFailEvent; import com.netscape.certsrv.logging.event.AuthSuccessEvent; +import com.netscape.certsrv.logging.event.AuthzSuccessEvent; import com.netscape.certsrv.profile.IProfile; import com.netscape.certsrv.profile.IProfileAuthenticator; import com.netscape.certsrv.profile.IProfileSubsystem; @@ -707,14 +708,12 @@ public class CAProcessor extends Processor { try { authzToken = authz.authorize(authzMgrName, authToken, exp); if (authzToken != null) { - auditMessage = CMS.getLogMessage( - AuditEvent.AUTHZ_SUCCESS, + + audit(new AuthzSuccessEvent( auditSubjectID, ILogger.SUCCESS, auditACLResource, - auditOperation); - - audit(auditMessage); + auditOperation)); // store a message in the signed audit log file auditMessage = CMS.getLogMessage( @@ -839,15 +838,12 @@ public class CAProcessor extends Processor { operation); if (authzTok != null) { - // store a message in the signed audit log file - auditMessage = CMS.getLogMessage( - AuditEvent.AUTHZ_SUCCESS, + + audit(new AuthzSuccessEvent( auditSubjectID, ILogger.SUCCESS, auditACLResource, - auditOperation); - - audit(auditMessage); + auditOperation)); // store a message in the signed audit log file auditMessage = CMS.getLogMessage( |