[allura] branch dw/8451 updated: [#8451] log repo external url, other options, and SVN import in audit log

[dill0wn]

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

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


The following commit(s) were added to refs/heads/dw/8451 by this push:
     new 8b7a94830 [#8451] log repo external url, other options, and SVN import 
in audit log
8b7a94830 is described below

commit 8b7a94830774ee0e489c0597b046f43af4e7888b
Author: Dillon Walls <dillon.wa...@slashdotmedia.com>
AuthorDate: Mon Aug 8 20:16:18 2022 +0000

    [#8451] log repo external url, other options, and SVN import in audit log
---
 Allura/allura/lib/repository.py   | 6 ++++++
 Allura/allura/tasks/repo_tasks.py | 2 ++
 ForgeSVN/forgesvn/svn_main.py     | 9 +++++++++
 3 files changed, 17 insertions(+)

diff --git a/Allura/allura/lib/repository.py b/Allura/allura/lib/repository.py
index 24789f971..103c6bbfe 100644
--- a/Allura/allura/lib/repository.py
+++ b/Allura/allura/lib/repository.py
@@ -305,6 +305,9 @@ class RepoAdminController(DefaultAdminController):
         external_checkout_url = (post_data.get('external_checkout_url') or 
'').strip()
         if 'external_checkout_url' not in c.form_errors:
             if (self.app.config.options.get('external_checkout_url') or '') != 
external_checkout_url:
+                M.AuditLog.log('{}: set "{}" {} => {}'.format(
+                    self.app.config.options['mount_point'], 
"external_checkout_url",
+                    self.app.config.options.get('external_checkout_url'), 
external_checkout_url))
                 self.app.config.options.external_checkout_url = 
external_checkout_url
                 flash_msgs.append("External checkout URL successfully 
changed.")
         else:
@@ -312,6 +315,9 @@ class RepoAdminController(DefaultAdminController):
 
         merge_disabled = bool(post_data.get('merge_disabled'))
         if merge_disabled != self.app.config.options.get('merge_disabled', 
False):
+            M.AuditLog.log('{}: set "{}" {} => {}'.format(
+                self.app.config.options['mount_point'], "merge_disabled",
+                self.app.config.options.get('merge_disabled', False), 
merge_disabled))
             self.app.config.options.merge_disabled = merge_disabled
             flash_msgs.append('One-click merge {}.'.format('disabled' if 
merge_disabled else 'enabled'))
 
diff --git a/Allura/allura/tasks/repo_tasks.py 
b/Allura/allura/tasks/repo_tasks.py
index 7292a0889..17f26788c 100644
--- a/Allura/allura/tasks/repo_tasks.py
+++ b/Allura/allura/tasks/repo_tasks.py
@@ -44,6 +44,8 @@ def clone(cloned_from_path, cloned_from_name, 
cloned_from_url):
             c.user, c.app.repo, 'created',
             text='Repository {}/{} created'.format(
                 c.project.shortname, c.app.config.options.mount_point))
+        M.AuditLog.log('{}: import completed from "{}"'.format(
+            c.app.config.options['mount_point'], cloned_from_url))
     except Exception:
         g.post_event('repo_clone_task_failed', cloned_from_url,
                      cloned_from_path, traceback.format_exc())
diff --git a/ForgeSVN/forgesvn/svn_main.py b/ForgeSVN/forgesvn/svn_main.py
index 1e632d5d3..c3326210c 100644
--- a/ForgeSVN/forgesvn/svn_main.py
+++ b/ForgeSVN/forgesvn/svn_main.py
@@ -135,6 +135,9 @@ class SVNRepoAdminController(RepoAdminController):
                                                 self.app.repo.name,
                                                 checkout_url)):
             if (self.app.config.options.get('checkout_url') or '') != 
checkout_url:
+                M.AuditLog.log('{}: set "{}" {} => {}'.format(
+                    self.app.config.options['mount_point'], "checkout_url",
+                    self.app.config.options.get('checkout_url'), checkout_url))
                 self.app.config.options.checkout_url = checkout_url
                 flash("Checkout URL successfully changed")
         else:
@@ -142,6 +145,9 @@ class SVNRepoAdminController(RepoAdminController):
                   checkout_url, "error")
         if 'external_checkout_url' not in c.form_errors:
             if (self.app.config.options.get('external_checkout_url') or '') != 
external_checkout_url:
+                M.AuditLog.log('{}: set "{}" {} => {}'.format(
+                    self.app.config.options['mount_point'], 
"external_checkout_url",
+                    self.app.config.options.get('external_checkout_url'), 
external_checkout_url))
                 self.app.config.options.external_checkout_url = 
external_checkout_url
                 flash("External checkout URL successfully changed")
         else:
@@ -174,6 +180,9 @@ class SVNImportController(BaseController, 
AdminControllerMixin):
                     cloned_from_path=None,
                     cloned_from_name=None,
                     cloned_from_url=checkout_url)
+                M.AuditLog.log('{}: import initiated from "{}"'.format(
+                    self.app.config.options['mount_point'], checkout_url))
+
             M.Notification.post_user(
                 c.user, self.app.repo, 'importing',
                 text='''Repository import scheduled,