pfBlockerNG - Relocated MaxMind Folder

Changes -

1) Relocate MaxMind folder from /var/db to /usr/pbi Folder. Nano and
Ramdisk Installations have the /var/db folder wiped on Reboot.

2) Add code to support MaxMind "Anonymous Proxy and Satellite Providers"
to inc file.

3) Move $pfb_alias_lists_all below the conditional "IF" statements.

4) Improve Header Name Validation.

5) Install/De-install - Changes to support MaxMind "Anonymous Proxy and
Satellite Providers" configuration. Delete previously used Folder
location, and remove MaxMind Working files after Installation is
completed.

1 files changed, 30 insertions, 14 deletions

diff --git a/config/pfblockerng/pfblockerng.inc b/config/pfblockerng/pfblockerng.inc
index 86052f6b..d612dbf1 100644
--- a/config/pfblockerng/pfblockerng.inc
+++ b/config/pfblockerng/pfblockerng.inc
@@ -56,12 +56,12 @@ function pfb_global() {
 	$pfb['aliasdir']	= "{$g['vardb_path']}/aliastables";
 	$pfb['logdir']		= "{$g['varlog_path']}/pfblockerng";
 	$pfb['etdir']		= "{$pfb['dbdir']}/ET";
-	$pfb['ccdir']		= "{$pfb['dbdir']}/cc";
 	$pfb['nativedir']	= "{$pfb['dbdir']}/native";
 	$pfb['denydir']		= "{$pfb['dbdir']}/deny";
 	$pfb['matchdir']	= "{$pfb['dbdir']}/match";
 	$pfb['permitdir']	= "{$pfb['dbdir']}/permit";
 	$pfb['origdir']		= "{$pfb['dbdir']}/original";
+	$pfb['ccdir']		= "/usr/pbi/pfblockerng-" . php_uname("m") . "/share/GeoIP";
 
 	# Create Folders if not Exist.
 	$folder_array = array ("{$pfb['dbdir']}","{$pfb['logdir']}","{$pfb['ccdir']}","{$pfb['origdir']}","{$pfb['nativedir']}","{$pfb['denydir']}","{$pfb['matchdir']}","{$pfb['permitdir']}","{$pfb['aliasdir']}");
@@ -457,14 +457,15 @@ function sync_package_pfblockerng($cron = "") {
 	#            Configure ARRAYS               #
 	#############################################
 
-	$continents = array (	"Africa"	=> "pfB_Africa",
-				"Antartica"	=> "pfB_Antartica",
-				"Asia"		=> "pfB_Asia",
-				"Europe"	=> "pfB_Europe",
-				"North America"	=> "pfB_NAmerica",
-				"Oceania"	=> "pfB_Oceania",
-				"South America"	=> "pfB_SAmerica",
-				"Top Spammers"	=> "pfB_Top"
+	$continents = array (	"Africa"		=> "pfB_Africa",
+				"Antartica"		=> "pfB_Antartica",
+				"Asia"			=> "pfB_Asia",
+				"Europe"		=> "pfB_Europe",
+				"North America"		=> "pfB_NAmerica",
+				"Oceania"		=> "pfB_Oceania",
+				"South America"		=> "pfB_SAmerica",
+				"Top Spammers"		=> "pfB_Top",
+				"Proxy and Satellite"	=> "pfB_PS"
 				);
 
 	#create rules vars and arrays
@@ -1192,16 +1193,16 @@ function sync_package_pfblockerng($cron = "") {
 								$log_tab = "\t\t";
 							}
 
-							# Collect Active Alias List (Used for pfctl Update when 'Reputation' is enabled.
-							$pfb_alias_lists_all[] = "{$alias}";
-
 							// Empty Header Field Validation Check
-							if (empty($header_url)) {
-								$log = "\n [ {$row['url']} ] {$log_tab} Header Field cannot be Empty. *Skipping* \n";
+							if (empty($header_url) || preg_match("/\W/",$header_url)) {
+								$log = "\n [ {$row['url']} ]\n ** TERMINATED - Header contains Blank/International/Special or Spaces\n";
 								pfb_logger("{$log}","2");
 								continue;
 							}
 
+							# Collect Active Alias List (Used for pfctl Update when 'Reputation' is enabled.
+							$pfb_alias_lists_all[] = "{$alias}";
+
 							if (file_exists($pfbfolder . '/' . $header_url . '.txt') && $pfb['reuse'] == "") {
 								if ($row['state'] == "Hold") {
 									$log = "\n[ {$header_url} ] {$log_tab} Static Hold [ NOW ]\n";
@@ -2330,12 +2331,19 @@ function pfblockerng_php_install_command() {
 	global $config,$pfb;
 	pfb_global();
 
+	// Remove previously used CC folder location if exists
+	@rmdir_recursive("{$pfb['dbdir']}/cc");
+
 	# Uncompress Country Code File and delete Archive after extraction.
 	exec("cd /{$pfb['ccdir']}; /usr/bin/tar -jxvf {$pfb['ccdir']}/countrycodes.tar.bz2");
 	unlink_if_exists("{$pfb['ccdir']}/countrycodes.tar.bz2");
 	# Download MaxMind Files and Create Country Code files and Build Continent XML Files
 	update_output_window(gettext("Downloading MaxMind Country Databases. This may take a minute..."));
 	exec("/bin/sh /usr/local/pkg/pfblockerng/geoipupdate.sh all >> {$pfb['geolog']} 2>&1");
+
+	@rename("{$pfb['dbdir']}/GeoIP.dat", "{$pfb['ccdir']}/GeoIP.dat");
+	@rename("{$pfb['dbdir']}/GeoIPv6.dat", "{$pfb['ccdir']}/GeoIPv6.dat");
+
 	update_output_window(gettext("MaxMind Country Database downloads completed..."));
 	update_output_window(gettext("Converting MaxMind Country Databases for pfBlockerNG. This may take a few minutes..."));
 	pfblockerng_uc_countries();
@@ -2343,6 +2351,12 @@ function pfblockerng_php_install_command() {
 	pfblockerng_get_countries();
 	update_output_window(gettext("Completed Creating pfBlockerNG Continenet XML Files..."));
 
+	// Remove Original Maxmind Database Files
+	@unlink_if_exists("{$pfb['dbdir']}/GeoIPCountryCSV.zip");
+	@unlink_if_exists("{$pfb['dbdir']}/GeoIPCountryWhois.csv");
+	@unlink_if_exists("{$pfb['dbdir']}/GeoIPv6.csv");
+	@unlink_if_exists("{$pfb['dbdir']}/country_continent.csv");
+
 	# Add Widget to Dashboard
 	update_output_window(gettext("Adding pfBlockerNG Widget to Dashboard."));
 	if ($pfb['keep'] == "on" && !empty($pfb['widgets'])) {
@@ -2407,6 +2421,8 @@ function pfblockerng_php_deinstall_command() {
 			unset($config['installedpackages']['pfblockerngsouthamerica']);
 		if (is_array($config['installedpackages']['pfblockerngtopspammers']))
 			unset($config['installedpackages']['pfblockerngtopspammers']);
+		if (is_array($config['installedpackages']['pfblockerngproxyandsatellite']))
+			unset($config['installedpackages']['pfblockerngproxyandsatellite']);
 	}
 
 	# Remove Widget (code from Snort deinstall)