Whitelists are persistent through reboots, logging stays checked, Removed old warning, added lvl1 list by default, and changed description

7 files changed, 58 insertions, 53 deletions

diff --git a/config/ipblocklist/7/IP-Blocklist.sh b/config/ipblocklist/7/IP-Blocklist.sh
index e4d2424f..4591526b 100755
--- a/config/ipblocklist/7/IP-Blocklist.sh
+++ b/config/ipblocklist/7/IP-Blocklist.sh
@@ -10,62 +10,62 @@ if [ "$resultr" -gt "0" ]; then
 else
 	echo not running
 	/usr/bin/logger -s "IP-Blocklist was found not running"
-	echo "IP-Blocklist not running" | /usr/local/bin/php /usr/local/www/packages/ipblocklist/email_send.php
+	#echo "IP-Blocklist not running" | /usr/local/bin/php /usr/local/www/packages/ipblocklist/email_send.php
 fi
 
 
-#kill tables to elminate dups
+##kill tables to elminate dups
 /sbin/pfctl -t ipblocklist -T kill
 /sbin/pfctl -t ipblocklistW -T kill
 /usr/bin/sed -i -e '/ipblocklist/d' /tmp/rules.debug
 /usr/bin/sed -i -e '/ipblocklistW/d' /tmp/rules.debug
 
-#Generate lists to process
-ls /usr/local/www/packages/ipblocklist/lists > /usr/local/www/packages/ipblocklist/file_list.txt
-ls /usr/local/www/packages/ipblocklist/Wlists > /usr/local/www/packages/ipblocklist/file_Wlist.txt
+##Generate lists to process
+#ls /usr/local/www/packages/ipblocklist/lists > /usr/local/www/packages/ipblocklist/file_list.txt
+#ls /usr/local/www/packages/ipblocklist/Wlists > /usr/local/www/packages/ipblocklist/file_Wlist.txt
 filelist="/usr/local/www/packages/ipblocklist/file_list.txt"
 Wfilelist="/usr/local/www/packages/ipblocklist/file_Wlist.txt"
 
-#READ contents in file_list.txt and process as file
-for fileline in $(cat $filelist); do
-iplist="/usr/local/www/packages/ipblocklist/lists/$fileline"
-iplistout="/usr/local/www/packages/ipblocklist/lists/ipfw.ipfw"
-#sleep 5
-#echo "file name: "
-#echo $iplist
-#sleep 5
-if [ "$iplist" != "/usr/local/www/packages/ipblocklist/lists/ipfw.ipfw" ]; then
-	#/usr/bin/perl /usr/local/www/packages/ipblocklist/convert.pl $iplist $iplistout
-	#echo "THIS JUST RAN"
-fi
-#sleep 5
-done
+##READ contents in file_list.txt and process as file
+#for fileline in $(cat $filelist); do
+#iplist="/usr/local/www/packages/ipblocklist/lists/$fileline"
+#iplistout="/usr/local/www/packages/ipblocklist/lists/ipfw.ipfw"
+##sleep 5
+##echo "file name: "
+##echo $iplist
+##sleep 5
+#if [ "$iplist" != "/usr/local/www/packages/ipblocklist/lists/ipfw.ipfw" ]; then
+#	#/usr/bin/perl /usr/local/www/packages/ipblocklist/convert.pl $iplist $iplistout
+#	#echo "THIS JUST RAN"
+#fi
+##sleep 5
+#done
 
 #Whitelist
-for Wfileline in $(cat $Wfilelist); do
-Wiplist="/usr/local/www/packages/ipblocklist/Wlists/$Wfileline"
-Wiplistout="/usr/local/www/packages/ipblocklist/Wlists/whitelist"
-/usr/bin/perl /usr/local/www/packages/ipblocklist/convert.pl $Wiplist $Wiplistout
-done
+#for Wfileline in $(cat $Wfilelist); do
+#Wiplist="/usr/local/www/packages/ipblocklist/Wlists/$Wfileline"
+#Wiplistout="/usr/local/www/packages/ipblocklist/Wlists/whitelist"
+#/usr/bin/perl /usr/local/www/packages/ipblocklist/convert.pl $Wiplist $Wiplistout
+#done
 #echo "ipfw made"
 
-#clean up ipfw.ipfw (duplicates)
-rm /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP
-/usr/bin/sort /usr/local/www/packages/ipblocklist/lists/ipfw.ipfw | uniq >> /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP
-mv /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP /usr/local/www/packages/ipblocklist/lists/ipfw.ipfw
-#echo "ipfw clean"
+##clean up ipfw.ipfw (duplicates)
+#rm /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP
+#/usr/bin/sort /usr/local/www/packages/ipblocklist/lists/ipfw.ipfw | uniq >> /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP
+#mv /usr/local/www/packages/ipblocklist/lists/ipfw.ipfwTEMP /usr/local/www/packages/ipblocklist/lists/ipfw.ipfw
+##echo "ipfw clean"
 
-#clean up whitelist (duplicates)
-rm /usr/local/www/packages/ipblocklist/Wlists/whitelistTEMP
-/usr/bin/sort Wlists/whitelist | uniq >> /usr/local/www/packages/ipblocklist/Wlists/whitelistTEMP
-mv /usr/local/www/packages/ipblocklist/Wlists/whitelistTEMP /usr/local/www/packages/ipblocklist/Wlists/whitelist
-#echo "whitelist clean"
+##clean up whitelist (duplicates)
+#rm /usr/local/www/packages/ipblocklist/Wlists/whitelistTEMP
+#/usr/bin/sort Wlists/whitelist | uniq >> /usr/local/www/packages/ipblocklist/Wlists/whitelistTEMP
+#mv /usr/local/www/packages/ipblocklist/Wlists/whitelistTEMP /usr/local/www/packages/ipblocklist/Wlists/whitelist
+##echo "whitelist clean"
 
 
 
-#Now edit /tmp/rules.debug
+##Now edit /tmp/rules.debug
 
-#find my line for table
+##find my line for table
 export i=`grep -n 'block quick from any to <snort2c>' /tmp/rules.debug | grep -o '[0-9]\{2,4\}'`
 export t=`grep -n 'User Aliases' /tmp/rules.debug |grep -o '[0-9]\{1,2\}'`
 
diff --git a/config/ipblocklist/7/ipblocklist.inc b/config/ipblocklist/7/ipblocklist.inc
index 75111e1d..b0f7849f 100755
--- a/config/ipblocklist/7/ipblocklist.inc
+++ b/config/ipblocklist/7/ipblocklist.inc
@@ -4,7 +4,7 @@
 /* ========================================================================== */
 /*
 	ipblocklist.inc
-	Copyright (C) 2010 Tom Schaefer
+	Copyright (C) 2011 Tom Schaefer
 	All rights reserved.
 																			*/
 /* ========================================================================== */
@@ -60,6 +60,7 @@ function php_install_command_ip()
 	
 
 	//rename PHP files from .tmp to .php
+	exec("cp /tmp/lists.txt /usr/local/www/packages/ipblocklist/lists.txt");
 	exec("cp /tmp/class.phpmailer.tmp /usr/local/www/packages/ipblocklist/class.phpmailer.php");
 	unlink_if_exists("/tmp/class.phpmailer.tmp ");
 	exec("cp /tmp/class.smtp.tmp /usr/local/www/packages/ipblocklist/class.smtp.php");
diff --git a/config/ipblocklist/7/ipblocklist.tmp b/config/ipblocklist/7/ipblocklist.tmp
index 66d1c712..ffbfdc57 100755
--- a/config/ipblocklist/7/ipblocklist.tmp
+++ b/config/ipblocklist/7/ipblocklist.tmp
@@ -1,5 +1,5 @@
 <?php
-	//Version 3.3
+	//Version 3.4
 	header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
 	header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
 	require_once('config.inc');
@@ -100,14 +100,14 @@ if(isset($_POST['formSubmit']))
     {
 		
 	
-		if(isset($_POST['formlogging'])) 
-        {
-			exec("/usr/bin/touch logging");
-		} 
-        else 
-        {
-			exec("/bin/rm logging");
-		}
+		//if(isset($_POST['formlogging'])) 
+        //{
+		//	exec("/usr/bin/touch logging");
+		//} 
+        //else 
+        //{
+		//	exec("/bin/rm logging");
+		//}
 		
 	}
 ?>
@@ -199,9 +199,7 @@ if(isset($_POST['formSubmit']))
 	<a href="http://iblocklist.whitacrecomputers.com/files/bt_level2.gz">Level2</a>,
 	<a href="http://iblocklist.whitacrecomputers.com/files/bt_level3.gz">Level3</a>)
 	<br/>
-	Compressed lists should have .gz extention and follows PeerBlock syntax	<br/>
-		
-	<br/><span style="color:red">Warning!</span> - Apply after firewall change or state reset. Use at your own risk.
+	Compressed lists should have .gz extention and follows PeerBlock syntax			
 	<?php 
 	echo "<br/><br/>Current Status = ";
 	ob_start();
diff --git a/config/ipblocklist/7/ipblocklist.xml b/config/ipblocklist/7/ipblocklist.xml
index 4752061e..2b6ec976 100755
--- a/config/ipblocklist/7/ipblocklist.xml
+++ b/config/ipblocklist/7/ipblocklist.xml
@@ -8,7 +8,7 @@
 /* ========================================================================== */
 /*
 	ipblocklist.xml
-	Copyright (C) 2010 Tom Schaefer
+	Copyright (C) 2011 Tom Schaefer
 	All rights reserved.
                                                                               */
 /* ========================================================================== */
@@ -41,7 +41,7 @@
 	<requirements>perl</requirements>
 	<faq>http://forum.pfsense.org/index.php/topic,24769.0.html</faq>
 	<name>IP Blocklist Settings</name>
-	<version>0.3.3</version>
+	<version>0.3.4</version>
 	<title>Settings</title>
 	<include_file>/usr/local/pkg/ipblocklist.inc</include_file>
 	<menu>
@@ -149,6 +149,11 @@
 		<chmod>0755</chmod>
 		<item>http://www.pfsense.org/packages/config/ipblocklist/7/email.tmp</item>
 	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/tmp/</prefix>
+		<chmod>0755</chmod>
+		<item>http://www.pfsense.org/packages/config/ipblocklist/7/lists.txt</item>
+	</additional_files_needed>
 	<fields>
 		<field>
 			<fielddescr>Variable One</fielddescr>
diff --git a/config/ipblocklist/7/ipblocklist_list.tmp b/config/ipblocklist/7/ipblocklist_list.tmp
index 0603d4ce..ddc6fdb1 100755
--- a/config/ipblocklist/7/ipblocklist_list.tmp
+++ b/config/ipblocklist/7/ipblocklist_list.tmp
@@ -2,7 +2,7 @@
 header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
 header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); // Date in the past
 
-echo "<a href=\"whitelist.php\"><img src=\"../../themes/nervecenter/images/icons/icon_plus.gif\" ALT=\"Whitelist\" ALIGN=RIGHT></a>\n"; 
+//echo "<a href=\"whitelist.php\"><img src=\"../../themes/nervecenter/images/icons/icon_plus.gif\" ALT=\"Whitelist\" ALIGN=RIGHT></a>\n"; 
 echo "Add List URL: <form method=\"post\" action=\"\">\n"; 
 echo "<input name=\"content\" type=\"text\" />\n"; 
 echo "<input type=\"image\" src=\"../../themes/nervecenter/images/icons/icon_plus.gif\" value=\"submit\">\n"; 
diff --git a/config/ipblocklist/7/lists.txt b/config/ipblocklist/7/lists.txt
new file mode 100644
index 00000000..50b58f33
--- /dev/null
+++ b/config/ipblocklist/7/lists.txt
@@ -0,0 +1 @@
+http://iblocklist.whitacrecomputers.com/files/bt_level1.gz
diff --git a/config/ipblocklist/7/purge.tmp b/config/ipblocklist/7/purge.tmp
index a5a6cdf8..2ecf1cf6 100755
--- a/config/ipblocklist/7/purge.tmp
+++ b/config/ipblocklist/7/purge.tmp
@@ -15,6 +15,6 @@ exec("/usr/bin/more temp_lists.txt > lists.txt");
 exec("/bin/rm temp_lists.txt");
 
 
-header('Location: ipblocklist.php');
+header('Location: ipblocklist_list.php');
 
 ?>