aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcello Coutinho <marcellocoutinho@gmail.com>2011-11-05 13:43:54 -0200
committermarcelloc <marcellocoutinho@gmail.com>2011-11-05 13:43:54 -0200
commitd1c7849d3ea04890c692547925095320bd1e1b88 (patch)
treec6e6a9cc6de33e334dfc6aaf86e0e4e0b739f4e5
parentcb11939fe54efb29fce36e543a59e17743989deb (diff)
downloadpfsense-packages-d1c7849d3ea04890c692547925095320bd1e1b88.tar.gz
pfsense-packages-d1c7849d3ea04890c692547925095320bd1e1b88.tar.bz2
pfsense-packages-d1c7849d3ea04890c692547925095320bd1e1b88.zip
pfBlocker - fixes in boot process, embedded platform and url table get file package function
-rwxr-xr-xconfig/pf-blocker/pfblocker.inc45
-rw-r--r--config/pf-blocker/pfblocker.php2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
4 files changed, 32 insertions, 19 deletions
diff --git a/config/pf-blocker/pfblocker.inc b/config/pf-blocker/pfblocker.inc
index ec017df8..4e715982 100755
--- a/config/pf-blocker/pfblocker.inc
+++ b/config/pf-blocker/pfblocker.inc
@@ -71,7 +71,12 @@ function pfblocker_Range2CIDR($ip_min, $ip_max) {
}
function sync_package_pfblocker() {
- global $config;
+ global $g,$config;
+ if ($g['booting'] == true){
+ print "no action during boot process...\n";
+ }
+ else{
+ conf_mount_rw();
$pfblocker_enable=$config['installedpackages']['pfblocker']['config'][0]['enable_cb'];
$pfblocker_config=$config['installedpackages']['pfblocker']['config'][0];
$table_limit =($config['system']['maximumtableentries']!= ""?$config['system']['maximumtableentries']:"100000");
@@ -89,12 +94,13 @@ function sync_package_pfblocker() {
#check folders
$pfbdir='/usr/local/pkg/pfblocker';
$pfb_alias_dir='/usr/local/pkg/pfblocker_aliases';
+ $pfsense_alias_dir='/var/db/aliastables/';
if (!is_dir($pfbdir))
mkdir ($pfbdir,0755);
if (!is_dir($pfb_alias_dir))
mkdir ($pfb_alias_dir,0755);
- if (! is_dir('/var/db/aliastables/'))
- mkdir ('/var/db/aliastables/',0755);
+ if (! is_dir($pfsense_alias_dir))
+ mkdir ($pfsense_alias_dir,0755);
$continents= array( "Africa" => "pfBlockerAfrica",
"Antartica" => "pfBlockerAntartica",
@@ -107,6 +113,7 @@ function sync_package_pfblocker() {
#create rules vars and arrays
$new_aliases=array();
+ $new_aliases_list=array();
$permit_inbound=array();
$permit_outbound=array();
$deny_inbound=array();
@@ -132,16 +139,18 @@ function sync_package_pfblocker() {
${$continent}="";
if (is_array($config['installedpackages']['pfblocker'.strtolower(preg_replace('/ /','',$continent))]['config'])){
$continent_config=$config['installedpackages']['pfblocker'.strtolower(preg_replace('/ /','',$continent))]['config'][0];
- if ($continent_config['action'] != 'Disabled' && $continent_config['action'] != '' && $pfblocker_enable == "on")
+ if ($continent_config['action'] != 'Disabled' && $continent_config['action'] != '' && $pfblocker_enable == "on"){
foreach (explode(",", $continent_config['countries']) as $iso){
#var_dump ($iso);
if ($iso <> "" && file_exists($pfbdir.'/'.$iso.'.txt'))
${$continent} .= file_get_contents($pfbdir.'/'.$iso.'.txt');
}
if($continent_config['countries'] != "" && $pfblocker_enable == "on"){
- #write alias file
+ #write alias files
file_put_contents($pfb_alias_dir.'/'.$pfb_alias.'.txt',${$continent},LOCK_EX);
+ file_put_contents($pfsense_alias_dir.'/'.$pfb_alias.'.txt',${$continent}, LOCK_EX);
#Create alias config
+ $new_aliases_list[]=$pfb_alias;
$new_aliases[]=array("name"=> $pfb_alias,
"url"=> $web_local.'?pfb='.$pfb_alias,
"updatefreq"=> "32",
@@ -149,9 +158,6 @@ function sync_package_pfblocker() {
"descr"=> "pfBlocker country list",
"type"=> "urltable",
"detail"=> "DO NOT EDIT THIS ALIAS");
- #force alias file update
- if (file_exists($pfb_alias_dir.'/'.$pfb_alias.'.txt'))
- file_put_contents($pfb_alias_dir.'/'.$pfb_alias.'.txt',${$continent}, LOCK_EX);
#Create rule if action permits
switch($continent_config['action']){
case "Deny_Outbound":
@@ -197,6 +203,12 @@ function sync_package_pfblocker() {
}
}
+ }
+ else{
+ #unlink continent list if any
+ unlink_if_exists($pfb_alias_dir.'/'.$pfb_alias.'.txt');
+ }
+
}
#mark pfctl aliastable for cleanup
if (!in_array($pfb_alias, $aliases_list))
@@ -254,12 +266,13 @@ function sync_package_pfblocker() {
${$alias}.=pfb_text_area_decode($list['custom'])."\n";
#save alias file if not empty
if (${$alias} == ""){
- if (file_exists($pfb_alias_dir.'/'.$alias.'.txt'))
- unlink($pfb_alias_dir.'/'.$alias.'.txt');
+ unlink_if_exists($pfb_alias_dir.'/'.$alias.'.txt');
}
else{
file_put_contents($pfb_alias_dir.'/'.$alias.'.txt',${$alias}, LOCK_EX);
+ file_put_contents($pfsense_alias_dir.'/'.$alias.'.txt',${$alias}, LOCK_EX);
#create alias
+ $new_aliases_list[]=$alias;
$new_aliases[]=array("name"=> $alias,
"url"=> $web_local.'?pfb='.$alias,
"updatefreq"=> "32",
@@ -317,8 +330,7 @@ function sync_package_pfblocker() {
}
else{
#unlink previous pfblocker alias list if any
- if (file_exists($pfb_alias_dir.'/'.$alias.'.txt'))
- unlink($pfb_alias_dir.'/'.$alias.'.txt');
+ unlink_if_exists($pfb_alias_dir.'/'.$alias.'.txt');
}
}
#update pfsense alias table
@@ -328,10 +340,9 @@ function sync_package_pfblocker() {
#mark pfctl aliastable for cleaning
if (!in_array($cbalias['name'], $aliases_list))
$aliases_list[]=$cbalias['name']; #mark aliastable for cleaning
- #remove previous aliastable file if exist
- $aliastablefile="/var/db/aliastables/".$cbalias['name'].".txt";
- if (file_exists($aliastablefile))
- unlink($aliastablefile);
+ #remove previous aliastable file if alias is not defined any more
+ if (!in_array($cbalias['name'], $new_aliases_list))
+ unlink_if_exists("/var/db/aliastables/".$cbalias['name'].".txt");
}
else{
$new_aliases[]= $cbalias;
@@ -449,6 +460,8 @@ function sync_package_pfblocker() {
log_error("[pfBlocker] ".$message);
file_notice("pfBlocker", $message, "pfblocker rule apply", "");
}
+ conf_mount_ro();
+ }
}
function pfblocker_validate_input($post, &$input_errors) {
diff --git a/config/pf-blocker/pfblocker.php b/config/pf-blocker/pfblocker.php
index b6c595ab..d6803b49 100644
--- a/config/pf-blocker/pfblocker.php
+++ b/config/pf-blocker/pfblocker.php
@@ -1,7 +1,7 @@
<?php
function get_networks($pfb){
$file='/usr/local/pkg/pfblocker_aliases/'.$pfb.'.txt';
- if ($file)
+ if (file_exists($file))
$return= file_get_contents($file);
print $return;
}
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index b605af8d..b18b808b 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -69,7 +69,7 @@
<pkginfolink>http://forum.pfsense.org/index.php/topic,42543.0.html</pkginfolink>
<config_file>http://pfsense.org/packages/config/pf-blocker/pfblocker.xml</config_file>
<depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
- <version>0.1.4</version>
+ <version>0.1.4.1</version>
<status>Beta</status>
<required_version>2.0</required_version>
<maintainer>tom@tomschaefer.org marcellocoutinho@gmail.com</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 04f98b38..8ca202de 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -144,7 +144,7 @@
<pkginfolink>http://forum.pfsense.org/index.php/topic,42543.0.html</pkginfolink>
<config_file>http://pfsense.org/packages/config/pf-blocker/pfblocker.xml</config_file>
<depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
- <version>0.1.4</version>
+ <version>0.1.4.1</version>
<status>Beta</status>
<required_version>2.0</required_version>
<maintainer>tom@tomschaefer.org marcellocoutinho@gmail.com</maintainer>