Added AuthSuccessEvent.

A new AuthSuccessEvent class of has been added to encapsulate the
AUTH_SUCCESS events.

https://pagure.io/dogtagpki/issue/2641

Change-Id: Ie7cc751728ac079e30ece354ca44c5266474bcd3

4 files changed, 22 insertions, 41 deletions

diff --git a/base/server/cms/src/com/netscape/cms/realm/PKIRealm.java b/base/server/cms/src/com/netscape/cms/realm/PKIRealm.java
index bcd3ff848..81de9fbf2 100644
--- a/base/server/cms/src/com/netscape/cms/realm/PKIRealm.java
+++ b/base/server/cms/src/com/netscape/cms/realm/PKIRealm.java
@@ -18,6 +18,7 @@ import com.netscape.certsrv.authentication.IPasswdUserDBAuthentication;
 import com.netscape.certsrv.base.SessionContext;
 import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
+import com.netscape.certsrv.logging.event.AuthSuccessEvent;
 import com.netscape.certsrv.usrgrp.EUsrGrpException;
 import com.netscape.certsrv.usrgrp.IGroup;
 import com.netscape.certsrv.usrgrp.IUGSubsystem;
@@ -60,14 +61,11 @@ public class PKIRealm extends RealmBase {
             authToken.set(SessionContext.AUTH_MANAGER_ID, IAuthSubsystem.PASSWDUSERDB_AUTHMGR_ID);
             auditSubjectID = authToken.getInString(IAuthToken.USER_ID);
 
-            // store a message in the signed audit log file
-            auditMessage = CMS.getLogMessage(
-                        AuditEvent.AUTH_SUCCESS,
+            audit(new AuthSuccessEvent(
                         auditSubjectID,
                         ILogger.SUCCESS,
-                        IAuthSubsystem.PASSWDUSERDB_AUTHMGR_ID);
+                        IAuthSubsystem.PASSWDUSERDB_AUTHMGR_ID));
 
-            audit(auditMessage);
             return getPrincipal(username, authToken);
 
         } catch (Throwable e) {
@@ -120,14 +118,12 @@ public class PKIRealm extends RealmBase {
             auditSubjectID = authToken.getInString(IAuthToken.USER_ID);
 
             CMS.debug("PKIRealm: User ID: " + username);
-            // store a message in the signed audit log file
-            auditMessage = CMS.getLogMessage(
-                        AuditEvent.AUTH_SUCCESS,
+
+            audit(new AuthSuccessEvent(
                         auditSubjectID,
                         ILogger.SUCCESS,
-                        IAuthSubsystem.CERTUSERDB_AUTHMGR_ID);
+                        IAuthSubsystem.CERTUSERDB_AUTHMGR_ID));
 
-            audit(auditMessage);
             return getPrincipal(username, authToken);
 
         } catch (Throwable e) {
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 16a2e393b..d530f6a84 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
@@ -35,8 +35,6 @@ import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import netscape.security.x509.X509CertImpl;
-
 import com.netscape.certsrv.apps.CMS;
 import com.netscape.certsrv.authentication.IAuthCredentials;
 import com.netscape.certsrv.authentication.IAuthManager;
@@ -54,12 +52,15 @@ import com.netscape.certsrv.common.NameValuePairs;
 import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.IAuditor;
 import com.netscape.certsrv.logging.ILogger;
+import com.netscape.certsrv.logging.event.AuthSuccessEvent;
 import com.netscape.certsrv.usrgrp.EUsrGrpException;
 import com.netscape.certsrv.usrgrp.IUGSubsystem;
 import com.netscape.certsrv.usrgrp.IUser;
 import com.netscape.cms.servlet.base.UserInfo;
 import com.netscape.cmsutil.util.Utils;
 
+import netscape.security.x509.X509CertImpl;
+
 /**
  * A class represents an administration servlet that
  * is responsible to serve administrative
@@ -524,23 +525,17 @@ public class AdminServlet extends HttpServlet {
             sc.put(SessionContext.LOCALE, locale);
 
             if (authType.equals("sslclientauth")) {
-                // store a message in the signed audit log file
-                auditMessage = CMS.getLogMessage(
-                            AuditEvent.AUTH_SUCCESS,
+
+                audit(new AuthSuccessEvent(
                             auditSubjectID(),
                             ILogger.SUCCESS,
-                            CERTUSERDB);
+                            CERTUSERDB));
 
-                audit(auditMessage);
             } else {
-                // store a message in the signed audit log file
-                auditMessage = CMS.getLogMessage(
-                            AuditEvent.AUTH_SUCCESS,
+                audit(new AuthSuccessEvent(
                             auditSubjectID(),
                             ILogger.SUCCESS,
-                            PASSWDUSERDB);
-
-                audit(auditMessage);
+                            PASSWDUSERDB));
             }
         } catch (IOException eAudit1) {
             if (authType.equals("sslclientauth")) {
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 a007a008b..9168870ad 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
@@ -66,6 +66,7 @@ import com.netscape.certsrv.dbs.certdb.ICertificateRepository;
 import com.netscape.certsrv.kra.IKeyRecoveryAuthority;
 import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
+import com.netscape.certsrv.logging.event.AuthSuccessEvent;
 import com.netscape.certsrv.ra.IRegistrationAuthority;
 import com.netscape.certsrv.request.IRequest;
 import com.netscape.certsrv.request.IRequestQueue;
@@ -1789,14 +1790,10 @@ public abstract class CMSServlet extends HttpServlet {
             // reset the "auditSubjectID"
             auditSubjectID = auditSubjectID();
 
-            // store a message in the signed audit log file
-            auditMessage = CMS.getLogMessage(
-                        AuditEvent.AUTH_SUCCESS,
+            audit(new AuthSuccessEvent(
                         auditSubjectID,
                         ILogger.SUCCESS,
-                        auditAuthMgrID);
-
-            audit(auditMessage);
+                        auditAuthMgrID));
 
             return authToken;
         } catch (EBaseException eAudit1) {
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 a98d55571..93d6a9a16 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
@@ -53,6 +53,7 @@ import com.netscape.certsrv.dbs.certdb.ICertRecord;
 import com.netscape.certsrv.dbs.certdb.ICertificateRepository;
 import com.netscape.certsrv.logging.AuditEvent;
 import com.netscape.certsrv.logging.ILogger;
+import com.netscape.certsrv.logging.event.AuthSuccessEvent;
 import com.netscape.certsrv.profile.IProfile;
 import com.netscape.certsrv.profile.IProfileAuthenticator;
 import com.netscape.certsrv.profile.IProfileSubsystem;
@@ -520,14 +521,10 @@ public class CAProcessor extends Processor {
 
             authSubjectID = authSubjectID + " : " + uid_cred;
 
-            // store a message in the signed audit log file
-            auditMessage = CMS.getLogMessage(
-                    AuditEvent.AUTH_SUCCESS,
+            audit(new AuthSuccessEvent(
                     authSubjectID,
                     ILogger.SUCCESS,
-                    authMgrID);
-
-            audit(auditMessage);
+                    authMgrID));
         }
         endTiming("profile_authentication");
         return authToken;
@@ -655,14 +652,10 @@ public class CAProcessor extends Processor {
             // reset the "auditSubjectID"
             auditSubjectID = auditSubjectID();
 
-            // store a message in the signed audit log file
-            auditMessage = CMS.getLogMessage(
-                    AuditEvent.AUTH_SUCCESS,
+            audit(new AuthSuccessEvent(
                     auditSubjectID,
                     ILogger.SUCCESS,
-                    auditAuthMgrID);
-
-            audit(auditMessage);
+                    auditAuthMgrID));
 
             return authToken;
         } catch (EBaseException eAudit1) {