aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfig/dansguardian/dansguardian.inc123
-rw-r--r--config/dansguardian/dansguardian.php2
-rw-r--r--config/dansguardian/dansguardian.xml4
-rw-r--r--config/dansguardian/dansguardian_config.xml13
-rw-r--r--config/dansguardian/dansguardian_log.xml10
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
7 files changed, 144 insertions, 12 deletions
diff --git a/config/dansguardian/dansguardian.inc b/config/dansguardian/dansguardian.inc
index 69d45406..2c14fca8 100755
--- a/config/dansguardian/dansguardian.inc
+++ b/config/dansguardian/dansguardian.inc
@@ -54,10 +54,11 @@ function sync_package_dansguardian() {
if (is_array($config['installedpackages']['dansguardian']))
if (!$config['installedpackages']['dansguardian']['config'][0]['enable'])
return;
- if (file_exists("/var/run/dansguardian.pid"))
+ if (file_exists("/var/run/dansguardian.pid")){
exec("/bin/ps -p `cat /var/run/dansguardian.pid` 2>&1",$return);
- if ($return == "0")
+ if (preg_match("/dansguardian/",$return[1]))
return;
+ }
}
#assign xml arrays
if (!is_array($config['installedpackages']['dansguardian']))
@@ -69,7 +70,8 @@ function sync_package_dansguardian() {
'scan_options'=>'scancleancache,createlistcachefiles,deletedownloadedtempfiles',
'weightedphrasemode'=>'2',
'preservecase'=>'0',
- 'phrasefiltermode'=>'2');
+ 'phrasefiltermode'=>'2',
+ 'cron'=>'day');
$dansguardian_config=$config['installedpackages']['dansguardianconfig']['config'][0];
if (!is_array($config['installedpackages']['dansguardianlog']))
$config['installedpackages']['dansguardianlog']['config'][0]=array('report_level'=>'3',
@@ -579,6 +581,15 @@ function sync_package_dansguardian() {
}
file_put_contents($dansguardian_dir."/lists/contentscanners/exceptionvirusextensionlist",($dansguardian_antivirus['extension_enabled']?dg_text_area_decode($config['installedpackages']['dansguardianantivirusacl']['config'][0]['extension_list']):""),LOCK_EX);
+ #log report
+ if ($dansguardian_log['report_file']=="" && file_exists("/usr/local/share/dansguardian/languages/".$reportlanguage."/template.html")){
+ $report_file=file_get_contents("/usr/local/share/dansguardian/languages/".$reportlanguage."/template.html");
+ $report_file=preg_replace('/<.*(html|head)>/','',$report_file);
+ $config['installedpackages']['dansguardianlog']['config'][0]['report_file']=base64_encode($report_file);
+ $dansguardian_log['report_file']=base64_encode($report_file);
+ $load_samples++;
+ }
+
if($load_samples > 0)
write_config();
@@ -672,6 +683,10 @@ EOF;
$user_xml_footer=file_get_contents("/usr/local/pkg/dansguardian_users_footer.xml");
file_put_contents("/usr/local/pkg/dansguardian_users.xml",$user_xml_header.$user_xml.$user_xml_footer,LOCK_EX);
+ #Create report template
+ if (is_dir("/usr/local/share/dansguardian/languages/".$reportlanguage))
+ file_put_contents("/usr/local/share/dansguardian/languages/".$reportlanguage."/template.html",dg_text_area_decode($dansguardian_log['report_file']),LOCK_EX);
+
#check blacklist download files
if ($dansguardian_blacklist['cron']=="force_download"){
log_error("Blacklist udpate process started");
@@ -683,7 +698,7 @@ EOF;
mwexec_bg("/usr/local/bin/php /usr/local/www/dansguardian.php fetch_blacklist");
}
#update xml categories from downloaded file
- if (preg_match("/force/",$dansguardian_blacklist['cron'])){
+ if ($dansguardian_blacklist['cron']=="force_update"){
$config['installedpackages']['dansguardianblacklist']['config'][0]['cron']="never";
mwexec_bg("/usr/local/bin/php /usr/local/www/dansguardian.php update_lists");
}
@@ -717,12 +732,102 @@ EOF;
$filterports=($filterports==""?"filterports = $filterport":$filterports);
include("/usr/local/pkg/dansguardian.conf.template");
-
+ #check cron_tab
+ $new_cron=array();
+ $cron_found=0;
+ if (is_array($config['cron']['item']))
+ foreach($config['cron']['item'] as $cron)
+ if (!preg_match("/usr.local.(bin.freshclam|www.dansguardian.php)/",$cron["command"])){
+ $cron_found++;
+ $new_cron['item'][]=$cron;
+ }
+ $cron_cmd="/usr/local/bin/freshclam";
+ if($dansguardian_config['cron'] && preg_match("/clamd/",$dansguardian_config['content_scanners']))
+ switch ($dansguardian_config['cron']){
+ case "day":
+ $new_cron['item'][]=array( "minute" => "0",
+ "hour" => "0",
+ "mday" => "*",
+ "month" => "*",
+ "wday" => "*",
+ "who" => "root",
+ "command"=> $cron_cmd);
+ $config['cron']=$new_cron;
+ $cron_found++;
+ break;
+ case "02days":
+ $new_cron['item'][]=array( "minute" => "0",
+ "hour" => "0",
+ "mday" => "*/2",
+ "month" => "*",
+ "wday" => "*",
+ "who" => "root",
+ "command"=> $cron_cmd);
+ $config['cron']=$new_cron;
+ $cron_found++;
+ break;
+ case "week":
+ $new_cron['item'][]=array( "minute" => "0",
+ "hour" => "0",
+ "mday" => "*/7",
+ "month" => "*",
+ "wday" => "*",
+ "who" => "root",
+ "command"=> $cron_cmd);
+ $config['cron']=$new_cron;
+ $cron_found++;
+ break;
+ }
+ $cron_cmd="/usr/local/bin/php /usr/local/www/dansguardian.php fetch_blacklist";
+ if($dansguardian_blacklist['cron'])
+ switch ($dansguardian_blacklist['cron']){
+ case "day":
+ $new_cron['item'][]=array( "minute" => "0",
+ "hour" => "0",
+ "mday" => "*",
+ "month" => "*",
+ "wday" => "*",
+ "who" => "root",
+ "command"=> $cron_cmd);
+ $config['cron']=$new_cron;
+ $cron_found++;
+ break;
+ case "02days":
+ $new_cron['item'][]=array( "minute" => "0",
+ "hour" => "0",
+ "mday" => "*/2",
+ "month" => "*",
+ "wday" => "*",
+ "who" => "root",
+ "command"=> $cron_cmd);
+ $config['cron']=$new_cron;
+ $cron_found++;
+ break;
+ case "week":
+ $new_cron['item'][]=array( "minute" => "0",
+ "hour" => "0",
+ "mday" => "*/7",
+ "month" => "*",
+ "wday" => "*",
+ "who" => "root",
+ "command"=> $cron_cmd);
+ $config['cron']=$new_cron;
+ $cron_found++;
+ break;
+ }
+
+
#write files
conf_mount_rw();
write_config();
+ #update cron
+ if ($cron_found > 0){
+ $config['cron']=$new_cron;
+ configure_cron();
+ }
+
$dirs=array('/usr/local/etc/dansguardian/lists/bannedrooms/',
'/var/log/dansguardian');
@@ -742,7 +847,8 @@ EOF;
if (preg_match("/clamd/",$dansguardian_config['content_scanners'])){
if (!file_exists('/var/db/clamav/main.cvd')){
- log_error('No clamav database found for dansguardian, running freshclam in background.');
+ file_notice("Dansguardian - No antivirus database found for clamav, running freshclam in background.","");
+ log_error('No antivirus database found for clamav, running freshclam in background.');
mwexec_bg('/usr/local/bin/freshclam');
}
@@ -778,7 +884,8 @@ EOF;
}
file_put_contents($script, $new_clamav_startup, LOCK_EX);
chmod ($script,0755);
- mwexec("$script stop");
+ if (file_exists('/var/run/dansguardian.pid'))
+ mwexec("$script stop");
unlink_if_exists("/tmp/.dguardianipc");
unlink_if_exists("/tmp/.dguardianurlipc");
mwexec_bg("$script start");
@@ -840,7 +947,7 @@ function dansguardian_php_deinstall_command() {
mwexec("/usr/local/etc/rc.d/dansguardian stop");
sleep(1);
conf_mount_rw();
- unlink_if_exists("/usr/local/etc/rc.d/dansguardian");
+ chmod ("/usr/local/etc/rc.d/dansguardian",0444);
conf_mount_ro();
}
diff --git a/config/dansguardian/dansguardian.php b/config/dansguardian/dansguardian.php
index 844d9fd3..520cdc5c 100644
--- a/config/dansguardian/dansguardian.php
+++ b/config/dansguardian/dansguardian.php
@@ -45,6 +45,7 @@ function fetch_blacklist(){
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"))
@@ -54,6 +55,7 @@ function fetch_blacklist(){
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","");
diff --git a/config/dansguardian/dansguardian.xml b/config/dansguardian/dansguardian.xml
index 4be2e402..b49bc0fc 100644
--- a/config/dansguardian/dansguardian.xml
+++ b/config/dansguardian/dansguardian.xml
@@ -50,7 +50,7 @@
<name>Dansguardian</name>
<tooltiptext>Configure dansguardian</tooltiptext>
<section>Services</section>
- <url>pkg_edit.php?xml=dansguardian.xml</url>
+ <url>/pkg_edit.php?xml=dansguardian.xml</url>
</menu>
<service>
<name>dansguardian</name>
@@ -314,7 +314,7 @@
<type>input</type>
<size>10</size>
<description><![CDATA[Default: <strong>3128</strong><br>
- Sets port number fro proxy server.]]></description>
+ Sets port number for proxy server.]]></description>
</field>
</fields>
diff --git a/config/dansguardian/dansguardian_config.xml b/config/dansguardian/dansguardian_config.xml
index 7e4eda17..c561de98 100644
--- a/config/dansguardian/dansguardian_config.xml
+++ b/config/dansguardian/dansguardian_config.xml
@@ -229,6 +229,19 @@
<size>3</size>
</field>
<field>
+ <fielddescr>freshclam frequency</fielddescr>
+ <fieldname>cron</fieldname>
+ <description><![CDATA[Default:<strong>Every day</strong><br>
+ Select how often pfsense will update clamd virus database]]></description>
+ <type>select</type>
+ <options>
+ <option><name>Every day</name><value>day</value></option>
+ <option><name>Every 2 days</name><value>02days</value></option>
+ <option><name>Once a week</name><value>week</value></option>
+ <option><name>Never</name><value>never</value></option>
+ </options>
+ </field>
+ <field>
<fielddescr>Content scanner timeout</fielddescr>
<fieldname>contentscannertimeout</fieldname>
<type>input</type>
diff --git a/config/dansguardian/dansguardian_log.xml b/config/dansguardian/dansguardian_log.xml
index 18e3db55..5fd49138 100644
--- a/config/dansguardian/dansguardian_log.xml
+++ b/config/dansguardian/dansguardian_log.xml
@@ -157,6 +157,16 @@
<size>5</size>
</field>
<field>
+ <fielddescr>Report file</fielddescr>
+ <fieldname>report_file</fieldname>
+ <description><![CDATA[Dansguardian template.html error page whithout head or html tags<br>
+ Leave empty to load dansguardian default report file]]></description>
+ <type>textarea</type>
+ <cols>75</cols>
+ <rows>15</rows>
+ <encoding>base64</encoding>
+ </field>
+ <field>
<name>Logging</name>
<type>listtopic</type>
</field>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 8c391826..e61c6e5d 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -416,7 +416,7 @@
<depends_on_package_base_url>http://e-sac.siteseguro.ws/packages/8/All/</depends_on_package_base_url>
<depends_on_package>dansguardian-2.12.0.0_1.tbz</depends_on_package>
<depends_on_package>clamav-0.97.3_1.tbz</depends_on_package>
- <version>2.12.0.0 pkg v.0.1.2</version>
+ <version>2.12.0.0 pkg v.0.1.3</version>
<status>beta</status>
<required_version>2.0</required_version>
<configurationfile>dansguardian.xml</configurationfile>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 1d8764db..cda307dc 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -521,7 +521,7 @@
<depends_on_package_base_url>http://e-sac.siteseguro.ws/packages/amd64/8/All/</depends_on_package_base_url>
<depends_on_package>dansguardian-2.12.0.0_1.tbz</depends_on_package>
<depends_on_package>clamav-0.97.3_1.tbz</depends_on_package>
- <version>2.12.0.0 pkg v.0.1.2</version>
+ <version>2.12.0.0 pkg v.0.1.3</version>
<status>beta</status>
<required_version>2.0</required_version>
<configurationfile>dansguardian.xml</configurationfile>