From c2c025d9879f4dfd48bc744cf731f1dd671121e0 Mon Sep 17 00:00:00 2001 From: robiscool Date: Wed, 18 Nov 2009 02:02:40 -0800 Subject: snort-dev, point tabs in the right direction --- config/snort-dev/NOTES.txt | 11 ++--- config/snort-dev/snort_barnyard.php | 19 +++++---- config/snort-dev/snort_define_servers.php | 22 +++++----- config/snort-dev/snort_interfaces.php | 1 + config/snort-dev/snort_interfaces_edit.php | 20 +++++---- config/snort-dev/snort_interfaces_global.php | 2 +- config/snort-dev/snort_rules.php | 62 +++++++++++++++------------- config/snort-dev/snort_rules_edit.php | 22 +++++----- config/snort-dev/snort_rulesets.php | 52 ++++++++++------------- 9 files changed, 105 insertions(+), 106 deletions(-) (limited to 'config/snort-dev') diff --git a/config/snort-dev/NOTES.txt b/config/snort-dev/NOTES.txt index 7b405dab..8988d817 100644 --- a/config/snort-dev/NOTES.txt +++ b/config/snort-dev/NOTES.txt @@ -2,22 +2,23 @@ November 17 2009 -If you work on this package just comment on every thing you change. +If you work on this package just comment on every-thing you change or add. Gui is almost done. -The Gui works just the interface tabs have to be pointed to the right files. - snort.inc Must be recoded so that it reads the [snortglobal][rule] options in conf.xml and makes a snort.sh, snort.conf, and barnyard.conf. This is easy, just cut and paste from the old snort.inc. snort_rules_edit.php -Is what Im working on. Just make sure all snort sig options are supported. +What I am working on. Just make sure all snort sig options are supported. snort_rules.php Change the way the rules get disabled, by removing the x icon image and replacing it with check boxes. -This should improve the users use of the package. +This should improve the users use of the package. Moreover, check boxes could be added to blocked.php tab to improve performance. +Users always complain that the way were deleting options is slow. + +create whitelist.php and help_info.php Done. \ No newline at end of file diff --git a/config/snort-dev/snort_barnyard.php b/config/snort-dev/snort_barnyard.php index d703b5dc..cfe4e77d 100644 --- a/config/snort-dev/snort_barnyard.php +++ b/config/snort-dev/snort_barnyard.php @@ -80,6 +80,8 @@ if (isset($id) && $a_nat[$id]) { if (isset($_GET['dup'])) unset($id); + +$if_real = convert_friendly_interface_to_real_interface_name($pconfig['interface']); if ($_POST) { @@ -129,7 +131,7 @@ if ($_POST) { } } -$pgtitle = "Services: Snort Barnyard2 Edit"; +$pgtitle = "Snort: Interface: $id$if_real Barnyard2 Edit"; include("head.inc"); ?> @@ -184,14 +186,13 @@ if($id != "") { $tab_array = array(); - $tab_array[] = array("Snort Interfaces", false, "/snort_interfaces.php"); - $tab_array[] = array("If Settings", false, "/snort_interfaces_edit.php"); - $tab_array[] = array("Categories", false, "/snort/snort_{$snortIf}_{$id}/snort_rulesets_{$snortIf}_{$id}.php"); - $tab_array[] = array("Rules", false, "/snort/snort_{$snortIf}_{$id}/snort_rules_{$snortIf}_{$id}.php"); - $tab_array[] = array("Servers", false, "/pkg_edit.php?xml=snort/snort_{$snortIf}_{$id}/snort_define_servers_{$snortIf}_{$id}.xml&id=0"); - $tab_array[] = array("Barnyard2", false, "/pkg_edit.php?xml=snort/snort_{$snortIf}_{$id}/snort_barnyard2_{$snortIf}_{$id}.xml&id=0"); - $tab_array[] = array("Barnyard2", false, "/pkg_edit.php?xml=snort/snort_{$snortIf}_{$id}/snort_barnyard2_{$snortIf}_{$id}.xml&id=0"); - $tab_array[] = array("Barnyard2", true, "/pkg_edit.php?xml=snort/snort_{$snortIf}_{$id}/snort_barnyard2_{$snortIf}_{$id}.xml&id=0"); + $tab_array[] = array("Snort Interfaces", false, "/snort/snort_interfaces.php"); + $tab_array[] = array("If Settings", false, "/snort/snort_interfaces_edit.php?id={$id}"); + $tab_array[] = array("Categories", false, "/snort/snort_rulesets.php?id={$id}"); + $tab_array[] = array("Rules", false, "/snort/snort_rules.php?id={$id}"); + $tab_array[] = array("Servers", false, "/snort/snort_define_servers.php?id={$id}"); + $tab_array[] = array("Preprocessors", false, "/snort/snort_preprocessors.php?id={$id}"); + $tab_array[] = array("Barnyard2", true, "/snort/snort_barnyard.php?id={$id}"); display_top_tabs($tab_array); } diff --git a/config/snort-dev/snort_define_servers.php b/config/snort-dev/snort_define_servers.php index 243e106f..812d379b 100644 --- a/config/snort-dev/snort_define_servers.php +++ b/config/snort-dev/snort_define_servers.php @@ -109,6 +109,9 @@ if (isset($_GET['dup'])) unset($id); } +/* convert fake interfaces to real */ +$if_real = convert_friendly_interface_to_real_interface_name($pconfig['interface']); + if ($_POST) { /* check for overlaps */ @@ -186,7 +189,7 @@ if ($_POST) { } } -$pgtitle = "Services: Snort Define Servers"; +$pgtitle = "Snort: Interface $id$if_real Define Servers"; include("head.inc"); ?> @@ -221,15 +224,14 @@ if($id != "") { $tab_array = array(); - $tab_array[] = array("Snort Interfaces", false, "/snort_interfaces.php"); - $tab_array[] = array("If Settings", false, "/snort/snort_interfaces_edit.php?id=$id"); - $tab_array[] = array("Categories", false, "/snort/snort_{$snortIf}_{$id}/snort_rulesets_{$snortIf}_{$id}.php"); - $tab_array[] = array("Rules", false, "/snort/snort_{$snortIf}_{$id}/snort_rules_{$snortIf}_{$id}.php"); - $tab_array[] = array("Servers", true, "/snort/snort_define_servers.php?id=$id"); - $tab_array[] = array("Barnyard2", false, "/pkg_edit.php?xml=snort/snort_{$snortIf}_{$id}/snort_barnyard2_{$snortIf}_{$id}.xml&id=0"); - $tab_array[] = array("Barnyard2", false, "/pkg_edit.php?xml=snort/snort_{$snortIf}_{$id}/snort_barnyard2_{$snortIf}_{$id}.xml&id=0"); - $tab_array[] = array("Barnyard2", false, "/snort/snort_barnyard.php?id=$id"); - display_top_tabs($tab_array); + $tab_array[] = array("Snort Interfaces", false, "/snort/snort_interfaces.php"); + $tab_array[] = array("If Settings", false, "/snort/snort_interfaces_edit.php?id={$id}"); + $tab_array[] = array("Categories", false, "/snort/snort_rulesets.php?id={$id}"); + $tab_array[] = array("Rules", false, "/snort/snort_rules.php?id={$id}"); + $tab_array[] = array("Servers", true, "/snort/snort_define_servers.php?id={$id}"); + $tab_array[] = array("Preprocessors", false, "/snort/snort_preprocessors.php?id={$id}"); + $tab_array[] = array("Barnyard2", false, "/snort/snort_barnyard.php?id={$id}"); + display_top_tabs($tab_array); } ?> diff --git a/config/snort-dev/snort_interfaces.php b/config/snort-dev/snort_interfaces.php index bd4d09b7..c4a791c9 100644 --- a/config/snort-dev/snort_interfaces.php +++ b/config/snort-dev/snort_interfaces.php @@ -7,6 +7,7 @@ originally part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Manuel Kasper . + Copyright (C) 2008-2009 Robert Zelaya. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/config/snort-dev/snort_interfaces_edit.php b/config/snort-dev/snort_interfaces_edit.php index e2ee443d..06c4a2bf 100644 --- a/config/snort-dev/snort_interfaces_edit.php +++ b/config/snort-dev/snort_interfaces_edit.php @@ -70,6 +70,9 @@ if (isset($id) && $a_nat[$id]) { if (isset($_GET['dup'])) unset($id); + +/* convert fake interfaces to real */ +$if_real = convert_friendly_interface_to_real_interface_name($pconfig['interface']); if ($_POST) { @@ -165,7 +168,7 @@ if ($_POST) { } } -$pgtitle = "Services: Snort Interfaces Edit"; +$pgtitle = "Snort: Interface: $id$if_real Settings Edit"; include("head.inc"); ?> @@ -267,14 +270,13 @@ if($id != "") } $tab_array = array(); - $tab_array[] = array("Snort Interfaces", false, "/snort_interfaces.php"); - $tab_array[] = array("If Settings", true, "/snort_interfaces_edit.php"); - $tab_array[] = array("Categories", false, "/snort/snort_{$snortIf}_{$id}/snort_rulesets_{$snortIf}_{$id}.php"); - $tab_array[] = array("Rules", false, "/snort/snort_{$snortIf}_{$id}/snort_rules_{$snortIf}_{$id}.php"); - $tab_array[] = array("Servers", false, "/pkg_edit.php?xml=snort/snort_{$snortIf}_{$id}/snort_define_servers_{$snortIf}_{$id}.xml&id=0"); - $tab_array[] = array("Barnyard2", false, "/pkg_edit.php?xml=snort/snort_{$snortIf}_{$id}/snort_barnyard2_{$snortIf}_{$id}.xml&id=0"); - $tab_array[] = array("Barnyard2", false, "/pkg_edit.php?xml=snort/snort_{$snortIf}_{$id}/snort_barnyard2_{$snortIf}_{$id}.xml&id=0"); - $tab_array[] = array("Barnyard2", false, "/pkg_edit.php?xml=snort/snort_{$snortIf}_{$id}/snort_barnyard2_{$snortIf}_{$id}.xml&id=0"); + $tab_array[] = array("Snort Interfaces", false, "/snort/snort_interfaces.php"); + $tab_array[] = array("If Settings", true, "/snort/snort_interfaces_edit.php?id={$id}"); + $tab_array[] = array("Categories", false, "/snort/snort_rulesets.php?id={$id}"); + $tab_array[] = array("Rules", false, "/snort/snort_rules.php?id={$id}"); + $tab_array[] = array("Servers", false, "/snort/snort_define_servers.php?id={$id}"); + $tab_array[] = array("Preprocessors", false, "/snort/snort_preprocessors.php?id={$id}"); + $tab_array[] = array("Barnyard2", false, "/snort/snort_barnyard.php?id={$id}"); display_top_tabs($tab_array); } } diff --git a/config/snort-dev/snort_interfaces_global.php b/config/snort-dev/snort_interfaces_global.php index 43c5cf6c..e06f58d2 100644 --- a/config/snort-dev/snort_interfaces_global.php +++ b/config/snort-dev/snort_interfaces_global.php @@ -4,7 +4,7 @@ part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2006 Manuel Kasper . - Copyright (C) 2003-2006 Robert Zelaya + Copyright (C) 2008-2009 Robert Zelaya All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/config/snort-dev/snort_rules.php b/config/snort-dev/snort_rules.php index e83e9fc0..c0831385 100644 --- a/config/snort-dev/snort_rules.php +++ b/config/snort-dev/snort_rules.php @@ -2,7 +2,8 @@ /* $Id$ */ /* edit_snortrule.php - Copyright (C) 2004, 2005 Scott Ullrich and Rober Zelaya + Copyright (C) 2004, 2005 Scott Ullrich + Copyright (C) 2008, 2009 Robert Zelaya All rights reserved. Redistribution and use in source and binary forms, with or without @@ -69,18 +70,15 @@ echo "\n \n \n"; - $tab_array = array(); - $tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=snort.xml&id=0"); - $tab_array[] = array(gettext("Update Rules"), false, "/snort_download_rules.php"); - $tab_array[] = array(gettext("Categories"), false, "/snort_rulesets.php"); - $tab_array[] = array(gettext("Rules"), true, "/snort_rules.php"); - $tab_array[] = array(gettext("Servers"), false, "/pkg_edit.php?xml=snort_define_servers.xml&id=0"); - $tab_array[] = array(gettext("Blocked"), false, "/snort_blocked.php"); - $tab_array[] = array(gettext("Whitelist"), false, "/pkg.php?xml=snort_whitelist.xml"); - $tab_array[] = array(gettext("Threshold"), false, "/pkg.php?xml=snort_threshold.xml"); - $tab_array[] = array(gettext("Alerts"), false, "/snort_alerts.php"); - $tab_array[] = array(gettext("Advanced"), false, "/pkg_edit.php?xml=snort_advanced.xml&id=0"); - display_top_tabs($tab_array); + $tab_array = array(); + $tab_array[] = array("Snort Interfaces", false, "/snort/snort_interfaces.php"); + $tab_array[] = array("If Settings", false, "/snort/snort_interfaces_edit.php?id={$id}"); + $tab_array[] = array("Categories", false, "/snort/snort_rulesets.php?id={$id}"); + $tab_array[] = array("Rules", true, "/snort/snort_rules.php?id={$id}"); + $tab_array[] = array("Servers", false, "/snort/snort_define_servers.php?id={$id}"); + $tab_array[] = array("Preprocessors", false, "/snort/snort_preprocessors.php?id={$id}"); + $tab_array[] = array("Barnyard2", false, "/snort/snort_barnyard.php?id={$id}"); + display_top_tabs($tab_array); echo "\n \n @@ -423,17 +421,14 @@ function go() @@ -528,7 +523,13 @@ function go() $textss = $textse = ""; $iconb = "icon_block.gif"; } - + + if ($disabled_pos !== false){ + $ischecked = ""; + }else{ + $ischecked = "checked"; + } + $rule_content = explode(' ', $tempstring); $protocol = $rule_content[$counter2];//protocol location @@ -551,6 +552,7 @@ function go() echo $textss; ?> + onClick="enable_change(false)"> "; @@ -622,9 +624,12 @@ function go() Rule Disabled - - + + + + + 
	

                                 

                         
                           
                   

@@ -634,12 +639,11 @@ function go()
                             
               
             
-
     
   
+  
 
 
-
 
 
 
\ No newline at end of file
diff --git a/config/snort-dev/snort_rules_edit.php b/config/snort-dev/snort_rules_edit.php
index 69d946a9..41138acb 100644
--- a/config/snort-dev/snort_rules_edit.php
+++ b/config/snort-dev/snort_rules_edit.php
@@ -3,6 +3,7 @@
 /*
     snort_rules_edit.php
     Copyright (C) 2004, 2005 Scott Ullrich
+	Copyright (C) 2004, 2009 Robert Zelaya
     All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
@@ -328,18 +329,15 @@ include("head.inc");
   
   	
 
 
   	
diff --git a/config/snort-dev/snort_rulesets.php b/config/snort-dev/snort_rulesets.php
index ede379b0..14d9e01c 100644
--- a/config/snort-dev/snort_rulesets.php
+++ b/config/snort-dev/snort_rulesets.php
@@ -3,6 +3,7 @@
 /*
 	snort_rulesets.php
 	Copyright (C) 2006 Scott Ullrich
+	Copyright (C) 2009 Robert Zelaya
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -72,18 +73,15 @@ echo "\n
    \n
    		\n";
 
-	$tab_array = array();
-	$tab_array[] = array(gettext("Settings"), false, "/pkg_edit.php?xml=snort.xml&id=0");
-	$tab_array[] = array(gettext("Update Rules"), false, "/snort_download_rules.php");
-	$tab_array[] = array(gettext("Categories"), true, "/snort_rulesets.php");
-	$tab_array[] = array(gettext("Rules"), false, "/snort_rules.php");
-	$tab_array[] = array(gettext("Servers"), false, "/pkg_edit.php?xml=snort_define_servers.xml&id=0");
-	$tab_array[] = array(gettext("Blocked"), false, "/snort_blocked.php");
-	$tab_array[] = array(gettext("Whitelist"), false, "/pkg.php?xml=snort_whitelist.xml");
-	$tab_array[] = array(gettext("Threshold"), false, "/pkg.php?xml=snort_threshold.xml");
-	$tab_array[] = array(gettext("Alerts"), false, "/snort_alerts.php");
-	$tab_array[] = array(gettext("Advanced"), false, "/pkg_edit.php?xml=snort_advanced.xml&id=0");
-	display_top_tabs($tab_array);
+    $tab_array = array();
+    $tab_array[] = array("Snort Interfaces", false, "/snort/snort_interfaces.php");
+    $tab_array[] = array("If Settings", false, "/snort/snort_interfaces_edit.php?id={$id}");
+    $tab_array[] = array("Categories", true, "/snort/snort_rulesets.php?id={$id}");
+    $tab_array[] = array("Rules", false, "/snort/snort_rules.php?id={$id}");
+    $tab_array[] = array("Servers", false, "/snort/snort_define_servers.php?id={$id}");
+    $tab_array[] = array("Preprocessors", false, "/snort/snort_preprocessors.php?id={$id}");
+    $tab_array[] = array("Barnyard2", false, "/snort/snort_barnyard.php?id={$id}");
+    display_top_tabs($tab_array);
 
 echo  		"\n
   \n
@@ -142,19 +140,14 @@ $enabled_rulesets = $a_nat[$id]['rulesets'];
 if($enabled_rulesets)
 	$enabled_rulesets_array = split("\|\|", $enabled_rulesets);
 
-$pgtitle = "Snort: {$id}{$if_real} Categories";
+$pgtitle = "Snort: Interface $id$if_real Categories";
 include("head.inc");
 
 ?>
 
 
 
-
-
";
-?>
-
+

 ";
@@ -168,18 +161,15 @@ echo "

    		
 
   		
   
-- 
cgit v1.2.3