2012-01-11 Vanessa Gil <vanessa.gil@artica.es>

godmode/netflow/nf_edit_form.php
	  godmode/netflow/nf_report.php
	  godmode/netflow/nf_report_form.php
	  godmode/netflow/nf_report_item.php
	  include/functions_netflow.php
	  operation/netflow/nf_view.php: netflow acl.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5350 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_console/ChangeLog

@@ -1,3 +1,11 @@
+2012-01-11  Vanessa Gil  <vanessa.gil@artica.es>
+	  godmode/netflow/nf_edit_form.php
+	  godmode/netflow/nf_report.php
+	  godmode/netflow/nf_report_form.php
+	  godmode/netflow/nf_report_item.php
+	  include/functions_netflow.php
+	  operation/netflow/nf_view.php: netflow acl.
+
 2012-01-11  Ramon Novoa  <rnovoa@artica.es>
 
 	* include/functions_graph.php,

pandora_console/godmode/netflow/nf_edit_form.php

@@ -36,6 +36,14 @@ $name = db_get_value('id_name', 'tnetflow_filter', 'id_sg', $id);
 $update = (string)get_parameter('update', 0);
 $create = (string)get_parameter('create', 0);
 
+if ($id){
+	$permission = netflow_check_filter_group ($id);
+	if (!$permission) { //no tiene permisos para acceder a un filtro
+		require ("general/noaccess.php");
+		return;
+	}
+}
+	
 $buttons['edit'] = '<a href="index.php?sec=netf&sec2=godmode/netflow/nf_edit">'
 		. html_print_image ("images/edit.png", true, array ("title" => __('Filter list')))
 		. '</a>';

pandora_console/godmode/netflow/nf_report.php

@@ -89,15 +89,14 @@ $reports = db_get_all_rows_filter ('tnetflow_report', $filter);
 
 // Get group list that user has access
 $groups_user = users_get_groups ($config['id_user'], "IW", false, true);
-html_debug_print($groups_user);
 
 $groups_id = array();
 foreach($groups_user as $key => $groups){
 	$groups_id[] = $groups['id_grupo'];
 }
-html_debug_print($groups_id);
+
 $sql = "SELECT * FROM tnetflow_report WHERE id_group IN (".implode(',',$groups_id).")";
-html_debug_print($sql);
+
 $reports = db_get_all_rows_sql($sql);
 if ($reports === false)
 	$reports = array();

pandora_console/godmode/netflow/nf_report_form.php

@@ -34,6 +34,14 @@ $id = (int)get_parameter('id');
 $update = (string)get_parameter('update', 0);
 $create = (string)get_parameter('create', 0);
 
+if ($id) {
+	$permission = netflow_check_report_group ($id);
+	if (!$permission) { //no tiene permisos para acceder a un informe
+		require ("general/noaccess.php");
+		return;
+	}
+}
+
 if ($id) {
 	$report = netflow_reports_get_reports ($id);
 	$name = $report['id_name'];

pandora_console/godmode/netflow/nf_report_item.php

@@ -79,7 +79,6 @@ if ($update) {
 }
 
 if ($create){
-	
 	$id_filter = get_parameter('id_filter');
 	$name_filter = db_get_value('id_name', 'tnetflow_filter', 'id_sg', $id_filter);
 	$max_val = get_parameter('max','2');
@@ -112,9 +111,10 @@ $filters = netflow_get_filters ();
 if ($filters === false) {
 	$filters = array ();
 }	
-html_debug_print($filters);
+
+$is_admin = db_get_value('is_admin', 'tusuario', 'id_user', $config['id_user']);
 // Get group list that user has access
-$groups_user = users_get_groups ($config['id_user'], "IW", false, true);
+$groups_user = users_get_groups ($config['id_user'], "IW", $is_admin, true);
 $groups_id = array();
 foreach($groups_user as $key => $groups){
 	$groups_id[] = $groups['id_grupo'];

pandora_console/include/functions_netflow.php

@@ -14,6 +14,9 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
+
+include_once("include/functions_users.php");
+
 // Date format for nfdump
 $nfdump_date_format = 'Y/m/d.H:i:s';
 
@@ -66,6 +69,42 @@ function netflow_get_reports ($filter = false) {
 	return $return;
 }
 
+//permite validar si un filtro pertenece a un grupo permitido para el usuario
+
+function netflow_check_filter_group ($id_sg) {
+	global $config;
+	
+	$id_group = db_get_value('id_group', 'tnetflow_filter', 'id_sg', $id_sg);	
+	// Get group list that user has access
+	$groups_user = users_get_groups ($config['id_user'], "IW", false, true);
+	$groups_id = array();
+	$has_permission = false;
+	
+	foreach($groups_user as $key => $groups){
+		if ($groups['id_grupo'] == $id_group)
+			return true;
+	}
+	return false;
+}
+
+//permite validar si un informe pertenece a un grupo permitido para el usuario
+
+function netflow_check_report_group ($id_report) {
+	global $config;
+	
+	$id_group = db_get_value('id_group', 'tnetflow_report', 'id_report', $id_report);	
+	// Get group list that user has access
+	$groups_user = users_get_groups ($config['id_user'], "IW", false, true);
+	$groups_id = array();
+	$has_permission = false;
+	
+	foreach($groups_user as $key => $groups){
+		if ($groups['id_grupo'] == $id_group)
+			return true;
+	}
+	return false;
+}
+
 /**
  * Get a filter.
  *
@@ -76,13 +115,32 @@ function netflow_get_reports ($filter = false) {
  * @return array A netflow filter matching id and filter.
  */
 function netflow_filter_get_filter ($id_sg, $filter = false, $fields = false) {
-	if (empty ($id_sg))
+	global $config;
-		return false;
+	
+/*
+	$id_group = db_get_value('id_group', 'tnetflow_filter', 'id_sg', $id_sg);	
+	// Get group list that user has access
+	$groups_user = users_get_groups ($config['id_user'], "AR", false, true);
+	$groups_id = array();
+	$has_permission = false;
+	
+	foreach($groups_user as $key => $groups){
+		if ($groups['id_grupo'] == $id_group)
+			$has_permission = true;
+	}
+*/
+
+	//if ($has_permission) {
 		if (! is_array ($filter))
 			$filter = array ();
 			$filter['id_sg'] = (int) $id_sg;
 	
 			return db_get_row_filter ('tnetflow_filter', $filter, $fields);
+/*
+	} else {
+		return false;
+	}
+*/
 }
 
 /**

pandora_console/operation/netflow/nf_view.php

@@ -31,6 +31,15 @@ if (! check_acl ($config["id_user"], 0, "AR")) {
 }
 
 $id = io_safe_input (get_parameter('id'));
+
+if ($id) {
+	$permission = netflow_check_report_group ($id);
+	if (!$permission) { //no tiene permisos para acceder a un informe
+		require ("general/noaccess.php");
+		return;
+	}
+}
+
 $period = get_parameter('period', '86400');
 $update_date = get_parameter('update_date', 0);
 if($update_date){