From ffdcab3220980098a73e2fe19dc9ae2d6038910d Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Mon, 1 Jan 2024 15:18:09 +0100
Subject: [PATCH] Report uploads

---
 app/Http/Controllers/Bill/EditController.php | 22 ++------------------
 app/Http/Controllers/Controller.php          | 22 ++++++++++++++++++++
 app/Http/Controllers/TagController.php       |  2 ++
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/Bill/EditController.php b/app/Http/Controllers/Bill/EditController.php
index 8c136cf28e..4da44d930f 100644
--- a/app/Http/Controllers/Bill/EditController.php
+++ b/app/Http/Controllers/Bill/EditController.php
@@ -130,7 +130,7 @@ class EditController extends Controller
         }
         if (null !== $files && auth()->user()->hasRole('demo')) {
             Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
-            $this->auditLogAttachments($files);
+            $this->auditLogAttachmentInfo($files);
             session()->flash('info', (string) trans('firefly.no_att_demo_user'));
         }
 
@@ -149,23 +149,5 @@ class EditController extends Controller
         return $redirect;
     }
 
-    /**
-     * @param array|null $files
-     *
-     * @return void
-     */
-    private function auditLogAttachments(?array $files): void
-    {
-        if (null === $files) {
-            Log::channel('audit')->info('No files found');
-            return;
-        }
-        /**
-         * @var int          $index
-         * @var UploadedFile $file
-         */
-        foreach ($files as $index => $file) {
-            Log::channel('audit')->info(sprintf('File [%d/%d]  upload attachment "%s", content is: "%s".', $index + 1, count($files), $file->getClientOriginalName(), $file->getContent()));
-        }
-    }
+
 }
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 2c086c4057..f7f6cc27b1 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -28,7 +28,9 @@ use FireflyIII\Support\Http\Controllers\UserNavigation;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Http\UploadedFile;
 use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Support\Facades\Log;
 
 /**
  * Class Controller.
@@ -119,4 +121,24 @@ abstract class Controller extends BaseController
             }
         );
     }
+
+    /**
+     * @param array|null $files
+     *
+     * @return void
+     */
+    protected function auditLogAttachmentInfo(?array $files): void
+    {
+        if (null === $files) {
+            Log::channel('audit')->info('No files found');
+            return;
+        }
+        /**
+         * @var int          $index
+         * @var UploadedFile $file
+         */
+        foreach ($files as $index => $file) {
+            Log::channel('audit')->info(sprintf('File [%d/%d]  upload attachment "%s", content is: "%s".', $index + 1, count($files), $file->getClientOriginalName(), $file->getContent()));
+        }
+    }
 }
diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php
index 0b6a39b884..dbff364173 100644
--- a/app/Http/Controllers/TagController.php
+++ b/app/Http/Controllers/TagController.php
@@ -306,6 +306,7 @@ class TagController extends Controller
         }
         if (null !== $files && auth()->user()->hasRole('demo')) {
             Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
+            $this->auditLogAttachmentInfo($files);
             session()->flash('info', (string)trans('firefly.no_att_demo_user'));
         }
 
@@ -341,6 +342,7 @@ class TagController extends Controller
         }
         if (null !== $files && auth()->user()->hasRole('demo')) {
             Log::channel('audit')->info(sprintf('The demo user is trying to upload attachments in %s.', __METHOD__));
+            $this->auditLogAttachmentInfo($files);
             session()->flash('info', (string)trans('firefly.no_att_demo_user'));
         }