tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 00:34:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a SQL injection point

Browse Source
This commit is contained in:
Alejandro Gallardo Escobar 2015-08-03 13:32:46 +02:00
parent 55f3cc96b8
commit ada30b1f03
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pandora_console/include/javascript/pandora.js
View File

@ -141,12 +141,20 @@ function isEmptyObject(obj) {
* @param selected Which module(s) have to be selected * @param selected Which module(s) have to be selected
*/ */
function agent_changed_by_multiple_agents (event, id_agent, selected) { function agent_changed_by_multiple_agents (event, id_agent, selected) {
// Hack to add custom condition // Hack to avoid certain module types
if ($("#hidden-custom_condition").val() != undefined) { var module_types_excluded = [];
custom_condition = $("#hidden-custom_condition").val(); if (typeof $("input.module_types_excluded") !== 'undefined') {
} try {
else { $("input.module_types_excluded").each(function(index, el) {
custom_condition = ''; var module_type = parseInt($(el).val());
if (module_type !== NaN)
module_types_excluded.push(module_type);
});
}
catch (error) {
}
} }
var idAgents = Array(); var idAgents = Array();
@ -205,7 +213,7 @@ function agent_changed_by_multiple_agents (event, id_agent, selected) {
"get_agent_modules_json_for_multiple_agents": 1, "get_agent_modules_json_for_multiple_agents": 1,
"id_agent[]": idAgents, "id_agent[]": idAgents,
"all": find_modules, "all": find_modules,
"custom_condition": custom_condition, "module_types_excluded[]": module_types_excluded,
"selection_mode": selection_mode, "selection_mode": selection_mode,
"serialized": serialized, "serialized": serialized,
"id_server": id_server "id_server": id_server

22
pandora_console/operation/agentes/ver_agente.php
View File

@ -214,7 +214,7 @@ if (is_ajax ()) {
if ($get_agent_modules_json_for_multiple_agents) { if ($get_agent_modules_json_for_multiple_agents) {
$idAgents = get_parameter('id_agent'); $idAgents = get_parameter('id_agent');
$custom_condition = get_parameter('custom_condition', ''); $module_types_excluded = get_parameter('module_types_excluded', array());
$selection_mode = get_parameter('selection_mode', 'common'); $selection_mode = get_parameter('selection_mode', 'common');
$serialized = get_parameter('serialized', ''); $serialized = get_parameter('serialized', '');
$id_server = (int) get_parameter('id_server', 0); $id_server = (int) get_parameter('id_server', 0);
@ -224,17 +224,22 @@ if (is_ajax ()) {
'tmetaconsole_setup', 'id', $id_server); 'tmetaconsole_setup', 'id', $id_server);
} }
$filter = '1 = 1';
$all = (string)get_parameter('all', 'all'); $all = (string)get_parameter('all', 'all');
switch ($all) { switch ($all) {
default: default:
case 'all': case 'all':
$enabled = '1 = 1'; $filter .= ' AND 1 = 1';
break; break;
case 'enabled': case 'enabled':
$enabled = 'disabled = 0'; $filter .= ' AND disabled = 0';
break; break;
} }
if (!empty($module_types_excluded) && is_array($module_types_excluded))
$filter .= ' AND id_tipo_modulo NOT IN (' . implode($module_types_excluded) . ')';
if (is_metaconsole()) { if (is_metaconsole()) {
$result = array(); $result = array();
$nameModules = array(); $nameModules = array();
@ -299,7 +304,7 @@ if (is_ajax ()) {
WHERE t2.delete_pending = 0 WHERE t2.delete_pending = 0
AND t1.nombre = t2.nombre AND t1.nombre = t2.nombre
AND t2.id_agente IN (%s)) = (%d)', AND t2.id_agente IN (%s)) = (%d)',
$enabled, implode(',', $id_agents), $filter, implode(',', $id_agents),
implode(',', $id_agents), count($id_agents)); implode(',', $id_agents), count($id_agents));
$modules = db_get_all_rows_sql($sql); $modules = db_get_all_rows_sql($sql);
@ -346,20 +351,21 @@ if (is_ajax ()) {
$result[$key] = $value; $result[$key] = $value;
} }
asort($result);
} }
else { else {
$sql = 'SELECT DISTINCT(nombre) $sql = 'SELECT DISTINCT(nombre)
FROM tagente_modulo t1 FROM tagente_modulo t1
WHERE ' . $enabled . WHERE ' . $filter .
io_safe_output($custom_condition) . ' 'AND delete_pending = 0
AND delete_pending = 0
AND id_agente IN (' . implode(',', $idAgents) . ')'; AND id_agente IN (' . implode(',', $idAgents) . ')';
if ($selection_mode == 'common') { if ($selection_mode == 'common') {
$sql .= ' AND ( $sql .= ' AND (
SELECT count(nombre) SELECT count(nombre)
FROM tagente_modulo t2 FROM tagente_modulo t2
WHERE delete_pending = 0 AND t1.nombre = t2.nombre WHERE delete_pending = 0
AND t1.nombre = t2.nombre
AND id_agente IN (' . implode(',', $idAgents) . ')) = (' . count($idAgents) . ')'; AND id_agente IN (' . implode(',', $idAgents) . ')) = (' . count($idAgents) . ')';
} }