summaryrefslogtreecommitdiffstats
path: root/base/server/cms/src/com/netscape/cms/servlet/admin
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2017-04-20 10:20:06 +0200
committerEndi S. Dewata <edewata@redhat.com>2017-04-24 20:43:35 +0200
commitaad80e8775eac61ed9eac2f3f94d2ec90207e827 (patch)
tree0833cbcb184b1a0bce4ecab3905a6bc02c064f94 /base/server/cms/src/com/netscape/cms/servlet/admin
parent30d1575046065dbd79f537e5f819c405e45af0bc (diff)
downloadpki-aad80e8775eac61ed9eac2f3f94d2ec90207e827.tar.gz
pki-aad80e8775eac61ed9eac2f3f94d2ec90207e827.tar.xz
pki-aad80e8775eac61ed9eac2f3f94d2ec90207e827.zip
Added RoleAssumeEvent.
A new RoleAssumeEvent class of has been added to encapsulate the ROLE_ASSUME events. https://pagure.io/dogtagpki/issue/2641 Change-Id: I12e47ea13198b6532b1fdfee2e20765c0cab15e9
Diffstat (limited to 'base/server/cms/src/com/netscape/cms/servlet/admin')
-rw-r--r--base/server/cms/src/com/netscape/cms/servlet/admin/AdminServlet.java35
1 files changed, 10 insertions, 25 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 ecc6a7d7d..662a3e9da 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
@@ -56,6 +56,7 @@ 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.logging.event.RoleAssumeEvent;
import com.netscape.certsrv.usrgrp.EUsrGrpException;
import com.netscape.certsrv.usrgrp.IUGSubsystem;
import com.netscape.certsrv.usrgrp.IUser;
@@ -573,7 +574,7 @@ public class AdminServlet extends HttpServlet {
* @return the authorization token
*/
protected AuthzToken authorize(HttpServletRequest req) {
- String auditMessage = null;
+
String auditSubjectID = auditSubjectID();
String auditACLResource = ILogger.SIGNED_AUDIT_EMPTY_VALUE;
String auditOperation = ILogger.SIGNED_AUDIT_EMPTY_VALUE;
@@ -618,14 +619,10 @@ public class AdminServlet extends HttpServlet {
auditACLResource,
auditOperation));
- // store a message in the signed audit log file
- auditMessage = CMS.getLogMessage(
- AuditEvent.ROLE_ASSUME,
+ audit(new RoleAssumeEvent(
auditSubjectID,
ILogger.FAILURE,
- auditGroups(auditSubjectID));
-
- audit(auditMessage);
+ auditGroups(auditSubjectID)));
return null;
} catch (EBaseException e) {
@@ -637,14 +634,10 @@ public class AdminServlet extends HttpServlet {
auditACLResource,
auditOperation));
- // store a message in the signed audit log file
- auditMessage = CMS.getLogMessage(
- AuditEvent.ROLE_ASSUME,
+ audit(new RoleAssumeEvent(
auditSubjectID,
ILogger.FAILURE,
- auditGroups(auditSubjectID));
-
- audit(auditMessage);
+ auditGroups(auditSubjectID)));
return null;
} catch (Exception e) {
@@ -655,14 +648,10 @@ public class AdminServlet extends HttpServlet {
auditACLResource,
auditOperation));
- // store a message in the signed audit log file
- auditMessage = CMS.getLogMessage(
- AuditEvent.ROLE_ASSUME,
+ audit(new RoleAssumeEvent(
auditSubjectID,
ILogger.FAILURE,
- auditGroups(auditSubjectID));
-
- audit(auditMessage);
+ auditGroups(auditSubjectID)));
return null;
}
@@ -673,14 +662,10 @@ public class AdminServlet extends HttpServlet {
auditACLResource,
auditOperation));
- // store a message in the signed audit log file
- auditMessage = CMS.getLogMessage(
- AuditEvent.ROLE_ASSUME,
+ audit(new RoleAssumeEvent(
auditSubjectID,
ILogger.SUCCESS,
- auditGroups(auditSubjectID));
-
- audit(auditMessage);
+ auditGroups(auditSubjectID)));
return authzTok;
}