[allura] 02/02: [#8458] auditlog: record unblocking user from permission

[di...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dill0wn pushed a commit to branch dw/8458
in repository https://gitbox.apache.org/repos/asf/allura.git

commit 564c547f179080a78ca6e2fac1364cf20cc0e56a
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Thu Sep 1 13:35:40 2022 +0000

    [#8458] auditlog: record unblocking user from permission
---
 Allura/allura/app.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Allura/allura/app.py b/Allura/allura/app.py
index 83ea1c94b..8264add2c 100644
--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -871,10 +871,12 @@ class DefaultAdminController(BaseController, AdminControllerMixin):
         ace = model.ACE.deny(model.ProjectRole.by_user(user, upsert=True)._id, perm, reason)
         if not model.ACL.contains(ace, self.app.acl):
             self.app.acl.append(ace)
-            model.AuditLog.log('blocked user "{}" from {} for reason: "{}"'.format(
-                username,
+            model.AuditLog.log('{}: blocked user "{}" from permission "{}" for reason "{}"'.format(
                 self.app.config.options['mount_point'],
-                reason))
+                username,
+                ace.permission,
+                reason,
+            ))
             return dict(user_id=str(user._id), username=user.username, reason=reason)
         return dict(error='User "%s" already blocked' % user.username)
 
@@ -897,6 +899,11 @@ class DefaultAdminController(BaseController, AdminControllerMixin):
             if ace:
                 self.app.acl.remove(ace)
                 unblocked.append(str(user._id))
+                model.AuditLog.log('{}: unblocked user "{}" from permission "{}"'.format(
+                    self.app.config.options['mount_point'],
+                    user.username,
+                    ace.permission,
+                ))
         return dict(unblocked=unblocked)
 
     @expose('jinja:allura:templates/app_admin_permissions.html')