Fix issue in BenchmarksModel deleting a file.

Opmantek · Jul 31, 2024 · 8832c38 · 8832c38
1 parent 8da4041
commit 8832c38
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/app/Models/BenchmarksModel.php b/app/Models/BenchmarksModel.php
@@ -361,15 +361,17 @@ public function execute(int $id = 0, int $device_id = 0): array
             return [];
         }
 
-        try {
-            unlink('/usr/local/open-audit/other/ssg-results/' . $device_id . '_' . $id .  '_' . $microtime . '_report.html');
-        } catch (e) {
-            log_message('error', 'Cannot delete report file from open-audit/other/ssg-results. '. $e);
-            $this->logCreate($id, $device_id, 'error', 'Cannot delete report file. Error: ' . $e);
+        if (file_exists('/usr/local/open-audit/other/ssg-results/' . $device_id . '_' . $id .  '_' . $microtime . '_report.html')) {
+            log_message('debug', 'rm command on localhost for ' . $device->attributes->name . ': ' . $parameters->command);
+            @unlink('/usr/local/open-audit/other/ssg-results/' . $device_id . '_' . $id .  '_' . $microtime . '_report.html');
+        }
+
+        if (file_exists('/usr/local/open-audit/other/ssg-results/' . $device_id . '_' . $id .  '_' . $microtime . '_report.html')) {
+            log_message('error', 'Cannot delete report file from open-audit/other/ssg-results.');
+            $this->logCreate($id, $device_id, 'error', 'Cannot delete report file. /usr/local/open-audit/other/ssg-results/' . $device_id . '_' . $id .  '_' . $microtime . '_report.html');
             $this->logCreate($id, $device_id, 'info', 'Completed. Memory: ' . round((memory_get_peak_usage(false)/1024/1024), 3) . ' MiB');
             return [];
         }
-        log_message('debug', 'rm command on localhost for ' . $device->attributes->name . ': ' . $parameters->command);
 
         $this->logCreate($id, $device_id, 'info', 'Processing report file.');
         log_message('debug', 'Processing report file for ' . $device->attributes->name);