$interface) {
if (!empty($interface['traffic'])) {
- $params = array(
- 'interface_name' => $interface_name,
- 'agent_id' => $id_agente,
- 'traffic_module_in' => $interface['traffic']['in'],
- 'traffic_module_out' => $interface['traffic']['out']
- );
- $params_json = json_encode($params);
- $params_encoded = base64_encode($params_json);
- $win_handle = dechex(crc32($interface['status_module_id'].$interface_name));
- $graph_link = "
";
+ $permission = false;
+
+ if ($strict_user) {
+ if (tags_check_acl_by_module($interface['traffic']['in'], $config['id_user'], 'RR') === true
+ && tags_check_acl_by_module($interface['traffic']['out'], $config['id_user'], 'RR') === true)
+ $permission = true;
+ }
+ else {
+ $permission = check_acl($config['id_user'], $agent["id_grupo"], "RR");
+ }
+
+ if ($permission) {
+ $params = array(
+ 'interface_name' => $interface_name,
+ 'agent_id' => $id_agente,
+ 'traffic_module_in' => $interface['traffic']['in'],
+ 'traffic_module_out' => $interface['traffic']['out']
+ );
+ $params_json = json_encode($params);
+ $params_encoded = base64_encode($params_json);
+ $win_handle = dechex(crc32($interface['status_module_id'].$interface_name));
+ $graph_link = "
";
+ }
+ else {
+ $graph_link = "";
+ }
}
else {
$graph_link = "";
diff --git a/pandora_console/operation/agentes/interface_traffic_graph_win.php b/pandora_console/operation/agentes/interface_traffic_graph_win.php
index ad95fbd6d8..70ac95311d 100644
--- a/pandora_console/operation/agentes/interface_traffic_graph_win.php
+++ b/pandora_console/operation/agentes/interface_traffic_graph_win.php
@@ -21,31 +21,37 @@ if (! isset($_SESSION['id_usuario'])) {
// Global & session management
require_once ('../../include/config.php');
-require_once ('../../include/auth/mysql.php');
+require_once ($config['homedir'] . '/include/auth/mysql.php');
require_once ($config['homedir'] . '/include/functions.php');
require_once ($config['homedir'] . '/include/functions_db.php');
require_once ($config['homedir'] . '/include/functions_reporting.php');
require_once ($config['homedir'] . '/include/functions_graph.php');
require_once ($config['homedir'] . '/include/functions_custom_graphs.php');
require_once ($config['homedir'] . '/include/functions_modules.php');
-
-// Hash login process
-if (! isset ($config['id_user']) && get_parameter("loginhash", 0)) {
- $loginhash_data = get_parameter("loginhash_data", "");
- $loginhash_user = str_rot13(get_parameter("loginhash_user", ""));
-
- if ($config["loginhash_pwd"] != "" && $loginhash_data == md5($loginhash_user.io_output_password($config["loginhash_pwd"]))) {
- db_logon ($loginhash_user, $_SERVER['REMOTE_ADDR']);
- $_SESSION['id_usuario'] = $loginhash_user;
- $config["id_user"] = $loginhash_user;
-
- $hash_connection_data = true;
- }
-
-}
+require_once ($config['homedir'] . '/include/functions_agents.php');
+require_once ($config['homedir'] . '/include/functions_tags.php');
check_login();
+$params_json = base64_decode((string) get_parameter('params'));
+$params = json_decode($params_json, true);
+
+// Metaconsole connection to the node
+$server_id = (int) (isset($params['server']) ? $params['server'] : 0);
+if ($config["metaconsole"] && !empty($server_id)) {
+ $server = metaconsole_get_connection_by_id($server_id);
+
+ // Error connecting
+ if (metaconsole_connect($server) !== NOERR) {
+ echo "";
+ echo "";
+ ui_print_error_message(__('There was a problem connecting with the node'));
+ echo "";
+ echo "";
+ exit;
+ }
+}
+
$user_language = get_user_language($config['id_user']);
if (file_exists ('../../include/languages/'.$user_language.'.mo')) {
$l10n = new gettext_reader (new CachedFileReader ('../../include/languages/'.$user_language.'.mo'));
@@ -54,9 +60,6 @@ if (file_exists ('../../include/languages/'.$user_language.'.mo')) {
echo '
';
-$params_json = base64_decode((string) get_parameter('params'));
-$params = json_decode($params_json, true);
-
$interface_name = (string) $params['interface_name'];
$agent_id = (int) $params['agent_id'];
$interface_traffic_modules = array(
@@ -106,6 +109,34 @@ $interface_traffic_modules = array(
';
$side_layer_params['body_text'] .= html_print_input_hidden("params", base64_encode($params_json), true);
- if (isset($hash_connection_data)) {
- $side_layer_params['body_text'] .=
- html_print_input_hidden("loginhash", "auto", true);
- $side_layer_params['body_text'] .=
- html_print_input_hidden("loginhash_data", $loginhash_data, true);
- $side_layer_params['body_text'] .=
- html_print_input_hidden("loginhash_user",
- str_rot13($loginhash_user), true);
- }
-
// FORM TABLE
$table = html_get_predefined_table('transparent', 2);
diff --git a/pandora_console/operation/agentes/status_monitor.php b/pandora_console/operation/agentes/status_monitor.php
index ce18fdb97c..b14acede5e 100644
--- a/pandora_console/operation/agentes/status_monitor.php
+++ b/pandora_console/operation/agentes/status_monitor.php
@@ -1229,6 +1229,7 @@ foreach ($result as $row) {
);
if (defined('METACONSOLE') && isset($row["server_id"])) {
+ $graph_params["avg_only"] = 1;
// Set the server id
$graph_params["server"] = $row["server_id"];
}
diff --git a/pandora_console/operation/events/events_list.php b/pandora_console/operation/events/events_list.php
index 071bc3c1ce..103ca95919 100644
--- a/pandora_console/operation/events/events_list.php
+++ b/pandora_console/operation/events/events_list.php
@@ -86,7 +86,7 @@ if (is_ajax()) {
'id_filter', 'tevent_filter', $values);
if ($exists) {
- echo 'error';
+ echo 'duplicate';
}
else {
$result = db_process_sql_insert('tevent_filter', $values);
@@ -664,8 +664,25 @@ else
ui_toggle($events_filter, __('Event control filter'), '', !$open_filter);
// Error div for ajax messages
-echo "
";
+echo "
";
+ui_print_error_message(__('Error creating filter.'), 'data-type_info_box="error_create_filter"');
+ui_print_error_message(__('Error creating filter is duplicated.'), 'data-type_info_box="duplicate_create_filter"');
+ui_print_success_message(__('Filter created.'), 'data-type_info_box="success_create_filter"');
+
+ui_print_success_message(__('Filter updated.'), 'data-type_info_box="success_update_filter"');
+ui_print_error_message(__('Error updating filter.'), 'data-type_info_box="error_create_filter"');
+
echo "
";
+?>
+
+",
- {"page" : "operation/events/events_list",
- "save_event_filter" : 1,
- "id_name" : $("#text-id_name").val(),
- "id_group" : $("#id_group").val(),
- "event_type" : $("#event_type").val(),
- "severity" : $("#severity").val(),
- "status" : $("#status").val(),
- "search" : $("#text-search").val(),
- "text_agent" : $("#text_id_agent").val(),
- "pagination" : $("#pagination").val(),
- "event_view_hr" : $("#text-event_view_hr").val(),
- "id_user_ack" : $("#id_user_ack").val(),
- "group_rep" : $("#group_rep").val(),
- "tag_with": Base64.decode($("#hidden-tag_with").val()),
- "tag_without": Base64.decode($("#hidden-tag_without").val()),
- "filter_only_alert" : $("#filter_only_alert").val(),
- "id_group_filter": $("#id_group").val()
+ {
+ "page" : "operation/events/events_list",
+ "save_event_filter" : 1,
+ "id_name" : $("#text-id_name").val(),
+ "id_group" : $("#id_group").val(),
+ "event_type" : $("#event_type").val(),
+ "severity" : $("#severity").val(),
+ "status" : $("#status").val(),
+ "search" : $("#text-search").val(),
+ "text_agent" : $("#text_id_agent").val(),
+ "pagination" : $("#pagination").val(),
+ "event_view_hr" : $("#text-event_view_hr").val(),
+ "id_user_ack" : $("#id_user_ack").val(),
+ "group_rep" : $("#group_rep").val(),
+ "tag_with": Base64.decode($("#hidden-tag_with").val()),
+ "tag_without": Base64.decode($("#hidden-tag_without").val()),
+ "filter_only_alert" : $("#filter_only_alert").val(),
+ "id_group_filter": $("#id_group").val()
},
function (data) {
+ $(".info_box").hide();
if (data == 'error') {
- $('#show_filter_error').html('
');
+ $(".info_box").filter(function(i, item) {
+ if ($(item).data('type_info_box') == "error_create_filter") {
+ return true;
+ }
+ else
+ return false;
+ }).show();
+ }
+ else if (data == 'duplicate') {
+ $(".info_box").filter(function(i, item) {
+ if ($(item).data('type_info_box') == "duplicate_create_filter") {
+ return true;
+ }
+ else
+ return false;
+ }).show();
}
else {
id_filter_save = data;
- $('#show_filter_error').html('
');
+
+ $(".info_box").filter(function(i, item) {
+ if ($(item).data('type_info_box') == "success_create_filter") {
+ return true;
+ }
+ else
+ return false;
+ }).show();
}
});
@@ -978,7 +1019,7 @@ $(document).ready( function() {
// Update the info with the loaded filter
$("#hidden-id_name").val($('#text-id_name').val());
$('#filter_loaded_span').html($('#filter_loaded_text').html() + ': ' + $('#text-id_name').val());
-
+
return false;
});
@@ -1007,11 +1048,24 @@ $(document).ready( function() {
"id_group_filter": $("#id_group").val()
},
function (data) {
+ $(".info_box").hide();
if (data == 'ok') {
- $('#show_filter_error').html('
');
+ $(".info_box").filter(function(i, item) {
+ if ($(item).data('type_info_box') == "success_update_filter") {
+ return true;
+ }
+ else
+ return false;
+ }).show();
}
else {
- $('#show_filter_error').html('
');
+ $(".info_box").filter(function(i, item) {
+ if ($(item).data('type_info_box') == "error_create_filter") {
+ return true;
+ }
+ else
+ return false;
+ }).show();
}
});
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index f77d5455b0..08ee2ab869 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 6.0dev
-%define release 150325
+%define release 150327
# User and Group under which Apache is running
%define httpd_name httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index 2ff2f8bbce..5c40ec49eb 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_console
%define version 6.0dev
-%define release 150325
+%define release 150327
%define httpd_name httpd
# User and Group under which Apache is running
%define httpd_name apache2
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 1412d74704..59af8d640d 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -38,7 +38,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
('graph_res','5'),
('step_compact','1'),
('db_scheme_version','6.0dev'),
-('db_scheme_build','PD150325'),
+('db_scheme_build','PD150327'),
('show_unknown','0'),
('show_lastalerts','1'),
('style','pandora'),
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 1124f0ccb5..f2b199cc4d 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
package: pandorafms-server
-Version: 6.0dev-150325
+Version: 6.0dev-150327
Architecture: all
Priority: optional
Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 6eea37b3a3..1df8a6d666 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-pandora_version="6.0dev-150325"
+pandora_version="6.0dev-150327"
package_cpan=0
package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 613383527e..e2c7773fe7 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -43,7 +43,7 @@ our @EXPORT = qw(
# version: Defines actual version of Pandora Server for this module only
my $pandora_version = "6.0dev";
-my $pandora_build = "150325";
+my $pandora_build = "150327";
our $VERSION = $pandora_version." ".$pandora_build;
# Setup hash
diff --git a/pandora_server/lib/PandoraFMS/DB.pm b/pandora_server/lib/PandoraFMS/DB.pm
index 19b6b686e6..24f09ca1ba 100644
--- a/pandora_server/lib/PandoraFMS/DB.pm
+++ b/pandora_server/lib/PandoraFMS/DB.pm
@@ -73,10 +73,13 @@ our @EXPORT = qw(
get_profile_id
get_priority_name
get_server_id
+ get_tag_id
+ get_group_name
get_template_id
get_template_module_id
get_user_disabled
get_user_exists
+ get_user_profile_id
is_agent_address
is_group_disabled
get_agent_status
@@ -191,6 +194,18 @@ sub get_server_id ($$$) {
return defined ($rc) ? $rc : -1;
}
+########################################################################
+## Return the ID of a tag given the tag name.
+########################################################################
+sub get_tag_id ($$) {
+ my ($dbh, $tag_name) = @_;
+
+ my $rc = get_db_value ($dbh, "SELECT id_tag FROM ttag
+ WHERE name = ?",
+ safe_input($tag_name));
+ return defined ($rc) ? $rc : -1;
+}
+
########################################################################
## Return the first enabled server name found.
########################################################################
@@ -549,6 +564,22 @@ sub get_nc_profile_name ($$) {
return get_db_value ($dbh, "SELECT * FROM tnetwork_profile WHERE id_np = ?", $nc_id);
}
+##########################################################################
+## Return user profile ID given the user id, group id and profile id.
+##########################################################################
+sub get_user_profile_id ($$$$) {
+ my ($dbh, $user_id, $profile_id, $group_id) = @_;
+
+ my $rc = get_db_value ($dbh, "SELECT id_up FROM tusuario_perfil
+ WHERE id_usuario = ?
+ AND id_perfil = ?
+ AND id_grupo = ?",
+ safe_input($user_id),
+ $profile_id,
+ $group_id);
+ return defined ($rc) ? $rc : -1;
+}
+
##########################################################################
## Return profile ID given the profile name.
##########################################################################
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 2696fc203a..b014af234f 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 6.0dev
-%define release 150325
+%define release 150327
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index 76b23999b1..07d08c2e1e 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
#
%define name pandorafms_server
%define version 6.0dev
-%define release 150325
+%define release 150327
Summary: Pandora FMS Server
Name: %{name}
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index d426c42d96..2161336f86 100644
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -33,7 +33,7 @@ use PandoraFMS::Tools;
use PandoraFMS::DB;
# version: define current version
-my $version = "6.0dev PS150325";
+my $version = "6.0dev PS150327";
# Pandora server configuration
my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 2e711d13f0..79c2f3fa61 100644
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -20,6 +20,7 @@ use File::Basename;
use JSON qw(decode_json encode_json);
use MIME::Base64;
use Encode qw(decode encode_utf8);
+use LWP::Simple;
# Default lib dir for RPM and DEB packages
use lib '/usr/lib/perl5';
@@ -34,7 +35,7 @@ use Encode::Locale;
Encode::Locale::decode_argv;
# version: define current version
-my $version = "6.0dev PS150325";
+my $version = "6.0dev PS150327";
# save program name for logging
my $progname = basename($0);
@@ -186,10 +187,50 @@ sub help_screen{
print "\nSETUP:\n\n" unless $param ne '';
help_screen_line('--set_event_storm_protection', '
', "Enable (1) or disable (0) event \n\t storm protection");
+ print "\nTAGS\n\n" unless $param ne '';
+ help_screen_line('--create_tag', ' [] []', 'Create a new tag');
+ help_screen_line('--add_tag_to_user_profile', ' ', 'Add a tag to the given user profile');
+ help_screen_line('--add_tag_to_module', ' ', 'Add a tag to the given module');
+
print "\n";
exit;
}
+###############################################################################
+#
+###############################################################################
+sub api_call($$$;$$$) {
+ my ($pa_config, $op, $op2, $id, $id2, $other) = @_;
+ my $content = undef;
+
+ eval {
+ # Set the parameters for the POST request.
+ my $params = {};
+ $params->{"apipass"} = $pa_config->{"console_api_pass"};
+ $params->{"user"} = $pa_config->{"console_user"};
+ $params->{"pass"} = $pa_config->{"console_pass"};
+ $params->{"op"} = $op;
+ $params->{"op2"} = $op2;
+ $params->{"id"} = $id;
+ $params->{"id2"} = $id2;
+ $params->{"other"} = $other;
+ $params->{"other_mode"} = "url_encode_separator_|";
+
+ # Call the API.
+ my $ua = new LWP::UserAgent;
+ my $url = $pa_config->{"console_api_url"};
+ my $response = $ua->post($url, $params);
+
+ if ($response->is_success) {
+ $content = $response->decoded_content();
+ } else {
+ $content = $response->decoded_content();
+ }
+ };
+
+ return $content;
+}
+
###############################################################################
# Disable a entire group
###############################################################################
@@ -4083,6 +4124,18 @@ sub pandora_manage_main ($$$) {
param_check($ltotal, 1);
cli_recreate_collection();
}
+ elsif ($param eq '--create_tag') {
+ param_check($ltotal, 4, 2);
+ cli_create_tag();
+ }
+ elsif ($param eq '--add_tag_to_user_profile') {
+ param_check($ltotal, 4);
+ cli_add_tag_to_user_profile();
+ }
+ elsif ($param eq '--add_tag_to_module') {
+ param_check($ltotal, 3);
+ cli_add_tag_to_module();
+ }
else {
print_log "[ERROR] Invalid option '$param'.\n\n";
$param = '';
@@ -4281,5 +4334,77 @@ sub cli_create_local_component() {
$parameters{'ff_timeout'} = $ff_timeout unless !defined ($ff_timeout);
my $component_id = enterprise_hook('pandora_create_local_component_from_hash',[$conf, \%parameters, $dbh]);
-
+}
+
+##############################################################################
+# Create a new tag.
+##############################################################################
+
+sub cli_create_tag() {
+ my ($tag_name, $tag_description, $tag_url, $tag_email) = @ARGV[2..5];
+
+ # Call the API.
+ my $result = api_call(\%conf, 'set', 'create_tag', undef, undef, "$tag_name|$tag_description|$tag_url|$tag_email");
+ print "\n$result\n";
+}
+
+##############################################################################
+# Add a tag to the specified profile and group.
+##############################################################################
+
+sub cli_add_tag_to_user_profile() {
+ my ($user_id, $tag_name, $group_name, $profile_name) = @ARGV[2..5];
+
+ # Check the user.
+ my $user_exists = get_user_exists($dbh, $user_id);
+ exist_check($user_exists, 'user', $user_id);
+
+ # Check the group.
+ my $group_id;
+ if ($group_name eq 'All') {
+ $group_id = 0;
+ } else {
+ $group_id = get_group_id($dbh, $group_name);
+ exist_check($group_id, 'group', $group_name);
+ }
+
+ # Check the profile.
+ my $profile_id = get_profile_id($dbh, $profile_name);
+ exist_check($profile_id, 'profile', $profile_name);
+
+ # Make sure the tag exists.
+ my $tag_id = get_tag_id($dbh, $tag_name);
+ exist_check($tag_id, 'tag', $tag_name);
+
+ # Make sure the profile is associated to the user.
+ my $user_profile_id = get_user_profile_id($dbh, $user_id, $profile_id, $group_id);
+ exist_check($user_profile_id, 'given profile and group combination for user', $user_id);
+
+ # Call the API.
+ my $result = api_call(\%conf, 'set', 'tag_user_profile', $user_id, $tag_id, "$group_id|$profile_id");
+ print "\n$result\n";
+}
+
+##############################################################################
+# Add a tag to the specified profile and group.
+##############################################################################
+
+sub cli_add_tag_to_module() {
+ my ($agent_name, $module_name, $tag_name) = @ARGV[2..4];
+
+ # Check the tag.
+ my $tag_id = get_tag_id($dbh, $tag_name);
+ exist_check($tag_id, 'tag', $tag_name);
+
+ # Check the agent.
+ my $agent_id = get_agent_id($dbh, $agent_name);
+ exist_check($agent_id, 'agent', $agent_name);
+
+ # Check the module.
+ my $module_id = get_agent_module_id($dbh, $module_name, $agent_id);
+ exist_check($module_id, 'module name', $module_name);
+
+ # Call the API.
+ my $result = api_call(\%conf, 'set', 'add_tag_module', $module_id, $tag_id);
+ print "\n$result\n";
}