Add snort whitelist framework.

TODO: Actually hook it into squid.inc

5 files changed, 74 insertions, 1 deletions

diff --git a/packages/snort/snort.xml b/packages/snort/snort.xml
index f276b16e..0765e9f5 100644
--- a/packages/snort/snort.xml
+++ b/packages/snort/snort.xml
@@ -32,6 +32,11 @@
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
+		<item>http://www.pfsense.com/packages/config/snort/snort_whitelist.php</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/www/</prefix>
+		<chmod>077</chmod>
 		<item>http://www.pfsense.com/packages/config/snort/snort_blocked.php</item>
 	</additional_files_needed>
 	<service>
@@ -58,6 +63,10 @@
 			<text>Snort Blocked</text>
 			<url>/snort_blocked.php</url>
 		</tab>
+		<tab>
+			<text>Snort Whitelist</text>
+			<url>/snort_whitelist.php</url>
+		</tab>
 	</tabs>
 	<fields>
 		<field>
diff --git a/packages/snort/snort_blocked.php b/packages/snort/snort_blocked.php
index b08ef0f0..a40d2790 100644
--- a/packages/snort/snort_blocked.php
+++ b/packages/snort/snort_blocked.php
@@ -60,7 +60,7 @@ include("head.inc");
 	$tab_array[] = array(gettext("Snort Settings"), false, "/pkg_edit.php?xml=snort.xml&id=0");
 	$tab_array[] = array(gettext("Snort Rules Update"), false, "/snort_download_rules.php");
 	$tab_array[] = array(gettext("Snort Rulesets"), false, "/snort_rulesets.php");
-	$tab_array[] = array(gettext("Snort Blocked"), true, "/snort_blocked.php");
+	$tab_array[] = array(gettext("Snort Whitelist"), false, "/snort_whitelist.php");
 	display_top_tabs($tab_array);
 ?>
   		</td>
diff --git a/packages/snort/snort_download_rules.php b/packages/snort/snort_download_rules.php
index 99538f8f..cd605db6 100644
--- a/packages/snort/snort_download_rules.php
+++ b/packages/snort/snort_download_rules.php
@@ -56,6 +56,7 @@ include("head.inc");
 	$tab_array[] = array(gettext("Snort Rules Update"), true, "/snort_download_rules.php");
 	$tab_array[] = array(gettext("Snort Rulesets"), false, "/snort_rulesets.php");
 	$tab_array[] = array(gettext("Snort Blocked"), false, "/snort_blocked.php");
+	$tab_array[] = array(gettext("Snort Whitelist"), false, "/snort_whitelist.php");
 	display_top_tabs($tab_array);
 ?>
     </td>
diff --git a/packages/snort/snort_rulesets.php b/packages/snort/snort_rulesets.php
index 5708e0d1..52ab3312 100644
--- a/packages/snort/snort_rulesets.php
+++ b/packages/snort/snort_rulesets.php
@@ -75,6 +75,7 @@ include("head.inc");
 	$tab_array[] = array(gettext("Snort Rules Update"), false, "/snort_download_rules.php");
 	$tab_array[] = array(gettext("Snort Rulesets"), true, "/snort_rulesets.php");
 	$tab_array[] = array(gettext("Snort Blocked"), false, "/snort_blocked.php");
+	$tab_array[] = array(gettext("Snort Whitelist"), false, "/snort_whitelist.php");
 	display_top_tabs($tab_array);
 ?>
   		</td>
diff --git a/packages/snort/snort_whitelist.xml b/packages/snort/snort_whitelist.xml
new file mode 100644
index 00000000..771452cc
--- /dev/null
+++ b/packages/snort/snort_whitelist.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<packagegui>
+	<name>snort-whitelist</name>
+	<version>0.1.0</version>
+	<title>Snort: Whitelist</title>
+	<!-- Menu is where this packages menu will appear -->
+	<tabs>
+		<tab>
+			<text>Snort Settings</text>
+			<url>/pkg_edit.php?xml=snort.xml&amp;id=0</url>
+		</tab>
+		<tab>
+			<text>Update Snort Rules</text>
+			<url>/snort_download_rules.php</url>
+		</tab>
+		<tab>
+			<text>Snort Rulesets</text>
+			<url>/snort_rulesets.php</url>
+		</tab>
+		<tab>
+			<text>Snort Blocked</text>
+			<url>/snort_blocked.php</url>
+		</tab>
+		<tab>
+			<text>Snort Whitelist</text>
+			<url>/snort_whitelist.php</url>
+			<active/>
+		</tab>
+	</tabs>
+	<adddeleteeditpagefields>
+		<columnitem>
+			<fielddescr>Whitelisted IP</fielddescr>
+			<fieldname>ip</fieldname>
+		</columnitem>
+		<columnitem>
+			<fielddescr>Description</fielddescr>
+			<fieldname>description</fieldname>
+		</columnitem>
+	</adddeleteeditpagefields>
+	<fields>
+		<field>
+			<fielddescr>Whitelisted IP</fielddescr>
+			<fieldname>ip</fieldname>
+			<description>Enter the IP to whitelist from snort blocking</description>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Description</fielddescr>
+			<fieldname>description</fieldname>
+			<description>Enter the description for this item</description>
+			<type>input</type>
+		</field>
+	</fields>
+	<custom_php_command_before_form>
+	</custom_php_command_before_form>
+	<custom_delete_php_command>
+		sync_package_spamd_whitelist();
+	</custom_delete_php_command>
+	<custom_php_resync_config_command>
+		sync_package_spamd_whitelist();
+	</custom_php_resync_config_command>
+</packagegui>
\ No newline at end of file