tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 16:55:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

2014-06-09 Alejandro Gallardo <alejandro.gallardo@artica.es>

Browse Source 
* include/functions_api.php: Added the parameter
	"address resolution" to the functions
	"api_get_netflow_get_data" and "api_get_netflow_get_stats".

	* include/functions_netflow.php: Added the parameter
	"address resolution" to the functions "netflow_get_data",
	"netflow_get_stats", "netflow_get_summary",
	"netflow_get_record" and "netflow_draw_item".
	
	* operation/netflow/nf_live_view.php: Added an option to
	apply IP address resolution to the netflow searches.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10147 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
alexhigh 2014-06-09 18:23:36 +00:00
parent ed5081c0d9
commit f734ea00f6
5 changed files with 97 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/ChangeLog
View File

@ -1,3 +1,17 @@
2014-06-09 Alejandro Gallardo <alejandro.gallardo@artica.es>
* include/functions_api.php: Added the parameter
"address resolution" to the functions
"api_get_netflow_get_data" and "api_get_netflow_get_stats".
* include/functions_netflow.php: Added the parameter
"address resolution" to the functions "netflow_get_data",
"netflow_get_stats", "netflow_get_summary",
"netflow_get_record" and "netflow_draw_item".
* operation/netflow/nf_live_view.php: Added an option to
apply IP address resolution to the netflow searches.
2014-06-09 Miguel de Dios <miguel.dedios@artica.es> 2014-06-09 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/update_manager.js, * include/javascript/update_manager.js,

2
pandora_console/godmode/setup/setup_netflow.php
View File

@ -67,7 +67,7 @@ $table->data[7][1] = html_print_input_text ('netflow_max_lifetime', $config['net
$table->data[8][0] = '<b>' . __('Name resolution for IP address') . '</b>' . $table->data[8][0] = '<b>' . __('Name resolution for IP address') . '</b>' .
ui_print_help_tip (__("Resolve the IP addresses to get their hostnames."), true); ui_print_help_tip (__("Resolve the IP addresses to get their hostnames."), true);
$onclick = "if (!confirm('".__('Warning').". ".__('IP address resolution can take a lot of time').".')) return false;"; $onclick = "if (!confirm('".__('Warning').". ".__('IP address resolution can take a lot of time')."')) return false;";
$table->data[8][1] = __('Yes').'&nbsp;&nbsp;'.html_print_radio_button_extended ('netflow_get_ip_hostname', 1, '', $config["netflow_get_ip_hostname"], false, $onclick, '', true).'&nbsp;&nbsp;&nbsp;'; $table->data[8][1] = __('Yes').'&nbsp;&nbsp;'.html_print_radio_button_extended ('netflow_get_ip_hostname', 1, '', $config["netflow_get_ip_hostname"], false, $onclick, '', true).'&nbsp;&nbsp;&nbsp;';
$table->data[8][1] .= __('No').'&nbsp;&nbsp;'.html_print_radio_button ('netflow_get_ip_hostname', 0, '', $config["netflow_get_ip_hostname"], true); $table->data[8][1] .= __('No').'&nbsp;&nbsp;'.html_print_radio_button ('netflow_get_ip_hostname', 0, '', $config["netflow_get_ip_hostname"], true);

6
pandora_console/include/functions_api.php
View File

@ -6445,9 +6445,10 @@ function api_get_netflow_get_data ($discard_1, $discard_2, $params) {
$aggregate = $params['data'][4]; $aggregate = $params['data'][4];
$max = $params['data'][5]; $max = $params['data'][5];
$unit = $params['data'][6]; $unit = $params['data'][6];
$address_resolution = $params['data'][7];
// Get netflow data // Get netflow data
$data = netflow_get_data ($start_date, $end_date, $interval_length, $filter, $aggregate, $max, $unit); $data = netflow_get_data ($start_date, $end_date, $interval_length, $filter, $aggregate, $max, $unit, '', $address_resolution);
returnData('json', $data); returnData('json', $data);
return; return;
@ -6463,9 +6464,10 @@ function api_get_netflow_get_stats ($discard_1, $discard_2, $params) {
$aggregate = $params['data'][3]; $aggregate = $params['data'][3];
$max = $params['data'][4]; $max = $params['data'][4];
$unit = $params['data'][5]; $unit = $params['data'][5];
$address_resolution = $params['data'][6];
// Get netflow data // Get netflow data
$data = netflow_get_stats ($start_date, $end_date, $filter, $aggregate, $max, $unit); $data = netflow_get_stats ($start_date, $end_date, $filter, $aggregate, $max, $unit, '', $address_resolution);
returnData('json', $data); returnData('json', $data);
return; return;

34
pandora_console/include/functions_netflow.php
View File

@ -421,13 +421,13 @@ function netflow_is_net ($address) {
* @return An array with netflow stats. * @return An array with netflow stats.
* *
*/ */
function netflow_get_data ($start_date, $end_date, $interval_length, $filter, $aggregate, $max, $unit, $connection_name = '') { function netflow_get_data ($start_date, $end_date, $interval_length, $filter, $aggregate, $max, $unit, $connection_name = '', $address_resolution = false) {
global $nfdump_date_format; global $nfdump_date_format;
global $config; global $config;
// Requesting remote data // Requesting remote data
if (defined ('METACONSOLE') && $connection_name != '') { if (defined ('METACONSOLE') && $connection_name != '') {
$data = metaconsole_call_remote_api ($connection_name, 'netflow_get_data', "$start_date|$end_date|$interval_length|" . base64_encode(json_encode($filter)) . "|$aggregate|$max|$unit"); $data = metaconsole_call_remote_api ($connection_name, 'netflow_get_data', "$start_date|$end_date|$interval_length|" . base64_encode(json_encode($filter)) . "|$aggregate|$max|$unit" . (int)$address_resolution);
return json_decode ($data, true); return json_decode ($data, true);
} }
@ -510,7 +510,7 @@ function netflow_get_data ($start_date, $end_date, $interval_length, $filter, $a
// Address resolution start // Address resolution start
$get_hostnames = false; $get_hostnames = false;
if ($config['netflow_get_ip_hostname'] && ($aggregate == "srcip" || $aggregate == "dstip")) { if ($address_resolution && ($aggregate == "srcip" || $aggregate == "dstip")) {
$get_hostnames = true; $get_hostnames = true;
global $hostnames; global $hostnames;
@ -617,12 +617,12 @@ function netflow_get_data ($start_date, $end_date, $interval_length, $filter, $a
* *
* @return An array with netflow stats. * @return An array with netflow stats.
*/ */
function netflow_get_stats ($start_date, $end_date, $filter, $aggregate, $max, $unit, $connection_name = '') { function netflow_get_stats ($start_date, $end_date, $filter, $aggregate, $max, $unit, $connection_name = '', $address_resolution = false) {
global $config, $nfdump_date_format; global $config, $nfdump_date_format;
// Requesting remote data // Requesting remote data
if (defined ('METACONSOLE') && $connection_name != '') { if (defined ('METACONSOLE') && $connection_name != '') {
$data = metaconsole_call_remote_api ($connection_name, 'netflow_get_stats', "$start_date|$end_date|" . base64_encode(json_encode($filter)) . "|$aggregate|$max|$unit"); $data = metaconsole_call_remote_api ($connection_name, 'netflow_get_stats', "$start_date|$end_date|" . base64_encode(json_encode($filter)) . "|$aggregate|$max|$unit|" . (int)$address_resolution);
return json_decode ($data, true); return json_decode ($data, true);
} }
@ -663,7 +663,7 @@ function netflow_get_stats ($start_date, $end_date, $filter, $aggregate, $max, $
else { else {
// Address resolution start // Address resolution start
if ($config['netflow_get_ip_hostname'] && ($aggregate == "srcip" || $aggregate == "dstip")) { if ($address_resolution && ($aggregate == "srcip" || $aggregate == "dstip")) {
global $hostnames; global $hostnames;
if (!isset($hostnames[$val[4]])) { if (!isset($hostnames[$val[4]])) {
@ -771,7 +771,7 @@ function netflow_get_summary ($start_date, $end_date, $filter, $connection_name
* *
* @return An array with netflow stats. * @return An array with netflow stats.
*/ */
function netflow_get_record ($start_date, $end_date, $filter, $max, $unit) { function netflow_get_record ($start_date, $end_date, $filter, $max, $unit, $address_resolution = false) {
global $nfdump_date_format; global $nfdump_date_format;
global $config; global $config;
@ -836,7 +836,7 @@ function netflow_get_record ($start_date, $end_date, $filter, $max, $unit) {
} }
// Address resolution start // Address resolution start
if ($config['netflow_get_ip_hostname']) { if ($address_resolution) {
global $hostnames; global $hostnames;
for ($i = 0; $i < count($values); $i++) { for ($i = 0; $i < count($values); $i++) {
@ -1091,7 +1091,7 @@ function netflow_get_valid_subintervals () {
* *
* @return The netflow report in the appropriate format. * @return The netflow report in the appropriate format.
*/ */
function netflow_draw_item ($start_date, $end_date, $interval_length, $type, $filter, $max_aggregates, $connection_name = '', $output = 'HTML', $only_image = false) { function netflow_draw_item ($start_date, $end_date, $interval_length, $type, $filter, $max_aggregates, $connection_name = '', $output = 'HTML', $address_resolution = false) {
$aggregate = $filter['aggregate']; $aggregate = $filter['aggregate'];
$unit = $filter['output']; $unit = $filter['output'];
$interval = $end_date - $start_date; $interval = $end_date - $start_date;
@ -1100,7 +1100,7 @@ function netflow_draw_item ($start_date, $end_date, $interval_length, $type, $fi
switch ($type) { switch ($type) {
case '0': case '0':
case 'netflow_area': case 'netflow_area':
$data = netflow_get_data ($start_date, $end_date, $interval_length, $filter, $aggregate, $max_aggregates, $unit, $connection_name); $data = netflow_get_data ($start_date, $end_date, $interval_length, $filter, $aggregate, $max_aggregates, $unit, $connection_name, $address_resolution);
if (empty ($data)) { if (empty ($data)) {
break; break;
} }
@ -1158,7 +1158,7 @@ function netflow_draw_item ($start_date, $end_date, $interval_length, $type, $fi
break; break;
case '2': case '2':
case 'netflow_data': case 'netflow_data':
$data = netflow_get_data ($start_date, $end_date, $interval_length, $filter, $aggregate, $max_aggregates, $unit, $connection_name); $data = netflow_get_data ($start_date, $end_date, $interval_length, $filter, $aggregate, $max_aggregates, $unit, $connection_name, $address_resolution);
if (empty ($data)) { if (empty ($data)) {
break; break;
@ -1187,7 +1187,7 @@ function netflow_draw_item ($start_date, $end_date, $interval_length, $type, $fi
case '3': case '3':
case 'netflow_statistics': case 'netflow_statistics':
$data = netflow_get_stats ($start_date, $end_date, $filter, $data = netflow_get_stats ($start_date, $end_date, $filter,
$aggregate, $max_aggregates, $unit, $connection_name); $aggregate, $max_aggregates, $unit, $connection_name, $address_resolution);
if (empty ($data)) { if (empty ($data)) {
break; break;
} }
@ -1203,7 +1203,7 @@ function netflow_draw_item ($start_date, $end_date, $interval_length, $type, $fi
case 'netflow_summary': case 'netflow_summary':
$data_summary = netflow_get_summary ($start_date, $end_date, $data_summary = netflow_get_summary ($start_date, $end_date,
$filter, $connection_name); $filter, $connection_name);
if (empty ($data)) { if (empty ($data_summary)) {
break; break;
} }
if ($output == 'HTML' || $output == 'PDF') { if ($output == 'HTML' || $output == 'PDF') {
@ -1217,7 +1217,7 @@ function netflow_draw_item ($start_date, $end_date, $interval_length, $type, $fi
case 'netflow_pie': case 'netflow_pie':
$data_pie = netflow_get_stats ($start_date, $end_date, $data_pie = netflow_get_stats ($start_date, $end_date,
$filter, $aggregate, $max_aggregates, $unit, $filter, $aggregate, $max_aggregates, $unit,
$connection_name); $connection_name, $address_resolution);
if (empty ($data_pie)) { if (empty ($data_pie)) {
break; break;
} }
@ -1249,7 +1249,7 @@ function netflow_draw_item ($start_date, $end_date, $interval_length, $type, $fi
$data_pie = netflow_get_stats ($start_date, $end_date, $data_pie = netflow_get_stats ($start_date, $end_date,
$filter, $aggregate, $max_aggregates, $unit, $filter, $aggregate, $max_aggregates, $unit,
$connection_name); $connection_name, $address_resolution);
if (empty ($data_pie)) { if (empty ($data_pie)) {
break; break;
} }
@ -1279,7 +1279,7 @@ function netflow_draw_item ($start_date, $end_date, $interval_length, $type, $fi
} }
break; break;
case 'netflow_mesh': case 'netflow_mesh':
$netflow_data = netflow_get_record($start_date, $end_date, $filter, $max_aggregates, $unit); $netflow_data = netflow_get_record($start_date, $end_date, $filter, $max_aggregates, $unit, $address_resolution);
switch ($aggregate) { switch ($aggregate) {
case "srcport": case "srcport":
@ -1328,7 +1328,7 @@ function netflow_draw_item ($start_date, $end_date, $interval_length, $type, $fi
return $html; return $html;
break; break;
case 'netflow_host_treemap': case 'netflow_host_treemap':
$netflow_data = netflow_get_record($start_date, $end_date, $filter, $max_aggregates, $unit); $netflow_data = netflow_get_record($start_date, $end_date, $filter, $max_aggregates, $unit, $address_resolution);
switch ($aggregate) { switch ($aggregate) {
case "srcip": case "srcip":

121
pandora_console/operation/netflow/nf_live_view.php
View File

@ -79,7 +79,6 @@ $filter['ip_src'] = get_parameter('ip_src','');
$filter['dst_port'] = get_parameter('dst_port',''); $filter['dst_port'] = get_parameter('dst_port','');
$filter['src_port'] = get_parameter('src_port',''); $filter['src_port'] = get_parameter('src_port','');
$filter['advanced_filter'] = get_parameter('advanced_filter',''); $filter['advanced_filter'] = get_parameter('advanced_filter','');
$filter['advanced_filter'] = get_parameter('advanced_filter','');
// Read chart configuration // Read chart configuration
$chart_type = get_parameter('chart_type', 'netflow_area'); $chart_type = get_parameter('chart_type', 'netflow_area');
@ -90,6 +89,7 @@ $date = get_parameter_post ('date', date (DATE_FORMAT, get_system_time ()));
$time = get_parameter_post ('time', date (TIME_FORMAT, get_system_time ())); $time = get_parameter_post ('time', date (TIME_FORMAT, get_system_time ()));
$connection_name = get_parameter('connection_name', ''); $connection_name = get_parameter('connection_name', '');
$interval_length = (int) get_parameter('interval_length', 300); $interval_length = (int) get_parameter('interval_length', 300);
$address_resolution = (int) get_parameter('address_resolution', $config['netflow_get_ip_hostname']);
// Read buttons // Read buttons
$draw = get_parameter('draw_button', ''); $draw = get_parameter('draw_button', '');
@ -173,6 +173,38 @@ enterprise_hook('open_meta_frame');
echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&sec2=operation/netflow/nf_live_view&pure='.$pure.'">'; echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&sec2=operation/netflow/nf_live_view&pure='.$pure.'">';
echo "<table class='databox' width='99%'>"; echo "<table class='databox' width='99%'>";
if (defined ('METACONSOLE')) {
$list_servers = array();
$servers = db_get_all_rows_sql ("SELECT *
FROM tmetaconsole_setup");
if ($servers === false)
$servers = array();
foreach ($servers as $server) {
// If connection was good then retrieve all data server
if (metaconsole_load_external_db ($server)) {
$connection = true;
}
else {
$connection = false;
}
$row = db_get_row('tconfig', 'token', 'activate_netflow');
if ($row['value']) {
$list_servers[$server['server_name']] = $server['server_name'];
}
metaconsole_restore_db();
}
echo "<tr>";
echo "<td>" . '<b>'.__('Connection').'</b>' . "</td>";
echo "<td>" . html_print_select($list_servers, 'connection_name', $connection_name, '', '', 0, true, false, false) . "</td>";
echo "</tr>";
}
echo "<tr>"; echo "<tr>";
echo "<td>" . echo "<td>" .
@ -209,37 +241,11 @@ echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&s
'50' => '50'); '50' => '50');
echo "<td>" . html_print_select ($max_values, 'max_aggregates', $max_aggregates, '', '', 0, true) . "</td>"; echo "<td>" . html_print_select ($max_values, 'max_aggregates', $max_aggregates, '', '', 0, true) . "</td>";
if (defined ('METACONSOLE')) { $onclick = "if (!confirm('".__('Warning').". ".__('IP address resolution can take a lot of time')."')) return false;";
$list_servers = array(); $radio_buttons = __('Yes').'&nbsp;&nbsp;'.html_print_radio_button_extended ('address_resolution', 1, '', $address_resolution, false, $onclick, '', true).'&nbsp;&nbsp;&nbsp;';
$radio_buttons .= __('No').'&nbsp;&nbsp;'.html_print_radio_button ('address_resolution', 0, '', $address_resolution, true);
$servers = db_get_all_rows_sql ("SELECT * echo "<td>" . '<b>'.__('IP address resolution').'</b>' . ui_print_help_tip (__("Resolve the IP addresses to get their hostnames."), true) . "</td>";
FROM tmetaconsole_setup"); echo "<td>$radio_buttons</td>";
if ($servers === false)
$servers = array();
foreach ($servers as $server) {
// If connection was good then retrieve all data server
if (metaconsole_load_external_db ($server)) {
$connection = true;
}
else {
$connection = false;
}
$row = db_get_row('tconfig', 'token', 'activate_netflow');
if ($row['value']) {
$list_servers[$server['server_name']] = $server['server_name'];
}
metaconsole_restore_db();
}
echo "<td>" . '<b>'.__('Connection').'</b>' . "</td>";
echo "<td>" . html_print_select($list_servers, 'connection_name', $connection_name, '', '', 0, true, false, false) . "</td>";
}
echo "</tr>"; echo "</tr>";
@ -380,14 +386,11 @@ echo '<form method="post" action="' . $config['homeurl'] . 'index.php?sec=netf&s
echo'</form>'; echo'</form>';
if ($draw != '') { if ($draw != '') {
// Get the command to call nfdump
$command = netflow_get_command ($filter);
// Draw // Draw
echo "<br/>"; echo "<br/>";
echo netflow_draw_item ($start_date, $end_date, echo netflow_draw_item ($start_date, $end_date,
$interval_length, $chart_type, $filter, $interval_length, $chart_type, $filter,
$max_aggregates, $connection_name); $max_aggregates, $connection_name, 'HTML', $address_resolution);
} }
enterprise_hook('close_meta_frame'); enterprise_hook('close_meta_frame');
@ -399,16 +402,16 @@ ui_include_time_picker();
// Hide the normal filter and display the advanced filter // Hide the normal filter and display the advanced filter
function displayAdvancedFilter () { function displayAdvancedFilter () {
// Erase the normal filter // Erase the normal filter
$("#text-ip_dst").value = ''; $("#text-ip_dst").val('');
$("#text-ip_src").value = ''; $("#text-ip_src").val('');
$("#text-dst_port").value = ''; $("#text-dst_port").val('');
$("#text-src_port").value = ''; $("#text-src_port").val('');
// Hide the normal filter // Hide the normal filter
$(".filter_normal").css('display', 'none'); $(".filter_normal").hide();
// Show the advanced filter // Show the advanced filter
$(".filter_advance").css('display', ''); $(".filter_advance").show();
}; };
// Hide the advanced filter and display the normal filter // Hide the advanced filter and display the normal filter
@ -417,16 +420,16 @@ ui_include_time_picker();
$("#textarea_advanced_filter").val(''); $("#textarea_advanced_filter").val('');
// Hide the advanced filter // Hide the advanced filter
$(".filter_advance").css('display', 'none'); $(".filter_advance").hide();
// Show the normal filter // Show the normal filter
$(".filter_normal").css('display', ''); $(".filter_normal").show();
}; };
// Ask the user to define a name for the filter in order to save it // Ask the user to define a name for the filter in order to save it
function defineFilterName () { function defineFilterName () {
if ($("#text-name").val() == '') { if ($("#text-name").val() == '') {
$(".filter_save").css('display', ''); $(".filter_save").show();
return false; return false;
} }
@ -447,14 +450,11 @@ ui_include_time_picker();
var filter_type; var filter_type;
// Hide information and name/group row // Hide information and name/group row
$(".filter_save").css('display', 'none'); $(".filter_save").hide();
$(".filter_save").css('display', 'none');
// Clean fields // Clean fields
if ($("#filter_id").val() == 0) { if ($("#filter_id").val() == 0) {
//displayNormalFilter (); displayNormalFilter();
$(".filter_normal").css('display', '');
$(".filter_advance").css('display', 'none');
// Check right filter type // Check right filter type
$("#radiobtn0001").attr("checked", "checked"); $("#radiobtn0001").attr("checked", "checked");
@ -468,7 +468,7 @@ ui_include_time_picker();
$("#output").val(''); $("#output").val('');
// Hide update filter button // Hide update filter button
$("#submit-update_button").css("visibility", "hidden"); $("#submit-update_button").hide();
} }
else { else {
@ -491,24 +491,21 @@ ui_include_time_picker();
filter_type = data; filter_type = data;
// Display the appropriate filter // Display the appropriate filter
if (filter_type == 0) { if (filter_type == 0) {
$(".filter_normal").css('display', ''); $(".filter_normal").show();
$(".filter_advance").css('display', 'none'); $(".filter_advance").hide();
// Check right filter type // Check right filter type
$("#radiobtn0001").attr("checked", "checked"); $("#radiobtn0001").attr("checked", "checked");
} }
else { else {
$(".filter_normal").css('display', 'none'); $(".filter_normal").hide();
$(".filter_advance").css('display', ''); $(".filter_advance").show();
// Check right filter type // Check right filter type
$("#radiobtn0002").attr("checked", "checked"); $("#radiobtn0002").attr("checked", "checked");
} }
}); });
// Shows update filter button
$("#submit-update_button").css("visibility", "");
// Get filter values from DB // Get filter values from DB
<?php <?php
if (! defined ('METACONSOLE')) { if (! defined ('METACONSOLE')) {
@ -541,6 +538,10 @@ ui_include_time_picker();
}); });
}, },
"json"); "json");
// Shows update filter button
$("#submit-update_button").show();
} }
}); });
@ -548,10 +549,10 @@ ui_include_time_picker();
$(document).ready( function() { $(document).ready( function() {
// Hide update filter button // Hide update filter button
if ($("#filter_id").val() == 0) { if ($("#filter_id").val() == 0) {
$("#submit-update_button").css("visibility", "hidden"); $("#submit-update_button").hide();
} }
else { else {
$("#submit-update_button").css("visibility", ""); $("#submit-update_button").show();
} }
// Change color of name and group if save button has been pushed // Change color of name and group if save button has been pushed