Dansguardian package fix to properly update blacklists
-
I discovered a problem in how the DG package was updating the config for blacklists if the blacklists were organized into subdirectories. This is an issue if you are using http://www.shallalist.de/Downloads/shallalist.tar.gz because it does things like "blacklists/automobile/cars", "blacklists/automobile/planes", etc. instead of just have a single depth directory. The original code in dansguardian.php did not pickup blacklists in the sub directories. In addition, it created some bogus xml entities in the config file using the subdirectory names.
I'm not good on github yet - so I'm including a modified /usr/local/www/dansguardian.php which fixes the issue - if anyone wants to update it.
/* $Id$ */ /* ========================================================================== */ /* dansguardian.php part of pfSense (http://www.pfSense.com) Copyright (C) 2012 Marcello Coutinho All rights reserved. */ /* ========================================================================== */ /* 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. */ /* ========================================================================== */ require_once("/etc/inc/util.inc"); require_once("/etc/inc/functions.inc"); require_once("/etc/inc/pkg-utils.inc"); require_once("/etc/inc/globals.inc"); require_once("/usr/local/pkg/dansguardian.inc"); function fetch_blacklist(){ global $config,$g; $url=$config['installedpackages']['dansguardianblacklist']['config'][0]['url']; if (is_url($url)){ conf_mount_rw(); print "file download start.."; unlink_if_exists("/usr/local/etc/dansguardian/lists/blacklist.tgz"); exec("/usr/bin/fetch -o /usr/local/etc/dansguardian/lists/blacklist.tgz ".escapeshellarg($url)); chdir ("/usr/local/etc/dansguardian/lists"); if (is_dir ("blacklists.old")) exec ('rm -rf /usr/local/etc/dansguardian/lists/blacklists.old'); rename("blacklists","blacklists.old"); exec('/usr/bin/tar -xvzf /usr/local/etc/dansguardian/lists/blacklist.tgz 2>&1',$output,$return); if (preg_match("/x\W+(\w+)/",$output[0],$matches)){ if ($matches[1] != "blacklists") rename("./".$matches[1],"blacklists"); read_lists(); } else file_notice("Dansguardian - Could not determine Blacklist extract dir. Categories not updated",""); } else{ file_notice("Dansguardian - Blacklist url is invalid.",""); } } function read_lists(){ global $config,$g; $group_type=array(); $dir="/usr/local/etc/dansguardian/lists"; #read dansguardian lists dirs $groups= array("phraselists", "blacklists", "whitelists"); #assigns know list files $types=array('domains','urls','banned','weighted','exception','expression'); #clean previous xml config for dansguardian lists foreach($config['installedpackages'] as $key => $values) if (preg_match("/dansguardian(phrase|black|white)lists/",$key)) unset ($config['installedpackages'][$key]); #find lists foreach ($groups as $group) if (is_dir("$dir/$group/")){ #read dir content and find lists $lists= scandir("$dir/$group/"); foreach ($lists as $list) if (!preg_match ("/^\./",$list) && is_dir("$dir/$group/$list/")){ $category= scandir("$dir/$group/$list/"); foreach ($category as $file) if (is_dir("$dir/$group/$list/$file")) { $subdir=$file; if (!preg_match ("/^\./",$subdir)){ $subcategory= scandir("$dir/$group/$list/$subdir/"); foreach ($subcategory as $file) if (!preg_match ("/^\./",$file)){ #assign list to array $type=split("_",$file); if (preg_match("/(\w+)/",$type[0],$matches)); $xml_type=$matches[1]; if ($config['installedpackages']['dansguardianblacklist']['config'][0]["liston"]=="both" && $group=="blacklists") $config['installedpackages']['dansguardianwhitelists'.$xml_type]['config'][]=array("descr"=> "{$list}_{$subdir} {$file}","list" => "{$list}_{$subdir}","file" => "$dir/$group/$list/$subdir/$file"); $config['installedpackages']['dansguardian'.$group.$xml_type]['config'][]=array("descr"=> "{$list}_{$subdir} {$file}","list" => "{$list}_{$subdir}","file" => "$dir/$group/$list/$subdir/$file"); } } } else { if (!preg_match ("/^\./",$file)){ #assign list to array $type=split("_",$file); if (preg_match("/(\w+)/",$type[0],$matches)); $xml_type=$matches[1]; if ($config['installedpackages']['dansguardianblacklist']['config'][0]["liston"]=="both" && $group=="blacklists") $config['installedpackages']['dansguardianwhitelists'.$xml_type]['config'][]=array("descr"=> "$list $file","list" => $list,"file" => "$dir/$group/$list/$file"); $config['installedpackages']['dansguardian'.$group.$xml_type]['config'][]=array("descr"=> "$list $file","list" => $list,"file" => "$dir/$group/$list/$file"); } } } } conf_mount_rw(); $files=array("site","url"); foreach ($files as $edit_xml){ $edit_file=file_get_contents("/usr/local/pkg/dansguardian_".$edit_xml."_acl.xml"); if(count($config['installedpackages']['dansguardianblacklistsdomains']['config']) > 18){ $edit_file=preg_replace('/size.6/','size>20',$edit_file); if ($config['installedpackages']['dansguardianblacklist']['config'][0]["liston"]=="both") $edit_file=preg_replace('/size.5/','size>19',$edit_file); } else{ $edit_file=preg_replace('/size.20/','size>6',$edit_file); } if ($config['installedpackages']['dansguardianblacklist']['config'][0]["liston"]!="both") $edit_file=preg_replace('/size.19/','size>5',$edit_file); file_put_contents("/usr/local/pkg/dansguardian_".$edit_xml."_acl.xml",$edit_file,LOCK_EX); } file_notice("Dansguardian - Blacklist applied, check site and URL access lists for categories",""); #foreach($config['installedpackages'] as $key => $values) # if (preg_match("/dansguardian(phrase|black|white)lists/",$key)) # print "$key\n"; write_config(); } if ($argv[1]=="update_lists") read_lists(); if ($argv[1]=="fetch_blacklist") fetch_blacklist(); ?> -
Hmmm… just realized I could do a slightly improved version of read_lists(). It had a redundant check for the "." directories. BTW the "right" way to make this work would be a loop that goes through all directories in the tree (or recursively), but it seems like overkill to me. This will only do one directory down.
function read_lists(){ global $config,$g; $group_type=array(); $dir="/usr/local/etc/dansguardian/lists"; #read dansguardian lists dirs $groups= array("phraselists", "blacklists", "whitelists"); #assigns know list files $types=array('domains','urls','banned','weighted','exception','expression'); #clean previous xml config for dansguardian lists foreach($config['installedpackages'] as $key => $values) if (preg_match("/dansguardian(phrase|black|white)lists/",$key)) unset ($config['installedpackages'][$key]); #find lists foreach ($groups as $group) if (is_dir("$dir/$group/")){ #read dir content and find lists $lists= scandir("$dir/$group/"); foreach ($lists as $list) if (!preg_match ("/^\./",$list) && is_dir("$dir/$group/$list/")) { $category= scandir("$dir/$group/$list/"); foreach ($category as $file) if (!preg_match ("/^\./",$file)) { if (is_dir("$dir/$group/$list/$file")) { $subdir=$file; $subcategory= scandir("$dir/$group/$list/$subdir/"); foreach ($subcategory as $file) if (!preg_match ("/^\./",$file)){ #assign list to array $type=split("_",$file); if (preg_match("/(\w+)/",$type[0],$matches)); $xml_type=$matches[1]; if ($config['installedpackages']['dansguardianblacklist']['config'][0]["liston"]=="both" && $group=="blacklists") $config['installedpackages']['dansguardianwhitelists'.$xml_type]['config'][]=array("descr"=> "{$list}_{$subdir} {$file}","list" => "{$list}_{$subdir}","file" => "$dir/$group/$list/$subdir/$file"); $config['installedpackages']['dansguardian'.$group.$xml_type]['config'][]=array("descr"=> "{$list}_{$subdir} {$file}","list" => "{$list}_{$subdir}","file" => "$dir/$group/$list/$subdir/$file"); } } else { #assign list to array $type=split("_",$file); if (preg_match("/(\w+)/",$type[0],$matches)); $xml_type=$matches[1]; if ($config['installedpackages']['dansguardianblacklist']['config'][0]["liston"]=="both" && $group=="blacklists") $config['installedpackages']['dansguardianwhitelists'.$xml_type]['config'][]=array("descr"=> "$list $file","list" => $list,"file" => "$dir/$group/$list/$file"); $config['installedpackages']['dansguardian'.$group.$xml_type]['config'][]=array("descr"=> "$list $file","list" => $list,"file" => "$dir/$group/$list/$file"); } } } } conf_mount_rw(); $files=array("site","url"); foreach ($files as $edit_xml){ $edit_file=file_get_contents("/usr/local/pkg/dansguardian_".$edit_xml."_acl.xml"); if(count($config['installedpackages']['dansguardianblacklistsdomains']['config']) > 18){ $edit_file=preg_replace('/size.6/','size>20',$edit_file); if ($config['installedpackages']['dansguardianblacklist']['config'][0]["liston"]=="both") $edit_file=preg_replace('/size.5/','size>19',$edit_file); } else{ $edit_file=preg_replace('/size.20/','size>6',$edit_file); } if ($config['installedpackages']['dansguardianblacklist']['config'][0]["liston"]!="both") $edit_file=preg_replace('/size.19/','size>5',$edit_file); file_put_contents("/usr/local/pkg/dansguardian_".$edit_xml."_acl.xml",$edit_file,LOCK_EX); } file_notice("Dansguardian - Blacklist applied, check site and URL access lists for categories",""); #foreach($config['installedpackages'] as $key => $values) # if (preg_match("/dansguardian(phrase|black|white)lists/",$key)) # print "$key\n"; write_config(); } if ($argv[1]=="update_lists") read_lists(); if ($argv[1]=="fetch_blacklist") fetch_blacklist(); ?> -
Have a go at Github - I do bits and pieces all the time using just the online Github, as per http://forum.pfsense.org/index.php/topic,47676.msg251034.html#msg251034
After making a coherent set of changes, then just click on "Pull Request", fill in the title and comments and off it goes. The developers will review your code and commit it, or give you feedback about bits that can be done better. Just make sure to do some good testing and keep in mind the variations that other systems could have, handling all the possible cases…
It's much easier all round if the person who can reproduce the problem can investigate, test and try things on their own setup, rather than someone else having to spend time trying to replicate the issue. -
Have a go at Github - I do bits and pieces all the time using just the online Github, as per http://forum.pfsense.org/index.php/topic,47676.msg251034.html#msg251034
After making a coherent set of changes, then just click on "Pull Request", fill in the title and comments and off it goes. The developers will review your code and commit it, or give you feedback about bits that can be done better. Just make sure to do some good testing and keep in mind the variations that other systems could have, handling all the possible cases…
It's much easier all round if the person who can reproduce the problem can investigate, test and try things on their own setup, rather than someone else having to spend time trying to replicate the issue.Thanks for the forum reference… I'll take a look at it. Obviously git is the right way to do it - I just had issues figuring it out the first time I tried.
-
Also check if it works with other lists like bigblacklist to do not fix one and break other. ;)
-
OK…hopefully I did this right. Let me know if you don't see it on github.
The shallalist download is adequate for testing any blacklist that is two directories deep since it has both one and two deep directories in its blacklist structure. In other words, this fix will also work on the default blacklist download (can't remember where that one came from) because it was only one directory deep.
-
So, suppose I have a friend who it totally ignorant on applying this fix to their pfS box, how should it be done?… just so I can relay it accurately to them. ;D
-
Just reinstall the package ;)
