diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2017-04-21 04:55:00 +0200 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2017-04-24 20:45:16 +0200 |
| commit | 3d9ef95a913af023958b79ef383853cf958757e0 (patch) | |
| tree | f8bdee4955b38ffef43f4aef92768f6033a59c31 /base/server/cms/src/org | |
| parent | aad80e8775eac61ed9eac2f3f94d2ec90207e827 (diff) | |
| download | pki-3d9ef95a913af023958b79ef383853cf958757e0.tar.gz pki-3d9ef95a913af023958b79ef383853cf958757e0.tar.xz pki-3d9ef95a913af023958b79ef383853cf958757e0.zip | |
Added ConfigRoleEvent.
A new ConfigRoleEvent class of has been added to encapsulate the
CONFIG_ROLE events.
https://pagure.io/dogtagpki/issue/2641
Change-Id: Ie0932131d75897f58afdd8217454c6cf6970d738
Diffstat (limited to 'base/server/cms/src/org')
| -rw-r--r-- | base/server/cms/src/org/dogtagpki/server/rest/GroupService.java | 10 | ||||
| -rw-r--r-- | base/server/cms/src/org/dogtagpki/server/rest/UserService.java | 18 |
2 files changed, 23 insertions, 5 deletions
diff --git a/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java b/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java index 4aa0209af..6292cf800 100644 --- a/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/GroupService.java @@ -40,8 +40,8 @@ import com.netscape.certsrv.group.GroupData; 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.ILogger; +import com.netscape.certsrv.logging.event.ConfigRoleEvent; import com.netscape.certsrv.usrgrp.IGroup; import com.netscape.certsrv.usrgrp.IGroupConstants; import com.netscape.certsrv.usrgrp.IUGSubsystem; @@ -432,6 +432,12 @@ public class GroupService extends SubsystemService implements GroupResource { } public void audit(String type, String id, Map<String, String> params, String status) { - audit(AuditEvent.CONFIG_ROLE, ScopeDef.SC_GROUPS, type, id, params, status); + + if (auditor == null) return; + + auditor.log(new ConfigRoleEvent( + auditor.getSubjectID(), + status, + auditor.getParamString(ScopeDef.SC_GROUPS, type, id, params))); } } diff --git a/base/server/cms/src/org/dogtagpki/server/rest/UserService.java b/base/server/cms/src/org/dogtagpki/server/rest/UserService.java index e10c4f5c1..ec690d6a0 100644 --- a/base/server/cms/src/org/dogtagpki/server/rest/UserService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/UserService.java @@ -52,8 +52,8 @@ import com.netscape.certsrv.common.OpDef; import com.netscape.certsrv.common.ScopeDef; import com.netscape.certsrv.dbs.certdb.CertId; import com.netscape.certsrv.group.GroupMemberData; -import com.netscape.certsrv.logging.AuditEvent; import com.netscape.certsrv.logging.ILogger; +import com.netscape.certsrv.logging.event.ConfigRoleEvent; import com.netscape.certsrv.password.IPasswordCheck; import com.netscape.certsrv.user.UserCertCollection; import com.netscape.certsrv.user.UserCertData; @@ -1227,10 +1227,22 @@ public class UserService extends SubsystemService implements UserResource { } public void auditUser(String type, String id, Map<String, String> params, String status) { - audit(AuditEvent.CONFIG_ROLE, ScopeDef.SC_USERS, type, id, params, status); + + if (auditor == null) return; + + auditor.log(new ConfigRoleEvent( + auditor.getSubjectID(), + status, + auditor.getParamString(ScopeDef.SC_USERS, type, id, params))); } public void auditUserCert(String type, String id, Map<String, String> params, String status) { - audit(AuditEvent.CONFIG_ROLE, ScopeDef.SC_USER_CERTS, type, id, params, status); + + if (auditor == null) return; + + auditor.log(new ConfigRoleEvent( + auditor.getSubjectID(), + status, + auditor.getParamString(ScopeDef.SC_USER_CERTS, type, id, params))); } } |