From 1cd6b8b35c42dfd1499f34ab4263009203513ff2 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Wed, 23 Jul 2014 12:08:57 +0000 Subject: [PATCH] 2014-07-23 Miguel de Dios * godmode/agentes/agent_wizard.snmp_explorer.php, godmode/agentes/module_manager_editor_plugin.php: some fixes for the snmp version 3. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10348 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++ .../agentes/agent_wizard.snmp_explorer.php | 91 ++++++++++++++++++- .../agentes/module_manager_editor_plugin.php | 7 +- 3 files changed, 100 insertions(+), 4 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 59dc924ed4..183ff6c9da 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2014-07-23 Miguel de Dios + + * godmode/agentes/agent_wizard.snmp_explorer.php, + godmode/agentes/module_manager_editor_plugin.php: some fixes for + the snmp version 3. + 2014-07-22 Juan Manuel Ramon * include/ajax/events.php: Fixed custom fields view in diff --git a/pandora_console/godmode/agentes/agent_wizard.snmp_explorer.php b/pandora_console/godmode/agentes/agent_wizard.snmp_explorer.php index 67687b215b..8de1c773f3 100644 --- a/pandora_console/godmode/agentes/agent_wizard.snmp_explorer.php +++ b/pandora_console/godmode/agentes/agent_wizard.snmp_explorer.php @@ -333,7 +333,7 @@ if ($create_modules) { ui_print_error_message (__('No agent selected or the agent does not exist')); } else { - + // Common values $common_values = array(); @@ -480,6 +480,33 @@ if ($create_modules) { $macros[$k]['value'] = '-m memuse'; break; } + + if ($snmp_version == '3') { + $macros[$k]['value'] .= " -v3 "; + switch ($snmp3_security_level) { + case "authNoPriv": + $macros[$k]['value'] .= + ' -u ' . $snmp3_auth_user . + ' -A ' . $snmp3_auth_pass . + ' -l ' . $snmp3_security_level . + ' -a ' . $snmp3_auth_method; + break; + case "noAuthNoPriv": + $macros[$k]['value'] .= + ' -u ' . $snmp3_auth_user . + ' -l ' . $snmp3_security_level; + break; + default: + $macros[$k]['value'] .= + ' -u ' . $snmp3_auth_user . + ' -A ' . $snmp3_auth_pass . + ' -l ' . $snmp3_security_level . + ' -a ' . $snmp3_auth_method . + ' -x ' . $snmp3_privacy_method . + ' -X ' . $snmp3_privacy_pass; + break; + } + } break; } } @@ -526,6 +553,33 @@ if ($create_modules) { case '_field3_': // Field 3 is the plugin parameters $macros[$k]['value'] = io_safe_input('-m process -p "' . $process . '"'); + + if ($snmp_version == '3') { + $macros[$k]['value'] .= " -v3 "; + switch ($snmp3_security_level) { + case "authNoPriv": + $macros[$k]['value'] .= + ' -u ' . $snmp3_auth_user . + ' -A ' . $snmp3_auth_pass . + ' -l ' . $snmp3_security_level . + ' -a ' . $snmp3_auth_method; + break; + case "noAuthNoPriv": + $macros[$k]['value'] .= + ' -u ' . $snmp3_auth_user . + ' -l ' . $snmp3_security_level; + break; + default: + $macros[$k]['value'] .= + ' -u ' . $snmp3_auth_user . + ' -A ' . $snmp3_auth_pass . + ' -l ' . $snmp3_security_level . + ' -a ' . $snmp3_auth_method . + ' -x ' . $snmp3_privacy_method . + ' -X ' . $snmp3_privacy_pass; + break; + } + } break; } } @@ -566,7 +620,33 @@ if ($create_modules) { case '_field3_': // Field 3 is the plugin parameters $macros[$k]['value'] = io_safe_input('-m diskuse -d "' . io_safe_output($disk) . '"'); - break; + + if ($snmp_version == '3') { + $macros[$k]['value'] .= " -v3 "; + switch ($snmp3_security_level) { + case "authNoPriv": + $macros[$k]['value'] .= + ' -u ' . $snmp3_auth_user . + ' -A ' . $snmp3_auth_pass . + ' -l ' . $snmp3_security_level . + ' -a ' . $snmp3_auth_method; + break; + case "noAuthNoPriv": + $macros[$k]['value'] .= + ' -u ' . $snmp3_auth_user . + ' -l ' . $snmp3_security_level; + break; + default: + $macros[$k]['value'] .= + ' -u ' . $snmp3_auth_user . + ' -A ' . $snmp3_auth_pass . + ' -l ' . $snmp3_security_level . + ' -a ' . $snmp3_auth_method . + ' -x ' . $snmp3_privacy_method . + ' -X ' . $snmp3_privacy_pass; + break; + } + } } } @@ -576,7 +656,7 @@ if ($create_modules) { unset($module_values['ip_target']); //ip_target unset($module_values['tcp_send']); //snmp_version - $result = modules_create_agent_module ($id_agent, io_safe_input($disk), $module_values); + $result = modules_create_agent_module($id_agent, io_safe_input($disk), $module_values); $results[$result][] = $disk; } @@ -594,6 +674,11 @@ if ($create_modules) { $error_message .= sprintf(__('Error creating %s modules') . ':
  * ' . implode('
  * ', $results[ERR_GENERIC]), count($results[ERR_GENERIC])) . '
'; } } + if (isset($results[ERR_DB])) { + if (count($results[ERR_DB]) > 0) { + $error_message .= sprintf(__('Error creating %s modules') . ':
  * ' . implode('
  * ', $results[ERR_DB]), count($results[ERR_DB])) . '
'; + } + } if (isset($results[ERR_EXIST])) { if (count($results[ERR_EXIST]) > 0) { $error_message .= sprintf(__('%s modules already exist') . ':
  * ' . implode('
  * ', $results[ERR_EXIST]), count($results[ERR_EXIST])) . '
'; diff --git a/pandora_console/godmode/agentes/module_manager_editor_plugin.php b/pandora_console/godmode/agentes/module_manager_editor_plugin.php index a45554a321..dc1cf8fbd5 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_plugin.php +++ b/pandora_console/godmode/agentes/module_manager_editor_plugin.php @@ -84,7 +84,12 @@ if (!empty($macros)) { if (!empty($m['help'])) { $data[0] .= ui_print_help_tip ($m['help'], true); } - if($m['hide']) { + + $m_hide = false; + if (isset($m['hide'])) + $m_hide = $m['hide']; + + if ($m_hide) { $data[1] = html_print_input_password($m['macro'], $m['value'], '', 100, 255, true); } else {