diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 112781a564..3a00dca069 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2014-03-28 Juan Manuel Ramon + + * godmode/reporting/map_builder.php + godmode/netflow/nf_edit_form.php + include/ajax/visual_console_builder.ajax.php + operation/menu.php: Fix ACLs in these views. + 2014-03-28 Miguel de Dios * include/functions_gis.php: set a white background for the diff --git a/pandora_console/godmode/netflow/nf_edit_form.php b/pandora_console/godmode/netflow/nf_edit_form.php index 7bc1ec4b99..b60d72350b 100644 --- a/pandora_console/godmode/netflow/nf_edit_form.php +++ b/pandora_console/godmode/netflow/nf_edit_form.php @@ -24,7 +24,8 @@ include_once ($config['homedir'] . "/include/functions_groups.php"); check_login (); -if (! check_acl ($config["id_user"], 0, "IW")) { +// Fix: Netflow have to check RW ACL +if (! check_acl ($config["id_user"], 0, "RW")) { db_pandora_audit("ACL Violation", "Trying to access event viewer"); require ($config['homedir'] . "/general/noaccess.php"); @@ -179,7 +180,8 @@ $table->data[0][1] = html_print_input_text ('name', $name, false, 20, 80, true); $own_info = get_user_info ($config['id_user']); $table->data[1][0] = ''.__('Group').''; -$table->data[1][1] = html_print_select_groups($config['id_user'], "IW", +// Fix: Netflow filters have to check RW ACL +$table->data[1][1] = html_print_select_groups($config['id_user'], "RW", $own_info['is_admin'], 'assign_group', $assign_group, '', '', -1, true, false, false); diff --git a/pandora_console/godmode/reporting/map_builder.php b/pandora_console/godmode/reporting/map_builder.php index f0675ae5e8..126bc58751 100644 --- a/pandora_console/godmode/reporting/map_builder.php +++ b/pandora_console/godmode/reporting/map_builder.php @@ -144,8 +144,9 @@ $table->head[0] = __('Map name'); $table->head[1] = __('Group'); $table->head[2] = __('Items'); -//Only for IW flag -if (check_acl ($config['id_user'], 0, "IW")) { +// Fix: IW was the old ACL for report editing, now is RW +//Only for RW flag +if (check_acl ($config['id_user'], 0, "RW")) { $table->head[3] = __('Copy'); $table->head[4] = __('Delete'); } @@ -185,7 +186,8 @@ else { $data[1] = ui_print_group_icon ($map['id_group'], true); $data[2] = db_get_sql ("SELECT COUNT(*) FROM tlayout_data WHERE id_layout = ".$map['id']); - if (check_acl ($config['id_user'], 0, "IW")) { + // Fix: IW was the old ACL for report editing, now is RW + if (check_acl ($config['id_user'], 0, "RW")) { if (!defined('METACONSOLE')) { $data[3] = ''.html_print_image ("images/copy.png", true).''; @@ -210,8 +212,9 @@ else { echo '
'; } -//Only for IW flag -if (check_acl ($config['id_user'], 0, "IW")) { +// Fix: IW was the old ACL to check for report editing, now is RW +//Only for RW flag +if (check_acl ($config['id_user'], 0, "RW")) { if (!defined('METACONSOLE')) echo '
'; else { diff --git a/pandora_console/include/ajax/visual_console_builder.ajax.php b/pandora_console/include/ajax/visual_console_builder.ajax.php index e90899b552..be3d833929 100644 --- a/pandora_console/include/ajax/visual_console_builder.ajax.php +++ b/pandora_console/include/ajax/visual_console_builder.ajax.php @@ -17,7 +17,8 @@ global $config; check_login (); -if (! check_acl ($config['id_user'], 0, "IW")) { +// Fix: IW was the old ACL to check for report editing, now is RW +if (! check_acl ($config['id_user'], 0, "RW")) { db_pandora_audit("ACL Violation", "Trying to access report builder"); require ("general/noaccess.php"); diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index 0fb5d935bc..23f8d29da0 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -321,7 +321,8 @@ $menu_operation["workspace"]["sub"] = $sub; //End Workspace -if (check_acl ($config['id_user'], 0, "IR")) { +// Fix: Netflow interfaces have to check RR ACL +if (check_acl ($config['id_user'], 0, "RR")) { if ($config['activate_netflow']) { $menu_operation["netf"]["text"] = __('Netflow Live View'); $menu_operation["netf"]["sec2"] = "operation/netflow/nf_live_view";