aboutsummaryrefslogtreecommitdiffstats
path: root/config/countryblock
diff options
context:
space:
mode:
Diffstat (limited to 'config/countryblock')
-rw-r--r--config/countryblock/countryblock.inc8
-rw-r--r--config/countryblock/countryblock.tmp5
-rw-r--r--config/countryblock/countryblock.xml7
-rw-r--r--config/countryblock/countryblock_IPBlocklist.widget.tmp116
-rw-r--r--config/countryblock/countryblock_if.tmp2
-rw-r--r--config/countryblock/help.tmp4
-rw-r--r--config/countryblock/settings.tmp2
-rw-r--r--config/countryblock/whitelist.tmp2
8 files changed, 139 insertions, 7 deletions
diff --git a/config/countryblock/countryblock.inc b/config/countryblock/countryblock.inc
index f67fd76f..64c1f4cc 100644
--- a/config/countryblock/countryblock.inc
+++ b/config/countryblock/countryblock.inc
@@ -62,6 +62,9 @@ function php_install_command_cb()
//rename PHP files from .tmp to .php
+ exec("cp /tmp/countryblock_IPBlocklist.widget.tmp /usr/local/www/widgets/widgets/countryblock_IPBlocklist.widget.php");
+ unlink_if_exists("/tmp/countryblock_IPBlocklist.widget.tmp");
+
exec("cp /tmp/class.phpmailer.tmp /usr/local/www/packages/countryblock/class.phpmailer.php");
unlink_if_exists("/tmp/class.phpmailer.tmp ");
exec("cp /tmp/class.smtp.tmp /usr/local/www/packages/countryblock/class.smtp.php");
@@ -114,6 +117,10 @@ function php_install_command_cb()
exec("mkdir /usr/local/www/packages/countryblock/lists");
exec("touch /usr/local/www/packages/countryblock/lists/countries.txt");
+ //Attempt to restore from backup
+ exec("mkdir /usr/local/www/packages/countryblock_bkup");
+ exec("cp /usr/local/www/packages/countryblock_bkup/countries.txt /usr/local/www/packages/countryblock/countries.txt");
+
conf_mount_ro();
config_unlock();
}
@@ -125,6 +132,7 @@ function deinstall_command_cb()
$handle = popen("/usr/local/etc/rc.d/countryblock.sh stop", "r");
unlink_if_exists("/usr/local/pkg/countryblock.xml");
unlink_if_exists("/usr/local/pkg/countryblock.inc");
+ //unlink_if_exists("/usr/local/pkg/pf/countryblock.sh");
exec("rm -R /usr/local/www/packages/countryblock/countryblocks");
exec("rm -R /usr/local/www/packages/countryblock");
exec("rm /usr/local/etc/rc.d/countryblock.sh");
diff --git a/config/countryblock/countryblock.tmp b/config/countryblock/countryblock.tmp
index 0ddb4c5f..39ee6e64 100644
--- a/config/countryblock/countryblock.tmp
+++ b/config/countryblock/countryblock.tmp
@@ -60,6 +60,9 @@ if (count($_POST)>0) {
//mwexec("pfctl -t countryblock -T kill");
//mwexec("sed -i -e '/countryblock/d' /tmp/rules.debug");
mwexec("sh execute.sh");
+
+ //attempt to create a backup of countries.txt
+ mwexec("cp /usr/local/www/packages/countryblock/countries.txt /usr/local/www/packages/countryblock_bkup/countries.txt");
}
else {
@@ -118,7 +121,7 @@ else {
$tab_array[2] = array("Whitelist", false, "whitelist.php");
$tab_array[3] = array("Interfaces", false, "countryblock_if.php");
$tab_array[4] = array("Help", false, "help.php");
- $tab_array[5] = array("Email", false, "email.php");
+ //$tab_array[5] = array("Email", false, "email.php");
display_top_tabs($tab_array);
?>
</td></tr>
diff --git a/config/countryblock/countryblock.xml b/config/countryblock/countryblock.xml
index dbbefd18..1d278d20 100644
--- a/config/countryblock/countryblock.xml
+++ b/config/countryblock/countryblock.xml
@@ -41,7 +41,7 @@
<requirements>Active Internet</requirements>
<faq>http://forum.pfsense.org/index.php/topic,25732.0.html</faq>
<name>Country Block Settings</name>
- <version>0.2.2</version>
+ <version>0.2.4</version>
<title>Settings</title>
<include_file>/usr/local/pkg/countryblock.inc</include_file>
<menu>
@@ -164,6 +164,11 @@
<chmod>0755</chmod>
<item>http://www.pfsense.org/packages/config/countryblock/email.tmp</item>
</additional_files_needed>
+ <additional_files_needed>
+ <prefix>/tmp/</prefix>
+ <chmod>0644</chmod>
+ <item>http://www.pfsense.org/packages/config/countryblock/countryblock_IPBlocklist.widget.tmp</item>
+ </additional_files_needed>
<fields>
<field>
<fielddescr>Variable One</fielddescr>
diff --git a/config/countryblock/countryblock_IPBlocklist.widget.tmp b/config/countryblock/countryblock_IPBlocklist.widget.tmp
new file mode 100644
index 00000000..a62fcede
--- /dev/null
+++ b/config/countryblock/countryblock_IPBlocklist.widget.tmp
@@ -0,0 +1,116 @@
+<?php
+/*
+ Copyright 2011 Thomas Schaefer - Tomschaefer.org
+ Part of pfSense widgets (www.pfsense.com)
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+*/
+
+$nocsrf = true;
+
+@require_once("guiconfig.inc");
+@require_once("pfsense-utils.inc");
+@require_once("functions.inc");
+
+$ipblocklist_file = "/usr/local/www/packages/ipblocklist/ipblocklist.php";
+$countryblock_file = "/usr/local/www/packages/countryblock/countryblock.php";
+
+echo "<table style=\"padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px\" width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\"";
+echo" <tr>";
+if (file_exists($ipblocklist_file)) {
+ echo " <td class=\"listhdrr\">IP-Blocklist";
+ ob_start();
+ $results = exec("/sbin/pfctl -s rules | grep -c ipblocklist");
+ ob_end_clean();
+ if ($results > '2') echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_up.gif'>";
+ else
+ echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_down.gif'>";
+ echo "</td>";
+}
+if (file_exists($countryblock_file)) {
+ echo " <td class=\"listhdrr\">Countryblock";
+ ob_start();
+ $results = exec("/sbin/pfctl -s rules | grep -c countryblock");
+ ob_end_clean();
+ if ($results > '0') echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_up.gif'>";
+ else
+ echo "<img src ='/themes/{$g['theme']}/images/icons/icon_interface_down.gif'>";
+ echo "</td>";
+}
+echo" </tr>";
+echo" <tr>";
+if (file_exists($ipblocklist_file)) {
+ echo " <td class=\"listlr\">";
+ ob_start();
+ $resultsIP = exec("/sbin/pfctl -T show -t ipblocklist |grep -v -c Z");
+ ob_end_clean();
+ echo $resultsIP;
+ echo " Networks";
+ echo "</td>";
+}
+if (file_exists($countryblock_file)) {
+ echo " <td class=\"listr\">";
+ ob_start();
+ $resultsCB = exec("pfctl -T show -t countryblock |grep -v -c Z");
+ ob_end_clean();
+ echo $resultsCB;
+ echo " Networks";
+ echo "</td>";
+}
+echo" </tr>";
+echo" <tr>";
+if (file_exists($ipblocklist_file)) {
+ ob_start();
+ $resultsIP = exec("tail -r /usr/local/www/packages/ipblocklist/errorOUT.txt");
+ ob_end_clean();
+ if ($resultsIP == "") {
+ echo " <td></td>";
+ } else {
+ echo " <td class=\"listlr\">";
+ echo "<br/><span style='color:red'>";
+ echo $resultsIP;
+ echo "</span>";
+ echo "</td>";
+ }
+}
+if (file_exists($countryblock_file)) {
+ ob_start();
+ $resultsCB = exec("tail -r /usr/local/www/packages/countryblock/errorOUT.txt");
+ ob_end_clean();
+ if ($resultsCB == "") {
+ echo " <td></td>";
+ } else {
+ echo " <td class=\"listlr\">";
+ echo "<br/><span style='color:red'>";
+ echo $resultsCB;
+ echo "</span>";
+ echo "</td>";
+ }
+}
+echo" </tr>";
+//echo" <tr>";
+//if (file_exists($ipblocklist_file)) echo " <td>&nbsp;</td>";
+//if (file_exists($countryblock_file)) echo " <td>&nbsp;</td>";
+//echo" </tr>";
+echo"</table>";
+
+?>
diff --git a/config/countryblock/countryblock_if.tmp b/config/countryblock/countryblock_if.tmp
index 8471f075..65b80992 100644
--- a/config/countryblock/countryblock_if.tmp
+++ b/config/countryblock/countryblock_if.tmp
@@ -122,7 +122,7 @@ include("head.inc");
$tab_array[2] = array("Whitelist", false, "whitelist.php");
$tab_array[3] = array("Interfaces", true, "countryblock_if.php");
$tab_array[4] = array("Help", false, "help.php");
- $tab_array[5] = array("Email", false, "email.php");
+ //$tab_array[5] = array("Email", false, "email.php");
display_top_tabs($tab_array);
?>
</td></tr>
diff --git a/config/countryblock/help.tmp b/config/countryblock/help.tmp
index 17f30f90..2f466947 100644
--- a/config/countryblock/help.tmp
+++ b/config/countryblock/help.tmp
@@ -34,7 +34,7 @@ $pgtitle = "Firewall: Countryblock - Help";
$tab_array[2] = array("Whitelist", false, "whitelist.php");
$tab_array[3] = array("Interfaces", false, "countryblock_if.php");
$tab_array[4] = array("Help", true, "help.php");
- $tab_array[5] = array("Email", false, "email.php");
+ //$tab_array[5] = array("Email", false, "email.php");
display_top_tabs($tab_array);
?>
</td></tr>
@@ -91,7 +91,7 @@ To run countryblock as a cron job use /usr/local/etc/rc.d/countryblock.sh <br>
<span style="color:red">Warning!</span> - Apply after every firewall change or state reset. Use at your own risk.
--->
-<a href="http://doc.pfsense.org/index.php/Country_Block">Please see wiki for help</a>
+<a href="http://doc.pfsense.org/index.php/Country_Block">Please see wiki for help</a> or the <a href="http://forum.pfsense.org/index.php/topic,25732.0.html">Forum</a>
</div>
diff --git a/config/countryblock/settings.tmp b/config/countryblock/settings.tmp
index 5bbfedc3..0a067d83 100644
--- a/config/countryblock/settings.tmp
+++ b/config/countryblock/settings.tmp
@@ -44,7 +44,7 @@ $pgtitle = "Firewall: Countryblock - Settings";
$tab_array[2] = array("Whitelist", false, "whitelist.php");
$tab_array[3] = array("Interfaces", false, "countryblock_if.php");
$tab_array[4] = array("Help", false, "help.php");
- $tab_array[5] = array("Email", false, "email.php");
+ //$tab_array[5] = array("Email", false, "email.php");
display_top_tabs($tab_array);
?>
</td></tr>
diff --git a/config/countryblock/whitelist.tmp b/config/countryblock/whitelist.tmp
index 0dbed5d0..d613ee11 100644
--- a/config/countryblock/whitelist.tmp
+++ b/config/countryblock/whitelist.tmp
@@ -43,7 +43,7 @@ mwexec("touch countries-white.txt");
$tab_array[2] = array("Whitelist", true, "whitelist.php");
$tab_array[3] = array("Interfaces", false, "countryblock_if.php");
$tab_array[4] = array("Help", false, "help.php");
- $tab_array[5] = array("Email", false, "email.php");
+ //$tab_array[5] = array("Email", false, "email.php");
display_top_tabs($tab_array);
?>
</td></tr>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 02:14:09 +0000