Ensure ScriptsRead works with audit_windows.ps1 (even though there ar…

…e no configurable options).
Opmantek · Aug 1, 2024 · 9979f45 · 9979f45
1 parent f48a127
commit 9979f45
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/app/Helpers/scripts_helper.php b/app/Helpers/scripts_helper.php
@@ -221,6 +221,7 @@ function scripts_collections_options()
             $options_scripts['audit_osx.sh'] = array('submit_online', 'create_file', 'url', 'debugging', 'org_id');
             $options_scripts['audit_solaris.sh'] = array('submit_online', 'create_file', 'url', 'debugging', 'org_id', 'system_id');
             $options_scripts['audit_windows.vbs'] = array('audit_dns', 'audit_mount_point', 'audit_netstat', 'audit_software', 'audit_win32_product', 'create_file', 'debugging', 'details_to_lower', 'hide_audit_window', 'ignore_invalid_ssl', 'ldap', 'ldap_seen_date', 'ldap_seen_days', 'org_id', 'ping_target', 'san_audit', 'san_discover', 'self_delete', 'strcomputer', 'strpass', 'struser', 'submit_online', 'system_id', 'url', 'use_proxy', 'windows_user_work_1', 'windows_user_work_2');
+            $options_scripts['audit_windows.ps1'] = array();
 
             return $options_scripts;
     }

diff --git a/app/Models/ScriptsModel.php b/app/Models/ScriptsModel.php
@@ -472,12 +472,14 @@ public function includedRead(int $id = 0): array
         $files = $filesModel->listUser();
         $filtered_files = array();
         $included['files'] = array();
-        foreach ($files as $file) {
-            if ($script[0]->attributes->based_on === 'audit_windows.vbs' and strpos($file->attributes->path, '/') !== 0) {
-                $included['files'][] = $file;
-            }
-            if ($script[0]->attributes->based_on !== 'audit_windows.vbs' and strpos($file->attributes->path, '/') === 0) {
-                $included['files'][] = $file;
+        if ($script[0]->attributes->based_on !== 'audit_windows.ps1') {
+            foreach ($files as $file) {
+                if ($script[0]->attributes->based_on === 'audit_windows.vbs' and strpos($file->attributes->path, '/') !== 0) {
+                    $included['files'][] = $file;
+                }
+                if ($script[0]->attributes->based_on !== 'audit_windows.vbs' and strpos($file->attributes->path, '/') === 0) {
+                    $included['files'][] = $file;
+                }
             }
         }
         return $included;