From 330a0f8fadf1a0882df8ddc678d072bac6ae3472 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 6 Mar 2010 16:09:11 -0800 Subject: snort-dev, fix SNORT GUI for all modern browsers, start adding auto detect code based on pfsense version. --- config/snort-dev/snort.inc | 20 +++++++++++++++++++- config/snort-dev/snort_alerts.php | 9 +++++---- config/snort-dev/snort_barnyard.php | 1 + config/snort-dev/snort_blocked.php | 9 +++++---- config/snort-dev/snort_define_servers.php | 1 + config/snort-dev/snort_download_rules.php | 9 +++++---- config/snort-dev/snort_interfaces.php | 9 +++++---- config/snort-dev/snort_interfaces_edit.php | 1 + config/snort-dev/snort_interfaces_global.php | 9 +++++---- config/snort-dev/snort_preprocessors.php | 1 + config/snort-dev/snort_rules.php | 9 +++++---- config/snort-dev/snort_rulesets.php | 9 +++++---- 12 files changed, 58 insertions(+), 29 deletions(-) (limited to 'config/snort-dev') diff --git a/config/snort-dev/snort.inc b/config/snort-dev/snort.inc index 76a1e855..5c99f62a 100644 --- a/config/snort-dev/snort.inc +++ b/config/snort-dev/snort.inc @@ -34,6 +34,16 @@ require_once("pfsense-utils.inc"); // Needed on 2.0 because of filter_get_vpns_list() require_once("filter.inc"); +/* find out if were in 1.2.3-RELEASE */ + +$pfsense_ver_chk = exec('/bin/cat /etc/version'); +if ($pfsense_ver_chk == '1.2.3-RELEASE') +{ + $pfsense_stable = 'yes'; +}else{ + $pfsense_stable = 'no'; +} + /* Get id and realinterfaces */ $id = $_GET['id']; @@ -1173,7 +1183,15 @@ else /* grab a list of vpns and whitelist if user desires added by nestorfish 954 */ if($whitelistvpns) { - $vpns_list = filter_get_vpns_list(); + if ($pfsense_stable == 'yes') // chk what pfsense version were on + { + $vpns_list = get_vpns_list(); + } + if ($pfsense_stable == 'no') // chk what pfsense version were on + { + $vpns_list = filter_get_vpns_list(); + } + $whitelist_vpns = split(" ", $vpns_list); foreach($whitelist_vpns as $wl) if(trim($wl)) diff --git a/config/snort-dev/snort_alerts.php b/config/snort-dev/snort_alerts.php index dae9983c..4194f769 100644 --- a/config/snort-dev/snort_alerts.php +++ b/config/snort-dev/snort_alerts.php @@ -331,10 +331,11 @@ if ($pconfig['arefresh'] == 'on' || $pconfig['arefresh'] == '') $tab_array[] = array("Help & Info", false, "/snort/snort_help_info.php"); display_top_tabs($tab_array); ?> - - - - + + +
+ +
diff --git a/config/snort-dev/snort_barnyard.php b/config/snort-dev/snort_barnyard.php index 884eec5b..0e0bbf33 100644 --- a/config/snort-dev/snort_barnyard.php +++ b/config/snort-dev/snort_barnyard.php @@ -288,6 +288,7 @@ if($id != "") ?> +
diff --git a/config/snort-dev/snort_blocked.php b/config/snort-dev/snort_blocked.php index dcd2faaa..62323757 100644 --- a/config/snort-dev/snort_blocked.php +++ b/config/snort-dev/snort_blocked.php @@ -257,10 +257,11 @@ if ($pconfig['brefresh'] == 'on' || $pconfig['brefresh'] == '') $tab_array[] = array("Help & Info", false, "/snort/snort_help_info.php"); display_top_tabs($tab_array); ?> - - - - + +
+ +
+
diff --git a/config/snort-dev/snort_define_servers.php b/config/snort-dev/snort_define_servers.php index 0602edf1..5b32f554 100644 --- a/config/snort-dev/snort_define_servers.php +++ b/config/snort-dev/snort_define_servers.php @@ -258,6 +258,7 @@ if($id != "") ?> +
diff --git a/config/snort-dev/snort_download_rules.php b/config/snort-dev/snort_download_rules.php index a8e3ca49..136e756b 100644 --- a/config/snort-dev/snort_download_rules.php +++ b/config/snort-dev/snort_download_rules.php @@ -245,10 +245,11 @@ setTimeout($.unblockUI, 2000); // --> - - - - + +
+ +
+
diff --git a/config/snort-dev/snort_interfaces.php b/config/snort-dev/snort_interfaces.php index c508222b..e74568a4 100644 --- a/config/snort-dev/snort_interfaces.php +++ b/config/snort-dev/snort_interfaces.php @@ -246,8 +246,9 @@ padding: 15px 10px 50% 50px; display_top_tabs($tab_array); ?> - - + diff --git a/config/snort-dev/snort_interfaces_edit.php b/config/snort-dev/snort_interfaces_edit.php index ab83f83f..1a02715c 100644 --- a/config/snort-dev/snort_interfaces_edit.php +++ b/config/snort-dev/snort_interfaces_edit.php @@ -409,6 +409,7 @@ if($id != "") ?> +
+
+
@@ -263,8 +264,8 @@ padding: 15px 10px 50% 50px;
- - + +
diff --git a/config/snort-dev/snort_interfaces_global.php b/config/snort-dev/snort_interfaces_global.php index 50ae9aec..36a56015 100644 --- a/config/snort-dev/snort_interfaces_global.php +++ b/config/snort-dev/snort_interfaces_global.php @@ -157,10 +157,11 @@ include("head.inc"); $tab_array[] = array("Help & Info", false, "/snort/snort_help_info.php"); display_top_tabs($tab_array); ?> - -
- - +
+ +
+ +
Install Snort.org rules diff --git a/config/snort-dev/snort_preprocessors.php b/config/snort-dev/snort_preprocessors.php index 945de8e5..f4462499 100644 --- a/config/snort-dev/snort_preprocessors.php +++ b/config/snort-dev/snort_preprocessors.php @@ -260,6 +260,7 @@ if($id != "") ?> +
diff --git a/config/snort-dev/snort_rules.php b/config/snort-dev/snort_rules.php index ea0f8a0f..c08aea50 100644 --- a/config/snort-dev/snort_rules.php +++ b/config/snort-dev/snort_rules.php @@ -461,10 +461,11 @@ function popup(url) $tab_array[] = array("Barnyard2", false, "/snort/snort_barnyard.php?id={$id}"); display_top_tabs($tab_array); ?> - - - - + +
+ +
+
diff --git a/config/snort-dev/snort_rulesets.php b/config/snort-dev/snort_rulesets.php index 5133183e..2edfdde4 100644 --- a/config/snort-dev/snort_rulesets.php +++ b/config/snort-dev/snort_rulesets.php @@ -170,10 +170,11 @@ echo " - - - - + +
+ +
+
-- cgit v1.2.3