2009-10-26 Miguel de Dios <miguel.dedios@artica.es>

* pandora_console/include/functions_api.php,
	pandora_console/include/api.php: new feature, API to call by format url for
	values or CSV list of values to connect Pandora with your or other
	aplications. Please see the wiki for more information.
	* pandora_console/include/functions_agents.php,
	pandora_console/godmode/setup/setup.php: add the field ACL IP list for
	access API and change the function "update_config_value" for divide in
	chunks the list of IPs and save in serveral rows (if necesary). And change
	the function "process_config" to paste the chunks of rows in one config
	item. 
	* pandora_console/include/functions_config.php,
	pandora_console/include/functions_db.php: changes for engage the
	API with Pandora Console. The function "get_agent_alerts_simple" add
	parammeter "allModules" return all modules (disabled and enabled). The
	function "get_group_agents" add the parameter "noACL" for engage the API
	call.
	* pandora_console/godmode/agentes/agent_manager.php: fix typo and ident
	source code.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2051 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2009-10-26 16:35:34 +00:00
parent f8517f0639
commit 1c9bc029a7
8 changed files with 758 additions and 23 deletions

View File

@ -1,3 +1,24 @@
2009-10-26 Miguel de Dios <miguel.dedios@artica.es>
* pandora_console/include/functions_api.php,
pandora_console/include/api.php: new feature, API to call by format url for
values or CSV list of values to connect Pandora with your or other
aplications. Please see the wiki for more information.
* pandora_console/include/functions_agents.php,
pandora_console/godmode/setup/setup.php: add the field ACL IP list for
access API and change the function "update_config_value" for divide in
chunks the list of IPs and save in serveral rows (if necesary). And change
the function "process_config" to paste the chunks of rows in one config
item.
* pandora_console/include/functions_config.php,
pandora_console/include/functions_db.php: changes for engage the
API with Pandora Console. The function "get_agent_alerts_simple" add
parammeter "allModules" return all modules (disabled and enabled). The
function "get_group_agents" add the parameter "noACL" for engage the API
call.
* pandora_console/godmode/agentes/agent_manager.php: fix typo and ident
source code.
2009-10-26 Miguel de Dios <miguel.dedios@artica.es>
* pandora_console/operation/agentes/exportdata.php: fix the export data

View File

@ -100,7 +100,8 @@ $table->style = array ();
$table->style[0] = 'font-weight: bold';
$table->data = array ();
$table->data[0][0] = __('Agent name').print_help_tip (__("The agent's name must be the same as the one defined at the console"), true);
$table->data[0][0] = __('Agent name') .
print_help_tip (__("The agent's name must be the same as the one defined at the console"), true);
$table->data[0][1] = print_input_text ('agente', $nombre_agente, '', 30, 100,true);
if ($id_agente) {

View File

@ -105,6 +105,11 @@ $table->data[12][1] .= __('No').'&nbsp;'.print_radio_button ('compact_header', 0
$table->data[14][0] = __('Attachment store');
$table->data[14][1] = print_input_text ('attachment_store', $config["attachment_store"], '', 50, 255, true);
$table->data[14][0] = __('ACL IP list for access API') .
print_help_tip (__("The list of IPs separate with carriage return."), true);
$list_ACL_IPs_for_API = get_parameter('list_ACL_IPs_for_API', implode("\n", $config['list_ACL_IPs_for_API']));
$table->data[14][1] = print_textarea('list_ACL_IPs_for_API', 10, 15, $list_ACL_IPs_for_API, null, true);
enterprise_hook ('setup');
echo '<form id="form_setup" method="post">';

View File

@ -0,0 +1,45 @@
<?php
//Pandora FMS- http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public License
// as published by the Free Software Foundation; version 2
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//Set character encoding to UTF-8 - fixes a lot of multibyte character headaches
require_once ("config.php");
require_once("functions_api.php");
//Get the parameters and parse if necesary.
$ipOrigin = $_SERVER['REMOTE_ADDR'];
$op = get_parameter('op');
$op2 = get_parameter('op2');
$id = get_parameter('id');
$id2 = get_parameter('id2');
$other = parseOtherParameter(get_parameter('other'), get_parameter('other_mode', 'url_encode'));
$returnType = get_parameter('return_type', 'string');
if (isInACL($ipOrigin)) {
if (($op !== 'get') && ($op !== 'set') && ($op !== 'help'))
returnError('no_set_no_get_no_help', $returnType);
else {
if (!function_exists($op.'_'.$op2))
returnError('no_exist_operation', $returnType);
else {
call_user_func($op.'_'.$op2, $id, $id2, $other, $returnType);
}
}
}
else {
echo 'ERROR: Your IP (' . $ipOrigin . ') is not in ACL IP list.';
}
?>

View File

@ -102,11 +102,12 @@ function create_agent ($name, $id_group, $interval, $ip_address, $values = false
* will not do any filter.
* @param array Extra filter options in an indexed array. See
* format_array_to_where_clause_sql()
* @param boolean $allModules
*
* @return array All simple alerts defined for an agent. Empty array if no
* alerts found.
*/
function get_agent_alerts_simple ($id_agent = false, $filter = '', $options = false, $where = '') {
function get_agent_alerts_simple ($id_agent = false, $filter = '', $options = false, $where = '', $allModules = false) {
switch ($filter) {
case "notfired":
$filter = ' AND times_fired = 0 AND disabled = 0';
@ -129,8 +130,10 @@ function get_agent_alerts_simple ($id_agent = false, $filter = '', $options = fa
}
if ($id_agent === false) {
if ($allModules) $disabled = '';
else $disabled = 'WHERE disabled = 0';
$subQuery = 'SELECT id_agente_modulo
FROM tagente_modulo WHERE disabled = 0';
FROM tagente_modulo ' . $disabled;
}
else {
$id_agent = (array) $id_agent;

View File

@ -0,0 +1,586 @@
<?php
//Pandora FMS- http://pandorafms.com
// ==================================================
// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas
// Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public License
// as published by the Free Software Foundation; version 2
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//Set character encoding to UTF-8 - fixes a lot of multibyte character headaches
require_once('functions_agents.php');
/**
* Parse the "other" parameter.
*
* @param string $other
* @param mixed $otherType
* @return mixed
*/
function parseOtherParameter($other, $otherType) {
switch ($otherType) {
case 'url_encode':
$returnVar = array('type' => 'string', 'data' => urldecode($other));
break;
default:
if (strpos($otherType, 'url_encode_separator_') !== false) {
$separator = str_replace('url_encode_separator_', '', $otherType);
$returnVar = array('type' => 'array', 'data' => explode($separator,$other));
foreach ($returnVar['data'] as $index => $element)
$returnVar['data'][$index] = urldecode($element);
}
else {
$returnVar = array('type' => 'string', 'data' => urldecode($other));
}
break;
}
return $returnVar;
}
/**
*
* @param $typeError
* @param $returnType
* @return unknown_type
*/
function returnError($typeError, $returnType) {
switch ($typeError) {
case 'no_set_no_get_no_help':
returnData($returnType,
array('type' => 'string', 'data' => __('No set or get or help operation.')));
break;
case 'no_exist_operation':
returnData($returnType,
array('type' => 'string', 'data' => __('No exist this operation.')));
break;
case 'id_not_found':
returnData($returnType,
array('type' => 'string', 'data' => __('No exist id in BD.')));
break;
}
}
/**
*
* @param $returnType
* @param $data
* @return unknown_type
*/
function returnData($returnType, $data, $separator = ';') {
switch ($returnType) {
case 'string':
if ($data['type'] == 'string')
echo $data['data'];
else
;//TODO
break;
case 'csv':
case 'csv_head':
switch ($data['type']) {
case 'array':
if (array_key_exists('list_index', $data))
{
if ($returnType == 'csv_head') {
foreach($data['list_index'] as $index) {
echo $index;
if (end($data['list_index']) == $index)
echo "\n";
else
echo $separator;
}
}
foreach($data['data'] as $dataContent) {
foreach($data['list_index'] as $index) {
if (array_key_exists($index, $dataContent))
echo $dataContent[$index];
if (end($data['list_index']) == $index)
echo "\n";
else
echo $separator;
}
}
}
else {
foreach($data['data'] as $dataContent) {
echo implode($separator, $dataContent) . "\n";
}
}
break;
}
break;
}
}
/**
*
* @param $ip
* @return unknown_type
*/
function isInACL($ip) {
global $config;
if (in_array($ip, $config['list_ACL_IPs_for_API']))
return true;
else
return false;
}
//-------------------------DEFINED OPERATIONS FUNCTIONS-------------------------
function get_agent_module_name_last_value($agentName, $moduleName, $other = ';', $returnType)
{
$idAgent = get_agent_id($agentName);
$sql = sprintf('SELECT id_agente_modulo
FROM tagente_modulo
WHERE id_agente = %d AND nombre LIKE "%s"', $idAgent, $moduleName);
$idModuleAgent = get_db_value_sql($sql);
if ($idModuleAgent === false) {
switch ($other['type']) {
case 'string':
switch ($other['data']) {
case 'error_message':
default:
returnError('id_not_found', $returnType);
break;
}
break;
case 'array':
switch ($other['data'][0]) {
case 'error_value':
returnData($returnType, array('type' => 'string', 'data' => $other['data'][1]));
break;
}
break;
}
}
else {
get_module_last_value($idModuleAgent, null, $other, $returnType);
}
}
function get_module_last_value($idAgentModule, $trash1, $other = ';', $returnType)
{
$sql = sprintf('SELECT datos FROM tagente_estado WHERE id_agente_modulo = %d', $idAgentModule);
$value = get_db_value_sql($sql);
if ($value === false) {
switch ($other['type']) {
case 'string':
switch ($other['data']) {
case 'error_message':
default:
returnError('id_not_found', $returnType);
break;
}
break;
case 'array':
switch ($other['data'][0]) {
case 'error_value':
returnData($returnType, array('type' => 'string', 'data' => $other['data'][1]));
break;
}
break;
}
}
else {
$data = array('type' => 'string', 'data' => $value);
returnData($returnType, $data);
}
}
/**
*
* @param $trash1
* @param $trahs2
* @param mixed $other If $other is string is only the separator,
* but if it's array, $other as param is <separator>;<replace_return>;(<field_1>,<field_2>...<field_n>) in this order
* and separator char (after text ; ) must be diferent that separator (and other) url (pass in param othermode as othermode=url_encode_separator_<separator>)
* example:
*
* return csv with fields type_row,group_id and agent_name, separate with ";" and the return of the text replace for " "
* api.php?op=get&op2=tree_agents&return_type=csv&other=;| |type_row,group_id,agent_name&other_mode=url_encode_separator_|
*
*
* @param $returnType
* @return unknown_type
*/
function get_tree_agents($trash1, $trahs2, $other, $returnType)
{
if ($other['type'] == 'array') {
$separator = $other['data'][0];
$returnReplace = $other['data'][1];
if (trim($other['data'][2]) == '')
$fields = false;
else {
$fields = explode(',', $other['data'][2]);
foreach($fields as $index => $field)
$fields[$index] = trim($field);
}
}
else {
$separator = $other['data'];
$returnReplace = ' ';
$fields = false;
}
$returnVar = array();
$groups = get_db_all_rows_sql('SELECT * FROM tgrupo');
if ($groups === false) $groups = array();
$groups = str_replace('\n', $returnReplace, $groups);
$agents = get_db_all_rows_sql('SELECT * FROM tagente');
if ($agents === false) $agents = array();
$agents = str_replace('\n', $returnReplace, $agents);
foreach ($groups as $group) {
$returnVar[] = array(
'type_row' => 'group',
'group_id' => $group['id_grupo'],
'group_name' => $group['nombre'],
'group_parent' => $group['parent'],
'disabled' => $group['disabled'],
'custom_id' => $group['custom_id']
);
foreach ($agents as $index => $agent) {
if ($agent['id_grupo'] == $group['id_grupo']) {
$returnVar[] = array(
'type_row' => 'agent',
'agent_id' => $agent['id_agente'],
'agent_name' => $agent['nombre'],
'agent_direction' => $agent['direccion'],
'agent_comentary' => $agent['comentarios'],
'agent_id_group' => $agent['id_grupo'],
'agent_last_contant' => $agent['ultimo_contacto'],
'agent_mode' => $agent['modo'],
'agent_interval' => $agent['intervalo'],
'agent_id_os' => $agent['id_os'],
'agent_os_version' => $agent['os_version'],
'agent_version' => $agent['agent_version'],
'agent_last_remote_contact' => $agent['ultimo_contacto_remoto'],
'agent_disabled' => $agent['disabled'],
'agent_id_parent' => $agent['id_parent'],
'agent_custom_id' => $agent['custom_id'],
'agent_server_name' => $agent['server_name'],
'agent_cascade_protection' => $agent['cascade_protection']
);
$modules = get_db_all_rows_sql('SELECT *
FROM (SELECT *
FROM tagente_modulo
WHERE id_agente = ' . $agent['id_agente'] . ') AS t1
INNER JOIN (SELECT *
FROM tagente_estado
WHERE id_agente = ' . $agent['id_agente'] . ') AS t2
ON t1.id_agente = t2.id_agente');
if ($modules === false) $modules = array();
$modules = str_replace('\n', $returnReplace, $modules);
foreach ($modules as $module) {
$returnVar[] = array(
'type_row' => 'module',
'module_id_agent_modulo' => $module['id_agente_modulo'],
'module_id_agent' => $module['id_agente'],
'module_id_module_type' => $module['id_tipo_modulo'],
'module_description' => $module['descripcion'],
'module_name' => $module['nombre'],
'module_max' => $module['max'],
'module_min' => $module['min'],
'module_interval' => $module['module_interval'],
'module_tcp_port' => $module['tcp_port'],
'module_tcp_send' => $module['tcp_send'],
'module_tcp_rcv' => $module['tcp_rcv'],
'module_snmp_community' => $module['snmp_community'],
'module_snmp_oid' => $module['snmp_oid'],
'module_ip_target' => $module['ip_target'],
'module_id_module_group' => $module['id_module_group'],
'module_flag' => $module['flag'],
'module_id_module' => $module['id_modulo'],
'module_disabled' => $module['disabled'],
'module_id_export' => $module['id_export'],
'module_plugin_user' => $module['plugin_user'],
'module_plugin_pass' => $module['plugin_pass'],
'module_plugin_parameter' => $module['plugin_parameter'],
'module_id_plugin' => $module['id_plugin'],
'module_post_process' => $module['post_process'],
'module_prediction_module' => $module['prediction_module'],
'module_max_timeout' => $module['max_timeout'],
'module_custom_id' => $module['custom_id'],
'module_history_data' => $module['history_data'],
'module_min_warning' => $module['min_warning'],
'module_max_warning' => $module['max_warning'],
'module_min_critical' => $module['min_critical'],
'module_max_critical' => $module['max_critical'],
'module_min_ff_event' => $module['min_ff_event'],
'module_delete_pending' => $module['delete_pending'],
'module_id_agent_state' => $module['id_agente_estado'],
'module_data' => $module['datos'],
'module_timestamp' => $module['timestamp'],
'module_state' => $module['estado'],
'module_last_try' => $module['last_try'],
'module_utimestamp' => $module['utimestamp'],
'module_current_interval' => $module['current_interval'],
'module_running_by' => $module['running_by'],
'module_last_execution_try' => $module['last_execution_try'],
'module_status_changes' => $module['status_changes'],
'module_last_status' => $module['last_status']
);
$alerts = get_db_all_rows_sql('SELECT *,
t1.id AS alert_template_modules_id,
t2.id AS alert_templates_id,
t3.id AS alert_template_module_actions_id,
t4.id AS alert_actions_id,
t5.id AS alert_commands_id,
t2.name AS alert_templates_name,
t4.name AS alert_actions_name,
t5.name AS alert_commands_name,
t2.description AS alert_templates_description,
t5.description AS alert_commands_description,
t1.priority AS alert_template_modules_priority,
t2.priority AS alert_templates_priority,
t2.field1 AS alert_templates_field1,
t4.field1 AS alert_actions_field1,
t2.field2 AS alert_templates_field2,
t4.field2 AS alert_actions_field2,
t2.field3 AS alert_templates_field3,
t4.field3 AS alert_actions_field3,
t2.id_group AS alert_templates_id_group,
t4.id_group AS alert_actions_id_group
FROM (SELECT *
FROM talert_template_modules
WHERE id_agent_module = ' . $module['id_agente_modulo'] . ') AS t1
INNER JOIN talert_templates AS t2
ON t1.id_alert_template = t2.id
LEFT JOIN talert_template_module_actions AS t3
ON t1.id = t3.id_alert_template_module
LEFT JOIN talert_actions AS t4
ON t3.id_alert_action = t4.id
LEFT JOIN talert_commands AS t5
ON t4.id_alert_command = t5.id');
if ($alerts === false) $alerts = array();
$alerts = str_replace('\n', $returnReplace, $alerts);
foreach ($alerts as $alert) {
$returnVar[] = array(
'type_row' => 'alert',
'alert_id_agent_module' => $alert['id_agent_module'],
'alert_id_alert_template' => $alert['id_alert_template'],
'alert_internal_counter' => $alert['internal_counter'],
'alert_last_fired' => $alert['last_fired'],
'alert_last_reference' => $alert['last_reference'],
'alert_times_fired' => $alert['times_fired'],
'alert_disabled' => $alert['disabled'],
'alert_force_execution' => $alert['force_execution'],
'alert_id_alert_action' => $alert['id_alert_action'],
'alert_type' => $alert['type'],
'alert_value' => $alert['value'],
'alert_matches_value' => $alert['matches_value'],
'alert_max_value' => $alert['max_value'],
'alert_min_value' => $alert['min_value'],
'alert_time_threshold' => $alert['time_threshold'],
'alert_max_alerts' => $alert['max_alerts'],
'alert_min_alerts' => $alert['min_alerts'],
'alert_time_from' => $alert['time_from'],
'alert_time_to' => $alert['time_to'],
'alert_monday' => $alert['monday'],
'alert_tuesday' => $alert['tuesday'],
'alert_wednesday' => $alert['wednesday'],
'alert_thursday' => $alert['thursday'],
'alert_friday' => $alert['friday'],
'alert_saturday' => $alert['saturday'],
'alert_sunday' => $alert['sunday'],
'alert_recovery_notify' => $alert['recovery_notify'],
'alert_field2_recovery' => $alert['field2_recovery'],
'alert_field3_recovery' => $alert['field3_recovery'],
'alert_id_alert_template_module' => $alert['id_alert_template_module'],
'alert_fires_min' => $alert['fires_min'],
'alert_fires_max' => $alert['fires_max'],
'alert_id_alert_command' => $alert['id_alert_command'],
'alert_command' => $alert['command'],
'alert_internal' => $alert['internal'],
'alert_template_modules_id' => $alert['alert_template_modules_id'],
'alert_templates_id' => $alert['alert_templates_id'],
'alert_template_module_actions_id' => $alert['alert_template_module_actions_id'],
'alert_actions_id' => $alert['alert_actions_id'],
'alert_commands_id' => $alert['alert_commands_id'],
'alert_templates_name' => $alert['alert_templates_name'],
'alert_actions_name' => $alert['alert_actions_name'],
'alert_commands_name' => $alert['alert_commands_name'],
'alert_templates_description' => $alert['alert_templates_description'],
'alert_commands_description' => $alert['alert_commands_description'],
'alert_template_modules_priority' => $alert['alert_template_modules_priority'],
'alert_templates_priority' => $alert['alert_templates_priority'],
'alert_templates_field1' => $alert['alert_templates_field1'],
'alert_actions_field1' => $alert['alert_actions_field1'],
'alert_templates_field2' => $alert['alert_templates_field2'],
'alert_actions_field2' => $alert['alert_actions_field2'],
'alert_templates_field3' => $alert['alert_templates_field3'],
'alert_actions_field3' => $alert['alert_actions_field3'],
'alert_templates_id_group' => $alert['alert_templates_id_group'],
'alert_actions_id_group' => $alert['alert_actions_id_group'],
);
}
}
unset($agents[$index]);
}
}
}
$data = array('type' => 'array', 'data' => $returnVar);
if ($fields !== false)
$data['list_index'] = $fields;
else
$data['list_index'] = array(
'type_row',
'group_id',
'group_name',
'group_parent',
'disabled',
'custom_id',
'agent_id',
'agent_name',
'agent_direction',
'agent_comentary',
'agent_id_group',
'agent_last_contant',
'agent_mode',
'agent_interval',
'agent_id_os',
'agent_os_version',
'agent_version',
'agent_last_remote_contact',
'agent_disabled',
'agent_id_parent',
'agent_custom_id',
'agent_server_name',
'agent_cascade_protection',
'module_id_agent_modulo',
'module_id_agent',
'module_id_module_type',
'module_description',
'module_name',
'module_max',
'module_min',
'module_interval',
'module_tcp_port',
'module_tcp_send',
'module_tcp_rcv',
'module_snmp_community',
'module_snmp_oid',
'module_ip_target',
'module_id_module_group',
'module_flag',
'module_id_module',
'module_disabled',
'module_id_export',
'module_plugin_user',
'module_plugin_pass',
'module_plugin_parameter',
'module_id_plugin',
'module_post_process',
'module_prediction_module',
'module_max_timeout',
'module_custom_id',
'module_history_data',
'module_min_warning',
'module_max_warning',
'module_min_critical',
'module_max_critical',
'module_min_ff_event',
'module_delete_pending',
'module_id_agent_state',
'module_data',
'module_timestamp',
'module_state',
'module_last_try',
'module_utimestamp',
'module_current_interval',
'module_running_by',
'module_last_execution_try',
'module_status_changes',
'module_last_status',
'alert_id_agent_module',
'alert_id_alert_template',
'alert_internal_counter',
'alert_last_fired',
'alert_last_reference',
'alert_times_fired',
'alert_disabled',
'alert_force_execution',
'alert_id_alert_action',
'alert_type',
'alert_value',
'alert_matches_value',
'alert_max_value',
'alert_min_value',
'alert_time_threshold',
'alert_max_alerts',
'alert_min_alerts',
'alert_time_from',
'alert_time_to',
'alert_monday',
'alert_tuesday',
'alert_wednesday',
'alert_thursday',
'alert_friday',
'alert_saturday',
'alert_sunday',
'alert_recovery_notify',
'alert_field2_recovery',
'alert_field3_recovery',
'alert_id_alert_template_module',
'alert_fires_min',
'alert_fires_max',
'alert_id_alert_command',
'alert_command',
'alert_internal',
'alert_template_modules_id',
'alert_templates_id',
'alert_template_module_actions_id',
'alert_actions_id',
'alert_commands_id',
'alert_templates_name',
'alert_actions_name',
'alert_commands_name',
'alert_templates_description',
'alert_commands_description',
'alert_template_modules_priority',
'alert_templates_priority',
'alert_templates_field1',
'alert_actions_field1',
'alert_templates_field2',
'alert_actions_field2',
'alert_templates_field3',
'alert_actions_field3',
'alert_templates_id_group',
'alert_actions_id_group'
);
returnData($returnType, $data, $separator);
}
?>

View File

@ -45,18 +45,67 @@ function create_config_value ($token, $value) {
function update_config_value ($token, $value) {
global $config;
if (!isset ($config[$token]))
return (bool) create_config_value ($token, $value);
/* If it has not changed */
if ($config[$token] == $value)
return true;
$config[$token] = $value;
return (bool) process_sql_update ('tconfig',
array ('value' => $value),
array ('token' => $token));
switch ($token) {
case 'list_ACL_IPs_for_API':
$rows = get_db_all_rows_sql('SELECT id_config
FROM tconfig
WHERE token LIKE "%list_ACL_IPs_for_API_%"');
if ($rows !== false) {
foreach ($rows as $row)
$idListACLofIP[] = $row['id_config'];
process_sql_delete('tconfig', 'id_config IN (' . implode(',', $idListACLofIP) . ')' );
}
if (strpos($value, "\r\n") !== false)
$ips = explode("\r\n", $value);
else
$ips = explode("\n", $value);
$valueDB = '';
$count = 0;
$lastInsert = false;
foreach ($ips as $ip) {
$lastInsert = false;
if (strlen($valueDB . ';' . $ip) < 100) {
//100 is the size of field 'value' in tconfig.
if (strlen($valueDB) == 0)
$valueDB .= $ip;
else
$valueDB .= ';' . $ip;
}
else {
if (strlen($ip) > 100)
return false;
process_sql_insert('tconfig',
array('token' => 'list_ACL_IPs_for_API_' . $count , 'value' => $valueDB));
$valueDB = $ip;
$count++;
$lastInsert = true;
}
}
if (!$lastInsert)
process_sql_insert('tconfig',
array('token' => 'list_ACL_IPs_for_API_' . $count , 'value' => $valueDB));
break;
default:
if (!isset ($config[$token]))
return (bool) create_config_value ($token, $value);
/* If it has not changed */
if ($config[$token] == $value)
return true;
$config[$token] = $value;
return (bool) process_sql_update ('tconfig',
array ('value' => $value),
array ('token' => $token));
break;
}
}
/**
@ -111,6 +160,7 @@ function update_config () {
update_config_value ('agentaccess', (int) get_parameter ('agentaccess', $config['agentaccess']));
update_config_value ('flash_charts', (bool) get_parameter ('flash_charts', $config["flash_charts"]));
update_config_value ('attachment_store', (string) get_parameter ('attachment_store', $config["attachment_store"]));
update_config_value ('list_ACL_IPs_for_API', (string) get_parameter('list_ACL_IPs_for_API', implode("\n", $config['list_ACL_IPs_for_API'])));
}
/**
@ -199,6 +249,24 @@ function process_config () {
if (!isset ($config["agentaccess"])){
update_config_value ('agentaccess', true);
}
/*
*Parse the ACL IP list for access API that it's save in chunks as
*list_ACL_IPs_for_API_<num>, because the value has a limit of 100
*characters.
*/
$config['list_ACL_IPs_for_API'] = array();
$keysConfig = array_keys($config);
foreach($keysConfig as $keyConfig)
if (strpos($keyConfig, 'list_ACL_IPs_for_API_') !== false) {
$ips = explode(';',$config[$keyConfig]);
$config['list_ACL_IPs_for_API'] =
array_merge($config['list_ACL_IPs_for_API'], $ips);
unset($config[$keyConfig]);
}
// This is not set here. The first time, when no
// setup is done, update_manager extension manage it

View File

@ -349,20 +349,26 @@ function isAllGroups($idGroups) {
* @param mixed $id_group Group id or an array of ID's. If nothing is selected, it will select all
* @param mixed $search to add Default: False. If True will return disabled agents as well. If searching array (disabled => (bool), string => (string))
* @param string $case Which case to return the agentname as (lower, upper, none)
* @param boolean $noACL jump the ACL test.
*
* @return array An array with all agents in the group or an empty array
*/
function get_group_agents ($id_group = 0, $search = false, $case = "lower") {
function get_group_agents ($id_group = 0, $search = false, $case = "lower", $noACL = false) {
global $config;
$id_group = safe_acl_group ($config["id_user"], $id_group, "AR");
if (empty ($id_group)) {
//An empty array means the user doesn't have access
return array ();
if (!$noACL) {
$id_group = safe_acl_group ($config["id_user"], $id_group, "AR");
if (empty ($id_group)) {
//An empty array means the user doesn't have access
return array ();
}
}
$search_sql = sprintf ('WHERE id_grupo IN (%s)', implode (",", $id_group));
if (is_array($id_group))
$search_sql = sprintf ('WHERE id_grupo IN (%s)', implode (",", $id_group));
else
$search_sql = sprintf ('WHERE id_grupo = %d', $id_group);
if ($search === true) {
//No added search. Show both disabled and non-disabled
@ -2889,7 +2895,7 @@ function get_server_info ($id_server = -1) {
$recon_total = get_db_sql ("SELECT COUNT(*) FROM trecon_task");
$sql = "SELECT * FROM tserver".$select_id;
$sql = "SELECT * FROM tserver".$select_id . " ORDER BY server_type";
$result = get_db_all_rows_sql ($sql);
$time = get_system_time ();