tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-4687-api-get-all-agents-recursion' into 'develop' 

Added recursion to api_get_all_agents

See merge request artica/pandorafms!2753
This commit is contained in:
Daniel Rodriguez 2019-11-06 10:38:17 +01:00
parent 868bba07b0 dab4676a33
commit 5a34ec51d2
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pandora_console/include/functions_api.php
View File

@ -1905,7 +1905,7 @@ function api_set_delete_agent($id, $thrash1, $other, $thrash3)
* *
* @param $thrash1 Don't use. * @param $thrash1 Don't use.
* @param $thrash2 Don't use. * @param $thrash2 Don't use.
* @param array $other it's array, $other as param are the filters available <filter_so>;<filter_group>;<filter_modules_states>;<filter_name>;<filter_policy>;<csv_separator> in this order * @param array $other it's array, $other as param are the filters available <filter_so>;<filter_group>;<filter_modules_states>;<filter_name>;<filter_policy>;<csv_separator><recursion> in this order
* and separator char (after text ; ) and separator (pass in param othermode as othermode=url_encode_separator_<separator>) * and separator char (after text ; ) and separator (pass in param othermode as othermode=url_encode_separator_<separator>)
* example for CSV: * example for CSV:
* *
@ -1934,17 +1934,25 @@ function api_get_all_agents($thrash1, $thrash2, $other, $returnType)
} }
if (isset($other['data'][0])) { if (isset($other['data'][0])) {
// Filter by SO // Filter by SO.
if ($other['data'][0] != '') { if ($other['data'][0] != '') {
$where .= ' AND tconfig_os.id_os = '.$other['data'][0]; $where .= ' AND tconfig_os.id_os = '.$other['data'][0];
} }
} }
if (isset($other['data'][1])) { if (isset($other['data'][1])) {
// Filter by group // Filter by group.
if ($other['data'][1] != '') { if ($other['data'][1] != '') {
$where .= ' AND id_grupo = '.$other['data'][1]; $ag_groups = $other['data'][1];
// Recursion.
if ($other['data'][6] === '1') {
$ag_groups = groups_get_id_recursive($ag_groups, true);
}
$ag_groups = implode(',', (array) $ag_groups);
} }
$where .= ' AND (id_grupo IN ('.$ag_groups.') OR id_group IN ('.$ag_groups.'))';
} }
if (isset($other['data'][3])) { if (isset($other['data'][3])) {
@ -1974,24 +1982,27 @@ function api_get_all_agents($thrash1, $thrash2, $other, $returnType)
// Initialization of array // Initialization of array
$result_agents = []; $result_agents = [];
// Filter by state // Filter by state
if (defined('METACONSOLE')) { if (is_metaconsole()) {
$sql = "SELECT id_agente, alias, direccion, comentarios, $sql = 'SELECT id_agente, alias, direccion, comentarios,
tconfig_os.name, url_address, nombre tconfig_os.name, url_address, nombre
FROM tconfig_os, tmetaconsole_agent FROM tconfig_os, tmetaconsole_agent
LEFT JOIN tagent_secondary_group LEFT JOIN tmetaconsole_agent_secondary_group
ON tmetaconsole_agent.id_agente = tagent_secondary_group.id_agent ON tmetaconsole_agent.id_agente = tmetaconsole_agent_secondary_group.id_agent
WHERE tmetaconsole_agent.id_os = tconfig_os.id_os WHERE tmetaconsole_agent.id_os = tconfig_os.id_os
AND disabled = 0 $where AND $groups"; AND disabled = 0 '.$where.' AND '.$groups;
} else { } else {
$sql = "SELECT id_agente, alias, direccion, comentarios, $sql = 'SELECT id_agente, alias, direccion, comentarios,
tconfig_os.name, url_address, nombre tconfig_os.name, url_address, nombre
FROM tconfig_os, tagente FROM tconfig_os, tagente
LEFT JOIN tagent_secondary_group LEFT JOIN tagent_secondary_group
ON tagente.id_agente = tagent_secondary_group.id_agent ON tagente.id_agente = tagent_secondary_group.id_agent
WHERE tagente.id_os = tconfig_os.id_os WHERE tagente.id_os = tconfig_os.id_os
AND disabled = 0 $where AND $groups"; AND disabled = 0 '.$where.' AND '.$groups;
} }
// Group by agent
$sql .= ' GROUP BY id_agente';
$all_agents = db_get_all_rows_sql($sql); $all_agents = db_get_all_rows_sql($sql);
// Filter by status: unknown, warning, critical, without modules // Filter by status: unknown, warning, critical, without modules