From b8c2fe52b55ff34337361ef0cf5f0c28a67eacf4 Mon Sep 17 00:00:00 2001
From: Calvo <luis.calvo@pandorafms.com>
Date: Tue, 25 Oct 2022 15:33:22 +0200
Subject: [PATCH] =?UTF-8?q?Added=20ACL=20to=20ap=C3=AC=20get=20tree=20agen?=
 =?UTF-8?q?ts=20plugin=20user=20and=20plugin=20pass?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pandora_console/include/functions_api.php | 24 ++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php
index 90935bbc6d..14a71bfdb8 100644
--- a/pandora_console/include/functions_api.php
+++ b/pandora_console/include/functions_api.php
@@ -652,8 +652,6 @@ $module_field_column_mampping = [
     'module_id_module'         => 'id_modulo as module_id_module',
     'module_disabled'          => 'disabled as module_disabled',
     'module_id_export'         => 'id_export as module_id_export',
-    'module_plugin_user'       => 'plugin_user as module_plugin_user',
-    'module_plugin_pass'       => 'plugin_pass as module_plugin_pass',
     'module_plugin_parameter'  => 'plugin_parameter as module_plugin_parameter',
     'module_id_plugin'         => 'id_plugin as module_id_plugin',
     'module_post_process'      => 'post_process as module_post_process',
@@ -805,8 +803,6 @@ function api_get_tree_agents($trash1, $trahs2, $other, $returnType)
         'module_id_module',
         'module_disabled',
         'module_id_export',
-        'module_plugin_user',
-        'module_plugin_pass',
         'module_plugin_parameter',
         'module_id_plugin',
         'module_post_process',
@@ -1015,9 +1011,9 @@ function api_get_tree_agents($trash1, $trahs2, $other, $returnType)
         $groups = [];
     }
 
-    $groups = str_replace('\n', $returnReplace, $groups);
-
     foreach ($groups as &$group) {
+        $group = str_replace('\n', $returnReplace, $group);
+
         $group['type_row'] = 'group';
         $returnVar[] = $group;
 
@@ -1033,9 +1029,19 @@ function api_get_tree_agents($trash1, $trahs2, $other, $returnType)
             $agents = [];
         }
 
-        $agents = str_replace('\n', $returnReplace, $agents);
+        if ((bool) check_acl($config['id_user'], $id_group, 'AW') === true) {
+            if (array_search('module_plugin_user', $fields) !== false) {
+                $module_additional_columns .= ' ,plugin_user as module_plugin_user';
+            }
+
+            if (array_search('module_plugin_user', $fields) !== false) {
+                $module_additional_columns .= ' ,plugin_pass as module_plugin_pass';
+            }
+        }
 
         foreach ($agents as $index => &$agent) {
+            $agent = str_replace('\n', $returnReplace, $agent);
+
             $agent['type_row']  = 'agent';
             $returnVar[] = $agent;
 
@@ -1062,9 +1068,9 @@ function api_get_tree_agents($trash1, $trahs2, $other, $returnType)
                 $modules = [];
             }
 
-            $modules = str_replace('\n', $returnReplace, $modules);
-
             foreach ($modules as &$module) {
+                $module = str_replace('\n', $returnReplace, $module);
+
                 $module['type_row'] = 'module';
 
                 if ($module['module_macros']) {