summaryrefslogtreecommitdiffstats
path: root/base/server/cms/src/com/netscape/cms/servlet/base
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2017-04-20 16:49:28 +0200
committerEndi S. Dewata <edewata@redhat.com>2017-04-24 20:41:19 +0200
commit30d1575046065dbd79f537e5f819c405e45af0bc (patch)
tree3043907073e9e092763cf5fa8570b485d24dde28 /base/server/cms/src/com/netscape/cms/servlet/base
parentfdcb514b0711f10eab47c81837138192207e44b4 (diff)
downloadpki-30d1575046065dbd79f537e5f819c405e45af0bc.tar.gz
pki-30d1575046065dbd79f537e5f819c405e45af0bc.tar.xz
pki-30d1575046065dbd79f537e5f819c405e45af0bc.zip
Added AuthzFailEvent.
A new AuthzFailEvent class of has been added to encapsulate the AUTHZ_FAIL events. https://pagure.io/dogtagpki/issue/2641 Change-Id: Id4ab9bd889a1a9314264c0ef2ff7b2389aed8f9c
Diffstat (limited to 'base/server/cms/src/com/netscape/cms/servlet/base')
-rw-r--r--base/server/cms/src/com/netscape/cms/servlet/base/CMSServlet.java44
1 files changed, 16 insertions, 28 deletions
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 c70f55ae6..afb109a68 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.AuthzFailEvent;
import com.netscape.certsrv.logging.event.AuthzSuccessEvent;
import com.netscape.certsrv.ra.IRegistrationAuthority;
import com.netscape.certsrv.request.IRequest;
@@ -1839,14 +1840,12 @@ public abstract class CMSServlet extends HttpServlet {
audit(auditMessage);
} else {
- auditMessage = CMS.getLogMessage(
- AuditEvent.AUTHZ_FAIL,
+
+ audit(new AuthzFailEvent(
auditSubjectID,
ILogger.FAILURE,
auditACLResource,
- auditOperation);
-
- audit(auditMessage);
+ auditOperation));
auditMessage = CMS.getLogMessage(
AuditEvent.ROLE_ASSUME,
@@ -1858,14 +1857,12 @@ public abstract class CMSServlet extends HttpServlet {
}
return authzToken;
} catch (Exception e) {
- auditMessage = CMS.getLogMessage(
- AuditEvent.AUTHZ_FAIL,
+
+ audit(new AuthzFailEvent(
auditSubjectID,
ILogger.FAILURE,
auditACLResource,
- auditOperation);
-
- audit(auditMessage);
+ auditOperation));
auditMessage = CMS.getLogMessage(
AuditEvent.ROLE_ASSUME,
@@ -1970,15 +1967,12 @@ public abstract class CMSServlet extends HttpServlet {
audit(auditMessage);
} else {
- // store a message in the signed audit log file
- auditMessage = CMS.getLogMessage(
- AuditEvent.AUTHZ_FAIL,
+
+ audit(new AuthzFailEvent(
auditSubjectID,
ILogger.FAILURE,
auditACLResource,
- auditOperation);
-
- audit(auditMessage);
+ auditOperation));
// store a message in the signed audit log file
auditMessage = CMS.getLogMessage(
@@ -1992,15 +1986,12 @@ public abstract class CMSServlet extends HttpServlet {
return authzTok;
} catch (EBaseException eAudit1) {
- // store a message in the signed audit log file
- auditMessage = CMS.getLogMessage(
- AuditEvent.AUTHZ_FAIL,
+
+ audit(new AuthzFailEvent(
auditSubjectID,
ILogger.FAILURE,
auditACLResource,
- auditOperation);
-
- audit(auditMessage);
+ auditOperation));
// store a message in the signed audit log file
auditMessage = CMS.getLogMessage(
@@ -2013,15 +2004,12 @@ public abstract class CMSServlet extends HttpServlet {
return null;
} catch (Exception eAudit1) {
- // store a message in the signed audit log file
- auditMessage = CMS.getLogMessage(
- AuditEvent.AUTHZ_FAIL,
+
+ audit(new AuthzFailEvent(
auditSubjectID,
ILogger.FAILURE,
auditACLResource,
- auditOperation);
-
- audit(auditMessage);
+ auditOperation));
// store a message in the signed audit log file
auditMessage = CMS.getLogMessage(