From 8178e1ac1da79249eec0fc42786be54b61959a8e Mon Sep 17 00:00:00 2001 From: Thomas Schaefer Date: Fri, 19 Aug 2011 21:19:35 -0400 Subject: Whitelists are persistent through reboots, logging stays checked, Removed old warning, added lvl1 list by default, and changed description --- config/ipblocklist/7/IP-Blocklist.sh | 72 +++++++++++++++---------------- config/ipblocklist/7/ipblocklist.inc | 3 +- config/ipblocklist/7/ipblocklist.tmp | 22 +++++----- config/ipblocklist/7/ipblocklist.xml | 9 +++- config/ipblocklist/7/ipblocklist_list.tmp | 2 +- config/ipblocklist/7/lists.txt | 1 + config/ipblocklist/7/purge.tmp | 2 +- config/ipblocklist/8/IP-Blocklist.sh | 72 +++++++++++++++---------------- config/ipblocklist/8/ipblocklist.inc | 3 +- config/ipblocklist/8/ipblocklist.tmp | 25 +++++------ config/ipblocklist/8/ipblocklist.xml | 9 +++- config/ipblocklist/8/ipblocklist_list.tmp | 2 +- config/ipblocklist/8/lists.txt | 1 + config/ipblocklist/8/purge.tmp | 2 +- pkg_config.7.xml | 4 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 17 files changed, 121 insertions(+), 112 deletions(-) create mode 100644 config/ipblocklist/7/lists.txt create mode 100644 config/ipblocklist/8/lists.txt 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 ' /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 @@ @@ -199,9 +199,7 @@ if(isset($_POST['formSubmit'])) Level2, Level3)
- Compressed lists should have .gz extention and follows PeerBlock syntax
- -
Warning! - Apply after firewall change or state reset. Use at your own risk. + Compressed lists should have .gz extention and follows PeerBlock syntax
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 @@ perl http://forum.pfsense.org/index.php/topic,24769.0.html IP Blocklist Settings - 0.3.3 + 0.3.4 Settings /usr/local/pkg/ipblocklist.inc @@ -149,6 +149,11 @@ 0755 http://www.pfsense.org/packages/config/ipblocklist/7/email.tmp + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/ipblocklist/7/lists.txt + Variable One 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 "\"Whitelist\"\n"; +//echo "\"Whitelist\"\n"; echo "Add List URL:
\n"; echo "\n"; echo "\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'); ?> diff --git a/config/ipblocklist/8/IP-Blocklist.sh b/config/ipblocklist/8/IP-Blocklist.sh index e4d2424f..4591526b 100755 --- a/config/ipblocklist/8/IP-Blocklist.sh +++ b/config/ipblocklist/8/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 ' /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/8/ipblocklist.inc b/config/ipblocklist/8/ipblocklist.inc index 4e806034..003f28bf 100755 --- a/config/ipblocklist/8/ipblocklist.inc +++ b/config/ipblocklist/8/ipblocklist.inc @@ -4,7 +4,7 @@ /* ========================================================================== */ /* ipblocklist.inc - Copyright (C) 2010 Tom Schaefer + Copyright (C) 2011 Tom Schaefer All rights reserved. */ /* ========================================================================== */ @@ -61,6 +61,7 @@ function php_install_command_ip() exec("pkg_add -r compat6x-i386.tbz"); //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/8/ipblocklist.tmp b/config/ipblocklist/8/ipblocklist.tmp index e3ea1fdf..ffbfdc57 100755 --- a/config/ipblocklist/8/ipblocklist.tmp +++ b/config/ipblocklist/8/ipblocklist.tmp @@ -1,5 +1,5 @@ @@ -199,9 +199,7 @@ if(isset($_POST['formSubmit'])) Level2, Level3)
- Compressed lists should have .gz extention and follows PeerBlock syntax
- -
Warning! - Apply after firewall change or state reset. Use at your own risk. + Compressed lists should have .gz extention and follows PeerBlock syntax
Current Status = "; ob_start(); @@ -229,8 +227,7 @@ if(isset($_POST['formSubmit'])) ?>

Created by TomSchaefer -
-I-Blocklist.com +
I-Blocklist.com

diff --git a/config/ipblocklist/8/ipblocklist.xml b/config/ipblocklist/8/ipblocklist.xml index 88786386..ca488d01 100755 --- a/config/ipblocklist/8/ipblocklist.xml +++ b/config/ipblocklist/8/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 @@ perl http://forum.pfsense.org/index.php/topic,24769.0.html IP Blocklist Settings - 0.3.3 + 0.3.4 Settings /usr/local/pkg/ipblocklist.inc @@ -149,6 +149,11 @@ 0755 http://www.pfsense.org/packages/config/ipblocklist/8/email.tmp + + /tmp/ + 0755 + http://www.pfsense.org/packages/config/ipblocklist/8/lists.txt + Variable One diff --git a/config/ipblocklist/8/ipblocklist_list.tmp b/config/ipblocklist/8/ipblocklist_list.tmp index 0603d4ce..ddc6fdb1 100755 --- a/config/ipblocklist/8/ipblocklist_list.tmp +++ b/config/ipblocklist/8/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 "\"Whitelist\"\n"; +//echo "\"Whitelist\"\n"; echo "Add List URL: \n"; echo "\n"; echo "\n"; diff --git a/config/ipblocklist/8/lists.txt b/config/ipblocklist/8/lists.txt new file mode 100644 index 00000000..50b58f33 --- /dev/null +++ b/config/ipblocklist/8/lists.txt @@ -0,0 +1 @@ +http://iblocklist.whitacrecomputers.com/files/bt_level1.gz diff --git a/config/ipblocklist/8/purge.tmp b/config/ipblocklist/8/purge.tmp index a5a6cdf8..2ecf1cf6 100755 --- a/config/ipblocklist/8/purge.tmp +++ b/config/ipblocklist/8/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'); ?> diff --git a/pkg_config.7.xml b/pkg_config.7.xml index 4496ace6..8cdd8ba4 100755 --- a/pkg_config.7.xml +++ b/pkg_config.7.xml @@ -32,12 +32,12 @@ IP-Blocklist - IP-Blocklist is like PeerGuardian2. IP lists are used to add deny/allow rules to the firewall for in & out traffic. + IP-Blocklist is the new PeerBlock. IP lists are used to add deny/allow rules to the firewall for in & out traffic. Firewall http://forum.pfsense.org/index.php/topic,24769.0.html http://pfsense.org/packages/config/ipblocklist/7/ipblocklist.xml http://files.pfsense.org/packages/7/All/ - 0.3.3 + 0.3.4 Beta 1.2.2 tom@tomschaefer.org diff --git a/pkg_config.8.xml b/pkg_config.8.xml index a3e4d95f..78a06924 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -61,7 +61,7 @@ IP-Blocklist - IP-Blocklist is like PeerGuardian2. IP lists are used to add deny/allow rules to the firewall for in & out traffic. + IP-Blocklist is the new PeerBlock. IP lists are used to add deny/allow rules to the firewall for in & out traffic. Firewall http://forum.pfsense.org/index.php/topic,24769.0.html http://pfsense.org/packages/config/ipblocklist/8/ipblocklist.xml diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 47c66e7f..73d91dca 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -98,7 +98,7 @@ IP-Blocklist - IP-Blocklist is like PeerGuardian2. IP lists are used to add deny/allow rules to the firewall for in & out traffic. + IP-Blocklist is the new PeerBlock. IP lists are used to add deny/allow rules to the firewall for in & out traffic. Firewall http://forum.pfsense.org/index.php/topic,24769.0.html http://pfsense.org/packages/config/ipblocklist/8/ipblocklist.xml -- cgit v1.2.3