You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by di...@apache.org on 2022/09/01 13:43:21 UTC
[allura] branch dw/8458 updated (2f0e5141d -> 564c547f1)
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a change to branch dw/8458
in repository https://gitbox.apache.org/repos/asf/allura.git
from 2f0e5141d [#8458] audit log - discussion - log forum admin actions to auditlog
new 36dab0cbd fixup! [#8458] audit log - discussion - log forum admin actions to auditlog
new 564c547f1 [#8458] auditlog: record unblocking user from permission
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
Allura/allura/app.py | 13 ++++++++++---
.../forgediscussion/tests/functional/test_forum_admin.py | 10 +++++-----
2 files changed, 15 insertions(+), 8 deletions(-)
[allura] 02/02: [#8458] auditlog: record unblocking user from permission
Posted by 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')
[allura] 01/02: fixup! [#8458] audit log - discussion - log forum admin actions to auditlog
Posted by 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 36dab0cbd1ce2b32190a884ea2e02208b0f46851
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Thu Sep 1 13:06:54 2022 +0000
fixup! [#8458] audit log - discussion - log forum admin actions to auditlog
---
.../forgediscussion/tests/functional/test_forum_admin.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
index ca14d1c37..19babaca5 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum_admin.py
@@ -15,11 +15,9 @@
# specific language governing permissions and limitations
# under the License.
-import os
-import allura
import logging
-import PIL
+import re
from alluratest.controller import TestController
from allura.lib import helpers as h
from allura import model as M
@@ -43,6 +41,8 @@ class TestForumAdmin(TestController):
form['add_forum.name'] = 'Test Forum'
r = form.submit().follow()
assert 'Test Forum' in r
+ audit_log = M.AuditLog.query.find({'project_id': project._id}).sort('_id', -1).first()
+ assert 'created forum "Test Forum"' in audit_log.message
h.set_context('test', 'Forum', neighborhood='Projects')
frm = FM.Forum.query.get(shortname='testforum')
r = self.app.post('/admin/discussion/update_forums',
@@ -52,8 +52,8 @@ class TestForumAdmin(TestController):
'forum-0.shortname': 'NewTestForum',
'forum-0.description': 'My desc',
'forum-0.monitoring_email': ''})
- audit_log = M.AuditLog.query.find({'project_id': project._id}).sort('_id', -1).first()
- assert 'created forum "Test Forum"' in audit_log.message
+ audit_logs = M.AuditLog.query.find({'project_id': project._id, 'message': re.compile(' set option ')}).all()
+ assert len(audit_logs) == 4
r = self.app.get('/admin/discussion/forums')
assert 'New Test Forum' in r
assert 'My desc' in r