aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/dansguardian/blockedflash.swfbin2740 -> 0 bytes
-rwxr-xr-xconfig/dansguardian/dansguardian.conf.template32
-rwxr-xr-xconfig/dansguardian/dansguardian.inc81
-rw-r--r--config/dansguardian/dansguardian.php49
-rw-r--r--config/dansguardian/dansguardian.xml40
-rwxr-xr-xconfig/dansguardian/dansguardian_about.php10
-rwxr-xr-xconfig/dansguardian/dansguardian_antivirus_acl.xml76
-rw-r--r--config/dansguardian/dansguardian_blacklist.xml10
-rw-r--r--config/dansguardian/dansguardian_config.xml19
-rwxr-xr-xconfig/dansguardian/dansguardian_content_acl.xml83
-rwxr-xr-xconfig/dansguardian/dansguardian_file_acl.xml83
-rwxr-xr-xconfig/dansguardian/dansguardian_groups.xml13
-rwxr-xr-xconfig/dansguardian/dansguardian_header_acl.xml83
-rw-r--r--config/dansguardian/dansguardian_ips_header.xml8
-rw-r--r--config/dansguardian/dansguardian_ldap.php12
-rwxr-xr-xconfig/dansguardian/dansguardian_ldap.xml15
-rw-r--r--config/dansguardian/dansguardian_limits.xml10
-rw-r--r--config/dansguardian/dansguardian_log.xml10
-rwxr-xr-xconfig/dansguardian/dansguardian_phrase_acl.xml83
-rw-r--r--config/dansguardian/dansguardian_pics_acl.xml83
-rwxr-xr-xconfig/dansguardian/dansguardian_search_acl.xml83
-rwxr-xr-xconfig/dansguardian/dansguardian_site_acl.xml81
-rwxr-xr-xconfig/dansguardian/dansguardian_sync.xml10
-rwxr-xr-xconfig/dansguardian/dansguardian_url_acl.xml83
-rw-r--r--config/dansguardian/dansguardian_users_header.xml10
-rw-r--r--config/dansguardian/dansguardianfx.conf.template2
-rw-r--r--pkg_config.8.xml12
-rw-r--r--pkg_config.8.xml.amd6412
28 files changed, 784 insertions, 309 deletions
diff --git a/config/dansguardian/blockedflash.swf b/config/dansguardian/blockedflash.swf
deleted file mode 100644
index ef53ee44..00000000
--- a/config/dansguardian/blockedflash.swf
+++ /dev/null
Binary files differ
diff --git a/config/dansguardian/dansguardian.conf.template b/config/dansguardian/dansguardian.conf.template
index ab30527a..ed514eca 100755
--- a/config/dansguardian/dansguardian.conf.template
+++ b/config/dansguardian/dansguardian.conf.template
@@ -30,7 +30,7 @@
#create dansguardian.conf
$dg=<<<EOF
-# DansGuardian config file for version 2.12.0.0
+# DansGuardian config file for version 2.12.0.2
# **NOTE** as of version 2.7.5 most of the list files are now in dansguardianf1.conf
@@ -52,7 +52,7 @@ reportinglevel = {$reportlevel}
# and easier to customise the access denied page.
# The language file is used no matter what setting however.
#
-languagedir = '/usr/local/share/dansguardian/languages'
+languagedir = '{$dg_dir}/share/dansguardian/languages'
# language to use from languagedir.
language = '{$reportlanguage}'
@@ -131,6 +131,8 @@ proxyip = {$proxyip}
# the port DansGuardian connects to proxy on
proxyport = {$proxyport}
+proxytimeout = {$proxytimeout}
+
# Whether to retrieve the original destination IP in transparent proxy
# setups and check it against the domain pulled from the HTTP headers.
#
@@ -178,7 +180,7 @@ nonstandarddelimiter = {$nonstandarddelimiter}
# icons from banned domains.
# on (default) | off
usecustombannedimage = {$usecustombannedimage}
-custombannedimagefile = '/usr/local/share/dansguardian/transparent1x1.gif'
+custombannedimagefile = '{$dg_dir}/share/dansguardian/transparent1x1.gif'
#Banned flash replacement
@@ -194,18 +196,18 @@ usecustombannedflash = {$usecustombannedflash}
# to a group. The more filter groups the more copies of the lists will be in RAM so
# use as few as possible.
filtergroups = {$filtergroups}
-filtergroupslist = '/usr/local/etc/dansguardian/lists/filtergroupslist'
+filtergroupslist = '{$dansguardian_dir}/lists/filtergroupslist'
# Authentication files location
-bannediplist = '/usr/local/etc/dansguardian/lists/bannediplist'
-exceptioniplist = '/usr/local/etc/dansguardian/lists/exceptioniplist'
+bannediplist = '{$dansguardian_dir}/lists/bannediplist'
+exceptioniplist = '{$dansguardian_dir}/lists/exceptioniplist'
# Per-Room blocking definition directory
# A directory containing text files containing the room's name followed by IPs or ranges
# Think of it as bannediplist on crack
-perroomblockingdirectory = '/usr/local/etc/dansguardian/lists/bannedrooms/'
+perroomblockingdirectory = '{$dansguardian_dir}/lists/bannedrooms/'
# Show weighted phrases found
# If enabled then the phrases found that made up the total which excedes
@@ -475,9 +477,9 @@ trickledelay = {$trickledelay}
# one is forced to match as the default, regardless of user agent
# and other matching mechanisms.
#
-downloadmanager = '/usr/local/etc/dansguardian/downloadmanagers/fancy.conf'
-##!! Not compiled !! downloadmanager = '/usr/local/etc/dansguardian/downloadmanagers/trickle.conf'
-downloadmanager = '/usr/local/etc/dansguardian/downloadmanagers/default.conf'
+downloadmanager = '{$dansguardian_dir}/downloadmanagers/fancy.conf'
+##!! Not compiled !! downloadmanager = '{$dansguardian_dir}/downloadmanagers/trickle.conf'
+downloadmanager = '{$dansguardian_dir}/downloadmanagers/default.conf'
@@ -523,11 +525,11 @@ contentscanexceptions = {$contentscanexceptions}
#
# If you do not use multiple filter groups, you need not specify this option.
#
-#authplugin = '/usr/local/etc/dansguardian/authplugins/proxy-basic.conf'
-#authplugin = '/usr/local/etc/dansguardian/authplugins/proxy-digest.conf'
-#authplugin = '/usr/local/etc/dansguardian/authplugins/proxy-ntlm.conf'
-#authplugin = '/usr/local/etc/dansguardian/authplugins/ident.conf'
-#authplugin = '/usr/local/etc/dansguardian/authplugins/ip.conf'
+#authplugin = '{$dansguardian_dir}/authplugins/proxy-basic.conf'
+#authplugin = '{$dansguardian_dir}/authplugins/proxy-digest.conf'
+#authplugin = '{$dansguardian_dir}/authplugins/proxy-ntlm.conf'
+#authplugin = '{$dansguardian_dir}/authplugins/ident.conf'
+#authplugin = '{$dansguardian_dir}/authplugins/ip.conf'
{$authplugin}
diff --git a/config/dansguardian/dansguardian.inc b/config/dansguardian/dansguardian.inc
index c897f944..ae2b3264 100755
--- a/config/dansguardian/dansguardian.inc
+++ b/config/dansguardian/dansguardian.inc
@@ -2,13 +2,13 @@
/*
dansguardian.inc
part of the Dansguardian package for pfSense
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 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,
+ 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
@@ -90,7 +90,7 @@ function check_ca_hashes(){
}
}
-function sync_package_dansguardian($via_rpc=false) {
+function sync_package_dansguardian($via_rpc=false,$install_process=false) {
global $config,$g;
# detect boot process
@@ -136,7 +136,7 @@ function sync_package_dansguardian($via_rpc=false) {
#daemon options
$dansguardian_enabled=$dansguardian['enable_dg'];
$filterport=($dansguardian['filterports']?$dansguardian['filterports']:"8080");
- $softrestart=(preg_match('/softrestart/',$dansguardian['daemon_options'])?"yes":"no");
+ $softrestart=(preg_match('/softrestart/',$dansguardian['daemon_options'])?"on":"off");
$nodaemon=(preg_match('/nodaemon/',$dansguardian['daemon_options'])?"yes":"off");
if (preg_match("/(\d+)\/(\d+)/",$dansguardian['children'],$matches)){
$minchildren=$matches[1];
@@ -159,6 +159,7 @@ function sync_package_dansguardian($via_rpc=false) {
$preforkchildren=($dansguardian['preforkchildren']?$dansguardian['preforkchildren']:"10");
$proxyip=($dansguardian['proxyip']?$dansguardian['proxyip']:"127.0.0.1");
$proxyport=($dansguardian['proxyport']?$dansguardian['proxyport']:"127.0.0.1");
+ $proxytimeout=($dansguardian['proxytimeout']?$dansguardian['proxytimeout']:"30");
#general options
$urlcachenumber=($dansguardian_config['urlcachenumber']?$dansguardian_config['urlcachenumber']:"1000");
@@ -184,13 +185,14 @@ function sync_package_dansguardian($via_rpc=false) {
$recheckreplacedurls=(preg_match('/icapscan/',$dansguardian_config['misc_options'])?"on":"off");
$usexforwardedfor=(preg_match('/usexforwardedfor/',$dansguardian_config['misc_options'])?"on":"off");
$authplugin=(preg_match('/usr/',$dansguardian_config['auth_plugin'])?"authplugin = '".$dansguardian_config['auth_plugin']."'":"");
- /*if ($dansguardian_config['auth_plugin']!=""){
+ if ($dansguardian_config['auth_plugin']!=""){
$auth_plugins=explode(",",$dansguardian_config['auth_plugin']);
$authplugin="";
foreach ($auth_plugins as $auth_selected)
- $authplugin.="authplugin = '".$auth_selected."'\n";
+ if ($auth_selected != "none")
+ $authplugin.="authplugin = '".preg_replace("@/usr/local@",DANSGUARDIAN_DIR,$auth_selected)."'\n";
}
- */
+
#limits
$maxuploadsize=($dansguardian_limits['maxuploadsize']?$dansguardian_limits['maxuploadsize']:"-1");
$maxcontentfiltersize=($dansguardian_limits['maxcontentfiltersize']?$dansguardian_limits['maxcontentfiltersize']:"256");
@@ -214,8 +216,8 @@ function sync_package_dansguardian($via_rpc=false) {
$reportlanguage=($dansguardian_log['report_language']?$dansguardian_log['report_language']:"ukenglish");
$showweightedfound=(preg_match('/showweightedfound/',$dansguardian_log['report_options'])?"on":"off");
$usecustombannedflash=(preg_match('/usecustombannedflash/',$dansguardian_log['report_options'])?"on":"off");
- if (file_exists('/usr/local/share/dansguardian/blockedflash.swf'))
- $custombannedflashfile="custombannedflashfile = '/usr/local/share/dansguardian/blockedflash.swf'";
+ if (file_exists(DANSGUARDIAN_DIR.'/share/dansguardian/blockedflash.swf'))
+ $custombannedflashfile="custombannedflashfile = '".DANSGUARDIAN_DIR."/share/dansguardian/blockedflash.swf'";
$usecustombannedimage=(preg_match('/usecustombannedimage/',$dansguardian_log['report_options'])?"on":"off");
$nonstandarddelimiter=(preg_match('/nonstandarddelimiter/',$dansguardian_log['report_options'])?"on":"off");
@@ -317,7 +319,7 @@ function sync_package_dansguardian($via_rpc=false) {
$match[1]="/(\/usr.local)/";
$match[2]="/,/";
$replace[0]="$1'";
- $replace[1]="contentscanner = '$1";
+ $replace[1]="contentscanner = '".DANSGUARDIAN_DIR;
$replace[2]="\n";
$contentscanners=preg_replace($match,$replace,$dansguardian_config['content_scanners']);
@@ -327,7 +329,7 @@ function sync_package_dansguardian($via_rpc=false) {
$match[1]="/\/usr.local/";
$match[2]="/,/";
$replace[0]="$1>\n";
- $replace[1]="\n.Include</usr/local";
+ $replace[1]="\n.Include<".DANSGUARDIAN_DIR;
$replace[2]=">";
#phrase ACL
@@ -909,27 +911,32 @@ EOF;
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");
- file_notice("Dansguardian - Blacklist udpate process started","");
- file_put_contents("/root/dansguardian_custom.script",base64_decode($dansguardian_blacklist['custom_script']),LOCK_EX);
- if ($dansguardian_blacklist['enable_custom_script'] && $dansguardian_blacklist['custom_script'] != "")
- mwexec_bg("/root/dansguardian_custom.script");
- else
- mwexec_bg("/usr/local/bin/php /usr/local/www/dansguardian.php fetch_blacklist");
+ if ($install_process == true){
+ require_once("/usr/local/www/dansguardian.php");
+ fetch_blacklist(false);
+ }
+ else{
+ if ($dansguardian_blacklist['cron']=="force_download"){
+ log_error("Blacklist udpate process started");
+ file_notice("Dansguardian - Blacklist udpate process started","");
+ file_put_contents("/root/dansguardian_custom.script",base64_decode($dansguardian_blacklist['custom_script']),LOCK_EX);
+ if ($dansguardian_blacklist['enable_custom_script'] && $dansguardian_blacklist['custom_script'] != "")
+ mwexec_bg("/root/dansguardian_custom.script");
+ else
+ mwexec_bg("/usr/local/bin/php /usr/local/www/dansguardian.php fetch_blacklist");
+ }
+ #update xml categories from downloaded file
+ 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");
}
- #update xml categories from downloaded file
- 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");
- }
- #Import default blacklists
- if (!is_array($config['installedpackages']['dansguardianblacklistsurls']['config']))
- mwexec_bg("/usr/local/bin/php /usr/local/www/dansguardian.php update_lists");
-
+ #Import default blacklists
+ if (!is_array($config['installedpackages']['dansguardianblacklistsurls']['config']))
+ mwexec_bg("/usr/local/bin/php /usr/local/www/dansguardian.php update_lists");
+ }
#get clamav user
- $cconf="/usr/local/etc/clamd.conf";
+ $cconf= DANSGUARDIAN_DIR. "/etc/clamd.conf";
$cconf_file=file_get_contents($cconf);
if (preg_match("/User (\w+)/",$cconf_file,$matches)){
$daemonuser = $matches[1];
@@ -958,12 +965,12 @@ EOF;
$cron_found=0;
if (is_array($config['cron']['item']))
foreach($config['cron']['item'] as $cron)
- if (preg_match("/usr.local.(bin.freshclam|www.dansguardian)/",$cron["command"]))
+ if (preg_match("@".DANSGUARDIAN_DIR."/(bin.freshclam|www/dansguardian)@",$cron["command"]))
$cron_found++;
else
$new_cron['item'][]=$cron;
- $cron_cmd="/usr/local/bin/freshclam";
+ $cron_cmd= DANSGUARDIAN_DIR."/bin/freshclam";
if($dansguardian_config['cron'] && preg_match("/clamd/",$dansguardian_config['content_scanners']))
switch ($dansguardian_config['cron']){
case "day":
@@ -1076,7 +1083,7 @@ EOF;
configure_cron();
}
- $dirs=array('/usr/local/etc/dansguardian/lists/bannedrooms/',
+ $dirs=array(DANSGUARDIAN_DIR . '/etc/dansguardian/lists/bannedrooms/',
'/var/log/dansguardian');
foreach ($dirs as $dir)
@@ -1084,20 +1091,20 @@ EOF;
mkdir ($dir,0755,true);
#update file owner
- mwexec("chown -R $daemonuser:$daemongroup /usr/local/etc/dansguardian");
+ mwexec("chown -R $daemonuser:$daemongroup ".DANSGUARDIAN_DIR."/etc/dansguardian");
mwexec("chown -R $daemonuser:$daemongroup /var/log/dansguardian");
#create config files
file_put_contents($dansguardian_dir."/dansguardian.conf", $dg, LOCK_EX);
#check virus_scanner options
- $libexec_dir="/usr/local/libexec/dansguardian/";
+ $libexec_dir= DANSGUARDIAN_DIR."/libexec/dansguardian/";
if (preg_match("/clamd/",$dansguardian_config['content_scanners'])){
if (!(file_exists('/var/db/clamav/main.cvd')||file_exists('/var/db/clamav/main.cld'))){
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');
+ mwexec_bg(DANSGUARDIAN_DIR.'/bin/freshclam');
}
$match=array();
@@ -1114,7 +1121,7 @@ EOF;
}
#clamd conf file
- $cconf="/usr/local/etc/clamd.conf";
+ $cconf=DANSGUARDIAN_DIR."/etc/clamd.conf";
$cconf_file=file_get_contents($cconf);
if (preg_match("/User (\w+)/",$cconf_file,$matches)){
#clamd script file
@@ -1215,7 +1222,7 @@ function dansguardian_validate_input($post, &$input_errors) {
}
function dansguardian_php_install_command() {
- sync_package_dansguardian();
+ sync_package_dansguardian(false,true);
}
function dansguardian_php_deinstall_command() {
diff --git a/config/dansguardian/dansguardian.php b/config/dansguardian/dansguardian.php
index 675db6c7..d4dcf46c 100644
--- a/config/dansguardian/dansguardian.php
+++ b/config/dansguardian/dansguardian.php
@@ -4,7 +4,7 @@
/*
dansguardian.php
part of pfSense (http://www.pfSense.com)
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
@@ -13,7 +13,7 @@
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,
+ 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
@@ -38,25 +38,40 @@ 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() {
+
+function fetch_blacklist($log_notice=true) {
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),$output,$return);
+ if ($log_notice==true){
+ print "file download start..";
+ unlink_if_exists("/usr/local/pkg/blacklist.tgz");
+ exec("/usr/bin/fetch -o /usr/local/pkg/blacklist.tgz ".escapeshellarg($url),$output,$return);
+ }
+ else{
+ #install process
+ if (file_exists("/usr/local/pkg/blacklist.tgz")){
+ update_output_window("Found previous blacklist database, skipping download...");
+ $return=0;
+ }
+ else{
+ update_output_window("Fetching blacklist");
+ download_file_with_progress_bar($url, "/usr/local/pkg/blacklist.tgz");
+ if (file_exists("/usr/local/pkg/blacklist.tgz"))
+ $return=0;
+ }
+ }
if ($return == 0) {
- chdir ("/usr/local/etc/dansguardian/lists");
+ chdir (DANSGUARDIAN_DIR . "/etc/dansguardian/lists");
if (is_dir ("blacklists.old"))
- exec ('rm -rf /usr/local/etc/dansguardian/lists/blacklists.old');
+ exec ('rm -rf '.DANSGUARDIAN_DIR . '/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)) {
+ exec('/usr/bin/tar -xvzf /usr/local/pkg/blacklist.tgz 2>&1',$output,$return);
+ if (preg_match("/x\W+(\w+)/",$output[1],$matches)) {
if ($matches[1] != "blacklists")
rename("./".$matches[1],"blacklists");
- read_lists();
+ read_lists($log_notice);
}
else {
file_notice("Dansguardian - Could not determine Blacklist extract dir. Categories not updated","");
@@ -67,13 +82,14 @@ function fetch_blacklist() {
}
}
else {
- file_notice("Dansguardian - Blacklist url is invalid.","");
+ if (!empty($url))
+ file_notice("Dansguardian - Blacklist url is invalid.","");
}
}
-function read_lists(){
+function read_lists($log_notice=true){
global $config,$g;
$group_type=array();
- $dir="/usr/local/etc/dansguardian/lists";
+ $dir=DANSGUARDIAN_DIR . "/etc/dansguardian/lists";
#read dansguardian lists dirs
$groups= array("phraselists", "blacklists", "whitelists");
#assigns know list files
@@ -136,7 +152,8 @@ function read_lists(){
$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","");
+ if($log_notice==true)
+ 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";
diff --git a/config/dansguardian/dansguardian.xml b/config/dansguardian/dansguardian.xml
index 334c99e7..48b7b4a7 100644
--- a/config/dansguardian/dansguardian.xml
+++ b/config/dansguardian/dansguardian.xml
@@ -9,7 +9,7 @@
/*
dansguardian.xml
part of the dansguardian for pfSense
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
@@ -18,7 +18,7 @@
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,
+ 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
@@ -188,11 +188,6 @@
<prefix>/usr/local/pkg/</prefix>
<chmod>0755</chmod>
</additional_files_needed>
- <additional_files_needed>
- <item>http://www.pfsense.org/packages/config/dansguardian/blockedflash.swf</item>
- <prefix>/usr/local/share/dansguardian/</prefix>
- <chmod>0755</chmod>
- </additional_files_needed>
<tabs>
<tab>
<text>Daemon</text>
@@ -212,8 +207,8 @@
<url>/pkg_edit.php?xml=dansguardian_blacklist.xml&amp;id=0</url>
</tab>
<tab>
- <text>Access Lists</text>
- <url>/pkg_edit.php?xml=dansguardian_antivirus_acl.xml&amp;id=0</url>
+ <text>ACLs</text>
+ <url>/pkg.php?xml=dansguardian_site_acl.xml</url>
</tab>
<tab>
<text>LDAP</text>
@@ -236,7 +231,7 @@
<url>/pkg_edit.php?xml=dansguardian_log.xml&amp;id=0</url>
</tab>
<tab>
- <text>XMLRPC Sync</text>
+ <text>Sync</text>
<url>/pkg_edit.php?xml=dansguardian_sync.xml&amp;id=0</url>
</tab>
<tab>
@@ -258,7 +253,8 @@
<field>
<fielddescr>Listen Interface(s)</fielddescr>
<fieldname>interface</fieldname>
- <description><![CDATA[Default: <strong>LAN/loopback</strong><br>Select interface(s) that you want to dansguardian listen on.]]></description>
+ <description><![CDATA[Default: <strong>LAN/loopback</strong><br>Select interface(s) that you want to dansguardian listen on.<br>
+ <strong>Note: Do NOT select more then one interface if you plan to use more then one authentication plugin.</strong>]]></description>
<type>interfaces_selection</type>
<required/>
<multiple/>
@@ -349,10 +345,28 @@
<description><![CDATA[Default: <strong>3128</strong><br>
Sets port number for proxy server.]]></description>
</field>
-
+ <field>
+ <fielddescr>Proxy Time out</fielddescr>
+ <fieldname>proxytimeout</fieldname>
+ <description><![CDATA[This option handle max time to wait for proxy server.]]></description>
+ <type>select</type>
+ <options>
+ <option><name>30 seconds (default)</name><value>30</value></option>
+ <option><name>20 seconds</name><value>20</value></option>
+ <option><name>40 seconds</name><value>40</value></option>
+ <option><name>50 seconds</name><value>50</value></option>
+ <option><name>60 seconds</name><value>60</value></option>
+ <option><name>70 seconds</name><value>70</value></option>
+ <option><name>80 seconds</name><value>80</value></option>
+ <option><name>90 seconds</name><value>90</value></option>
+ <default_value>30</default_value>
+ </options>
+ </field>
</fields>
<custom_php_install_command>
- dansguardian_php_install_command();
+ update_status("Checking Dansguardian Blacklists... One moment please...");
+ update_output_window("This operation may take quite some time, please be patient. Do not press stop or attempt to navigate away from this page during this process.");
+ dansguardian_php_install_command(false,true);
</custom_php_install_command>
<custom_php_deinstall_command>
dansguardian_php_deinstall_command();
diff --git a/config/dansguardian/dansguardian_about.php b/config/dansguardian/dansguardian_about.php
index 07b5768e..b7834281 100755
--- a/config/dansguardian/dansguardian_about.php
+++ b/config/dansguardian/dansguardian_about.php
@@ -53,16 +53,16 @@ include("head.inc");
<?php
$tab_array = array();
$tab_array[] = array(gettext("Daemon"), false, "/pkg_edit.php?xml=dansguardian.xml&id=0");
- $tab_array[] = array(gettext("General"), false, "/pkg_edit.php?xml=dansguardian_general.xml&id=0");
+ $tab_array[] = array(gettext("General"), false, "/pkg_edit.php?xml=dansguardian_config.xml&id=0");
$tab_array[] = array(gettext("Limits"), false, "/pkg_edit.php?xml=dansguardian_limits.xml&id=0");
$tab_array[] = array(gettext("Blacklist"), false, "/pkg_edit.php?xml=dansguardian_blacklist.xml&id=0");
- $tab_array[] = array(gettext("Access Lists"), false, "/pkg_edit.php?xml=dansguardian_antivirus.xml&id=0");
+ $tab_array[] = array(gettext("ACLs"), false, "/pkg.php?xml=dansguardian_site_acl.xml");
$tab_array[] = array(gettext("LDAP"), false, "/pkg.php?xml=dansguardian_ldap.xml&id=0");
$tab_array[] = array(gettext("Groups"), false, "/pkg.php?xml=dansguardian_groups.xml&id=0");
- $tab_array[] = array(gettext("Users"), false, "/pkg.php?xml=dansguardian_users.xml&id=0");
- $tab_array[] = array(gettext("IPs"), false, "/pkg.php?xml=dansguardian_ips.xml&id=0");
+ $tab_array[] = array(gettext("Users"), false, "/pkg_edit.php?xml=dansguardian_users.xml&id=0");
+ $tab_array[] = array(gettext("IPs"), false, "/pkg_edit.php?xml=dansguardian_ips.xml&id=0");
$tab_array[] = array(gettext("Report and Log"), false, "/pkg_edit.php?xml=dansguardian_log.xml&id=0");
- $tab_array[] = array(gettext("XMLRPC Sync"), false, "/pkg_edit.php?xml=dansguardian_sync.xml&id=0");
+ $tab_array[] = array(gettext("Sync"), false, "/pkg_edit.php?xml=dansguardian_sync.xml&id=0");
$tab_array[] = array(gettext("Help"), true, "/dansguardian_about.php");
display_top_tabs($tab_array);
?>
diff --git a/config/dansguardian/dansguardian_antivirus_acl.xml b/config/dansguardian/dansguardian_antivirus_acl.xml
index 21c5c17e..563d3f13 100755
--- a/config/dansguardian/dansguardian_antivirus_acl.xml
+++ b/config/dansguardian/dansguardian_antivirus_acl.xml
@@ -46,54 +46,100 @@
<title>Services: Dansguardian - Access Lists</title>
<include_file>/usr/local/pkg/dansguardian.inc</include_file>
<tabs>
- <tab>
- <text>Back to config</text>
+<tab>
+ <text>Daemon</text>
<url>/pkg_edit.php?xml=dansguardian.xml&amp;id=0</url>
</tab>
<tab>
+ <text>General</text>
+ <url>/pkg_edit.php?xml=dansguardian_config.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Limits</text>
+ <url>/pkg_edit.php?xml=dansguardian_limits.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Blacklist</text>
+ <url>/pkg_edit.php?xml=dansguardian_blacklist.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>ACLs</text>
+ <url>/pkg.php?xml=dansguardian_site_acl.xml</url>
+ <active/>
+ </tab>
+ <tab>
+ <text>LDAP</text>
+ <url>/pkg.php?xml=dansguardian_ldap.xml</url>
+ </tab>
+ <tab>
+ <text>Groups</text>
+ <url>/pkg.php?xml=dansguardian_groups.xml</url>
+ </tab>
+ <tab>
+ <text>Users</text>
+ <url>/pkg_edit.php?xml=dansguardian_users.xml</url>
+ </tab>
+ <tab>
+ <text>IPs</text>
+ <url>/pkg_edit.php?xml=dansguardian_ips.xml</url>
+ </tab>
+ <tab>
+ <text>Report and log</text>
+ <url>/pkg_edit.php?xml=dansguardian_log.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Sync</text>
+ <url>/pkg_edit.php?xml=dansguardian_sync.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Help</text>
+ <url>/dansguardian_about.php</url>
+ </tab>
+ <tab>
<text>Antivirus</text>
<url>/pkg_edit.php?xml=dansguardian_antivirus_acl.xml&amp;id=0</url>
<active/>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Pics</text>
<url>/pkg.php?xml=dansguardian_pics_acl.xml&amp;id=0</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Phase</text>
+ <text>Phrase Lists</text>
<url>/pkg.php?xml=dansguardian_phrase_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Site</text>
+ <text>Site Lists</text>
<url>/pkg.php?xml=dansguardian_site_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>URL</text>
+ <text>URL Lists</text>
<url>/pkg.php?xml=dansguardian_url_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Extension</text>
+ <text>Extension Lists</text>
<url>/pkg.php?xml=dansguardian_file_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Content</text>
+ <text>Content Lists</text>
<url>/pkg.php?xml=dansguardian_content_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Header</text>
<url>/pkg.php?xml=dansguardian_header_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Searche Engine</text>
<url>/pkg.php?xml=dansguardian_search_acl.xml</url>
- </tab>
- <tab>
- <text>Groups</text>
- <url>/pkg.php?xml=dansguardian_groups.xml</url>
- </tab>
- <tab>
- <text>Users</text>
- <url>/pkg_edit.php?xml=dansguardian_users.xml</url>
+ <tab_level>2</tab_level>
</tab>
</tabs>
<fields>
diff --git a/config/dansguardian/dansguardian_blacklist.xml b/config/dansguardian/dansguardian_blacklist.xml
index d95558e6..e9cba862 100644
--- a/config/dansguardian/dansguardian_blacklist.xml
+++ b/config/dansguardian/dansguardian_blacklist.xml
@@ -9,7 +9,7 @@
/*
dansguardian_limits.xml
part of the dansguardian for pfSense
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
@@ -18,7 +18,7 @@
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,
+ 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
@@ -65,8 +65,8 @@
<active/>
</tab>
<tab>
- <text>Access Lists</text>
- <url>/pkg_edit.php?xml=dansguardian_antivirus_acl.xml&amp;id=0</url>
+ <text>ACLs</text>
+ <url>/pkg.php?xml=dansguardian_site_acl.xml</url>
</tab>
<tab>
<text>LDAP</text>
@@ -89,7 +89,7 @@
<url>/pkg_edit.php?xml=dansguardian_log.xml&amp;id=0</url>
</tab>
<tab>
- <text>XMLRPC Sync</text>
+ <text>Sync</text>
<url>/pkg_edit.php?xml=dansguardian_sync.xml&amp;id=0</url>
</tab>
<tab>
diff --git a/config/dansguardian/dansguardian_config.xml b/config/dansguardian/dansguardian_config.xml
index 0c14a7bb..35b0bf5b 100644
--- a/config/dansguardian/dansguardian_config.xml
+++ b/config/dansguardian/dansguardian_config.xml
@@ -9,7 +9,7 @@
/*
dansguardian_config.xml
part of the dansguardian for pfSense
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
@@ -18,7 +18,7 @@
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,
+ 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
@@ -65,8 +65,8 @@
<url>/pkg_edit.php?xml=dansguardian_blacklist.xml&amp;id=0</url>
</tab>
<tab>
- <text>Access Lists</text>
- <url>/pkg_edit.php?xml=dansguardian_antivirus_acl.xml&amp;id=0</url>
+ <text>ACLs</text>
+ <url>/pkg.php?xml=dansguardian_site_acl.xml</url>
</tab>
<tab>
<text>LDAP</text>
@@ -89,7 +89,7 @@
<url>/pkg_edit.php?xml=dansguardian_log.xml&amp;id=0</url>
</tab>
<tab>
- <text>XMLRPC Sync</text>
+ <text>Sync</text>
<url>/pkg_edit.php?xml=dansguardian_sync.xml&amp;id=0</url>
</tab>
<tab>
@@ -106,7 +106,9 @@
<fielddescr>Auth Plugins</fielddescr>
<fieldname>auth_plugin</fieldname>
<description><![CDATA[This option handle the extraction of client usernames from various sources, such as Proxy-Authorisation headers and ident servers,
- enabling requests to be handled according to the settings of the user's filter group]]></description>
+ enabling requests to be handled according to the settings of the user's filter group.<br>
+ Use CTRL + click for multiple select.<br>
+ <strong>Note: Do NOT select more then one auth plugin if you plan to use more then one listening interface.</strong>]]></description>
<type>select</type>
<options>
<option><name>Proxy-Basic</name><value>/usr/local/etc/dansguardian/authplugins/proxy-basic.conf</value></option>
@@ -116,11 +118,14 @@
<option><name>Ip Address</name><value>/usr/local/etc/dansguardian/authplugins/ip.conf</value></option>
<option><name>none</name><value>none</value></option>
</options>
+ <multiple/>
+ <size>7</size>
</field>
<field>
<fielddescr>Scan Options</fielddescr>
<fieldname>scan_options</fieldname>
- <description><![CDATA[Scan options. Default values are in ( )]]></description>
+ <description><![CDATA[Scan options. Default values are in ( )<br>
+ Use CTRL + click for multiple select.]]></description>
<type>select</type>
<options>
<option><name>Scan clean cache (on)</name><value>scancleancache</value></option>
diff --git a/config/dansguardian/dansguardian_content_acl.xml b/config/dansguardian/dansguardian_content_acl.xml
index 1302d89c..8a1866af 100755
--- a/config/dansguardian/dansguardian_content_acl.xml
+++ b/config/dansguardian/dansguardian_content_acl.xml
@@ -8,7 +8,7 @@
/*
dansguardian_content_acl.xml
part of pfSense (http://www.pfSense.com)
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
@@ -17,7 +17,7 @@
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,
+ 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
@@ -46,54 +46,100 @@
<title>Services: Dansguardian - Access Lists</title>
<include_file>/usr/local/pkg/dansguardian.inc</include_file>
<tabs>
- <tab>
- <text>Back to Config</text>
+<tab>
+ <text>Daemon</text>
<url>/pkg_edit.php?xml=dansguardian.xml&amp;id=0</url>
</tab>
<tab>
+ <text>General</text>
+ <url>/pkg_edit.php?xml=dansguardian_config.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Limits</text>
+ <url>/pkg_edit.php?xml=dansguardian_limits.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Blacklist</text>
+ <url>/pkg_edit.php?xml=dansguardian_blacklist.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>ACLs</text>
+ <url>/pkg.php?xml=dansguardian_site_acl.xml</url>
+ <active/>
+ </tab>
+ <tab>
+ <text>LDAP</text>
+ <url>/pkg.php?xml=dansguardian_ldap.xml</url>
+ </tab>
+ <tab>
+ <text>Groups</text>
+ <url>/pkg.php?xml=dansguardian_groups.xml</url>
+ </tab>
+ <tab>
+ <text>Users</text>
+ <url>/pkg_edit.php?xml=dansguardian_users.xml</url>
+ </tab>
+ <tab>
+ <text>IPs</text>
+ <url>/pkg_edit.php?xml=dansguardian_ips.xml</url>
+ </tab>
+ <tab>
+ <text>Report and log</text>
+ <url>/pkg_edit.php?xml=dansguardian_log.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Sync</text>
+ <url>/pkg_edit.php?xml=dansguardian_sync.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Help</text>
+ <url>/dansguardian_about.php</url>
+ </tab>
+ <tab>
<text>Antivirus</text>
<url>/pkg_edit.php?xml=dansguardian_antivirus_acl.xml&amp;id=0</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Pics</text>
<url>/pkg.php?xml=dansguardian_pics_acl.xml&amp;id=0</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Phrase</text>
+ <text>Phrase Lists</text>
<url>/pkg.php?xml=dansguardian_phrase_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Site</text>
+ <text>Site Lists</text>
<url>/pkg.php?xml=dansguardian_site_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>URL</text>
+ <text>URL Lists</text>
<url>/pkg.php?xml=dansguardian_url_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Extension</text>
+ <text>Extension Lists</text>
<url>/pkg.php?xml=dansguardian_file_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Content</text>
+ <text>Content Lists</text>
<url>/pkg.php?xml=dansguardian_content_acl.xml</url>
+ <tab_level>2</tab_level>
<active/>
</tab>
<tab>
<text>Header</text>
<url>/pkg.php?xml=dansguardian_header_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Searche Engine</text>
<url>/pkg.php?xml=dansguardian_search_acl.xml</url>
- </tab>
- <tab>
- <text>Groups</text>
- <url>/pkg.php?xml=dansguardian_groups.xml</url>
- </tab>
- <tab>
- <text>Users</text>
- <url>/pkg_edit.php?xml=dansguardian_users.xml</url>
+ <tab_level>2</tab_level>
</tab>
</tabs>
<adddeleteeditpagefields>
@@ -104,7 +150,8 @@
<columnitem>
<fielddescr>Description</fielddescr>
<fieldname>description</fieldname>
- </columnitem>
+ </columnitem>
+ <movable>on</movable>
</adddeleteeditpagefields>
<fields>
<field>
diff --git a/config/dansguardian/dansguardian_file_acl.xml b/config/dansguardian/dansguardian_file_acl.xml
index 808fb4e2..ed4866c6 100755
--- a/config/dansguardian/dansguardian_file_acl.xml
+++ b/config/dansguardian/dansguardian_file_acl.xml
@@ -8,7 +8,7 @@
/*
dansguardian_file_acl.xml
part of pfSense (http://www.pfSense.com)
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
@@ -17,7 +17,7 @@
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,
+ 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
@@ -46,54 +46,100 @@
<title>Services: Dansguardian - Access Lists</title>
<include_file>/usr/local/pkg/dansguardian.inc</include_file>
<tabs>
- <tab>
- <text>Back to Config</text>
+<tab>
+ <text>Daemon</text>
<url>/pkg_edit.php?xml=dansguardian.xml&amp;id=0</url>
</tab>
<tab>
+ <text>General</text>
+ <url>/pkg_edit.php?xml=dansguardian_config.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Limits</text>
+ <url>/pkg_edit.php?xml=dansguardian_limits.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Blacklist</text>
+ <url>/pkg_edit.php?xml=dansguardian_blacklist.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>ACLs</text>
+ <url>/pkg.php?xml=dansguardian_site_acl.xml</url>
+ <active/>
+ </tab>
+ <tab>
+ <text>LDAP</text>
+ <url>/pkg.php?xml=dansguardian_ldap.xml</url>
+ </tab>
+ <tab>
+ <text>Groups</text>
+ <url>/pkg.php?xml=dansguardian_groups.xml</url>
+ </tab>
+ <tab>
+ <text>Users</text>
+ <url>/pkg_edit.php?xml=dansguardian_users.xml</url>
+ </tab>
+ <tab>
+ <text>IPs</text>
+ <url>/pkg_edit.php?xml=dansguardian_ips.xml</url>
+ </tab>
+ <tab>
+ <text>Report and log</text>
+ <url>/pkg_edit.php?xml=dansguardian_log.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Sync</text>
+ <url>/pkg_edit.php?xml=dansguardian_sync.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Help</text>
+ <url>/dansguardian_about.php</url>
+ </tab>
+ <tab>
<text>Antivirus</text>
<url>/pkg_edit.php?xml=dansguardian_antivirus_acl.xml&amp;id=0</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Pics</text>
<url>/pkg.php?xml=dansguardian_pics_acl.xml&amp;id=0</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Phrase</text>
+ <text>Phrase Lists</text>
<url>/pkg.php?xml=dansguardian_phrase_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Site</text>
+ <text>Site Lists</text>
<url>/pkg.php?xml=dansguardian_site_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>URL</text>
+ <text>URL Lists</text>
<url>/pkg.php?xml=dansguardian_url_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Extension</text>
+ <text>Extension Lists</text>
<url>/pkg.php?xml=dansguardian_file_acl.xml</url>
+ <tab_level>2</tab_level>
<active/>
</tab>
<tab>
- <text>Content</text>
+ <text>Content Lists</text>
<url>/pkg.php?xml=dansguardian_content_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Header</text>
<url>/pkg.php?xml=dansguardian_header_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Searche Engine</text>
<url>/pkg.php?xml=dansguardian_search_acl.xml</url>
- </tab>
- <tab>
- <text>Groups</text>
- <url>/pkg.php?xml=dansguardian_groups.xml</url>
- </tab>
- <tab>
- <text>Users</text>
- <url>/pkg_edit.php?xml=dansguardian_users.xml</url>
+ <tab_level>2</tab_level>
</tab>
</tabs>
<adddeleteeditpagefields>
@@ -104,7 +150,8 @@
<columnitem>
<fielddescr>Description</fielddescr>
<fieldname>description</fieldname>
- </columnitem>
+ </columnitem>
+ <movable>on</movable>
</adddeleteeditpagefields>
<fields>
<field>
diff --git a/config/dansguardian/dansguardian_groups.xml b/config/dansguardian/dansguardian_groups.xml
index 9498ef4c..031ae88b 100755
--- a/config/dansguardian/dansguardian_groups.xml
+++ b/config/dansguardian/dansguardian_groups.xml
@@ -8,7 +8,7 @@
/*
dansguardian_groups.xml
part of pfSense (http://www.pfSense.com)
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
@@ -17,7 +17,7 @@
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,
+ 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
@@ -63,8 +63,8 @@
<url>/pkg_edit.php?xml=dansguardian_blacklist.xml&amp;id=0</url>
</tab>
<tab>
- <text>Access Lists</text>
- <url>/pkg_edit.php?xml=dansguardian_antivirus_acl.xml&amp;id=0</url>
+ <text>ACLs</text>
+ <url>/pkg.php?xml=dansguardian_site_acl.xml</url>
</tab>
<tab>
<text>LDAP</text>
@@ -88,7 +88,7 @@
<url>/pkg_edit.php?xml=dansguardian_log.xml&amp;id=0</url>
</tab>
<tab>
- <text>XMLRPC Sync</text>
+ <text>Sync</text>
<url>/pkg_edit.php?xml=dansguardian_sync.xml&amp;id=0</url>
</tab>
<tab>
@@ -112,7 +112,8 @@
<columnitem>
<fielddescr>Description</fielddescr>
<fieldname>description</fieldname>
- </columnitem>
+ </columnitem>
+ <movable>on</movable>
</adddeleteeditpagefields>
<fields>
<field>
diff --git a/config/dansguardian/dansguardian_header_acl.xml b/config/dansguardian/dansguardian_header_acl.xml
index 4d120a7b..9ddb0c23 100755
--- a/config/dansguardian/dansguardian_header_acl.xml
+++ b/config/dansguardian/dansguardian_header_acl.xml
@@ -8,7 +8,7 @@
/*
dansguardian_header_acl.xml
part of pfSense (http://www.pfSense.com)
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
@@ -17,7 +17,7 @@
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,
+ 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
@@ -46,54 +46,100 @@
<title>Services: Dansguardian - Access Lists</title>
<include_file>/usr/local/pkg/dansguardian.inc</include_file>
<tabs>
- <tab>
- <text>Back to Config</text>
+<tab>
+ <text>Daemon</text>
<url>/pkg_edit.php?xml=dansguardian.xml&amp;id=0</url>
</tab>
<tab>
+ <text>General</text>
+ <url>/pkg_edit.php?xml=dansguardian_config.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Limits</text>
+ <url>/pkg_edit.php?xml=dansguardian_limits.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Blacklist</text>
+ <url>/pkg_edit.php?xml=dansguardian_blacklist.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>ACLs</text>
+ <url>/pkg.php?xml=dansguardian_site_acl.xml</url>
+ <active/>
+ </tab>
+ <tab>
+ <text>LDAP</text>
+ <url>/pkg.php?xml=dansguardian_ldap.xml</url>
+ </tab>
+ <tab>
+ <text>Groups</text>
+ <url>/pkg.php?xml=dansguardian_groups.xml</url>
+ </tab>
+ <tab>
+ <text>Users</text>
+ <url>/pkg_edit.php?xml=dansguardian_users.xml</url>
+ </tab>
+ <tab>
+ <text>IPs</text>
+ <url>/pkg_edit.php?xml=dansguardian_ips.xml</url>
+ </tab>
+ <tab>
+ <text>Report and log</text>
+ <url>/pkg_edit.php?xml=dansguardian_log.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Sync</text>
+ <url>/pkg_edit.php?xml=dansguardian_sync.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Help</text>
+ <url>/dansguardian_about.php</url>
+ </tab>
+ <tab>
<text>Antivirus</text>
<url>/pkg_edit.php?xml=dansguardian_antivirus_acl.xml&amp;id=0</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Pics</text>
<url>/pkg.php?xml=dansguardian_pics_acl.xml&amp;id=0</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Phrase</text>
+ <text>Phrase Lists</text>
<url>/pkg.php?xml=dansguardian_phrase_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Site</text>
+ <text>Site Lists</text>
<url>/pkg.php?xml=dansguardian_site_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>URL</text>
+ <text>URL Lists</text>
<url>/pkg.php?xml=dansguardian_url_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Extension</text>
+ <text>Extension Lists</text>
<url>/pkg.php?xml=dansguardian_file_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Content</text>
+ <text>Content Lists</text>
<url>/pkg.php?xml=dansguardian_content_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Header</text>
<url>/pkg.php?xml=dansguardian_header_acl.xml</url>
+ <tab_level>2</tab_level>
<active/>
</tab>
<tab>
<text>Searche Engine</text>
<url>/pkg.php?xml=dansguardian_search_acl.xml</url>
- </tab>
- <tab>
- <text>Groups</text>
- <url>/pkg.php?xml=dansguardian_groups.xml</url>
- </tab>
- <tab>
- <text>Users</text>
- <url>/pkg_edit.php?xml=dansguardian_users.xml</url>
+ <tab_level>2</tab_level>
</tab>
</tabs>
<adddeleteeditpagefields>
@@ -104,7 +150,8 @@
<columnitem>
<fielddescr>Description</fielddescr>
<fieldname>description</fieldname>
- </columnitem>
+ </columnitem>
+ <movable>on</movable>
</adddeleteeditpagefields>
<fields>
<field>
diff --git a/config/dansguardian/dansguardian_ips_header.xml b/config/dansguardian/dansguardian_ips_header.xml
index c15e31da..48eb3e68 100644
--- a/config/dansguardian/dansguardian_ips_header.xml
+++ b/config/dansguardian/dansguardian_ips_header.xml
@@ -9,7 +9,7 @@
/*
dansguardian_ips.xml
part of the dansguardian for pfSense
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
@@ -18,7 +18,7 @@
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,
+ 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
@@ -64,7 +64,7 @@
</tab>
<tab>
<text>Access Lists</text>
- <url>/pkg_edit.php?xml=dansguardian_antivirus_acl.xml&amp;id=0</url>
+ <url>/pkg_edit.php?xml=dansguardian_site_acl.xml&amp;id=0</url>
</tab>
<tab>
<text>LDAP</text>
@@ -88,7 +88,7 @@
<url>/pkg_edit.php?xml=dansguardian_log.xml&amp;id=0</url>
</tab>
<tab>
- <text>XMLRPC Sync</text>
+ <text>Sync</text>
<url>/pkg_edit.php?xml=dansguardian_sync.xml&amp;id=0</url>
</tab>
<tab>
diff --git a/config/dansguardian/dansguardian_ldap.php b/config/dansguardian/dansguardian_ldap.php
index c02289ac..d44f3de4 100644
--- a/config/dansguardian/dansguardian_ldap.php
+++ b/config/dansguardian/dansguardian_ldap.php
@@ -8,7 +8,7 @@
/*
dansguardian_ldap.php
part of pfSense (http://www.pfSense.com)
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
@@ -17,7 +17,7 @@
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,
+ 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
@@ -107,7 +107,13 @@ if (is_array($config['installedpackages']['dansguardiangroups']['config']))
$ldap_dn = $server['dn'];
$ldap_host=$server['dc'];
$mask=(empty($server['mask'])?"USER":$server['mask']);
- $result = get_ldap_members($group['name'],$server['username'].','.$server['dn'],$server['password']);
+ if (preg_match("/cn/",$server['username']))
+ $ldap_username=$server['username'].",".$server['dn'];
+ else
+ $ldap_username=$server['username'];
+ #$domainuser=split("cn=",$server['username']);
+ #$ldap_username=preg_replace("/,\./","@",$domainuser[1].preg_replace("/(,|)DC=/i",".",$server['dn']));
+ $result = get_ldap_members($group['name'],$ldap_username,$server['password']);
foreach($result as $key => $value) {
if (preg_match ("/\w+/",$value[0])){
#var_dump($value);
diff --git a/config/dansguardian/dansguardian_ldap.xml b/config/dansguardian/dansguardian_ldap.xml
index 3411f483..4c2b60f7 100755
--- a/config/dansguardian/dansguardian_ldap.xml
+++ b/config/dansguardian/dansguardian_ldap.xml
@@ -8,7 +8,7 @@
/*
dansguardian_ldap.xml
part of pfSense (http://www.pfSense.com)
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
@@ -17,7 +17,7 @@
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,
+ 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
@@ -63,8 +63,8 @@
<url>/pkg_edit.php?xml=dansguardian_blacklist.xml&amp;id=0</url>
</tab>
<tab>
- <text>Access Lists</text>
- <url>/pkg_edit.php?xml=dansguardian_antivirus_acl.xml&amp;id=0</url>
+ <text>ACLs</text>
+ <url>/pkg.php?xml=dansguardian_site_acl.xml</url>
</tab>
<tab>
<text>LDAP</text>
@@ -88,7 +88,7 @@
<url>/pkg_edit.php?xml=dansguardian_log.xml&amp;id=0</url>
</tab>
<tab>
- <text>XMLRPC Sync</text>
+ <text>Sync</text>
<url>/pkg_edit.php?xml=dansguardian_sync.xml&amp;id=0</url>
</tab>
<tab>
@@ -109,7 +109,8 @@
<columnitem>
<fielddescr>username</fielddescr>
<fieldname>username</fieldname>
- </columnitem>
+ </columnitem>
+ <movable>on</movable>
</adddeleteeditpagefields>
<fields>
<field>
@@ -132,7 +133,7 @@
</field>
<field>
<fielddescr>Username</fielddescr>
- <description><![CDATA[Username Example:<strong>cn=antispam,cn=Users</strong>]]></description>
+ <description><![CDATA[Username Example:<strong>cn=antispam,cn=Users OR username@mysite.com</strong>]]></description>
<fieldname>username</fieldname>
<type>input</type>
<size>25</size>
diff --git a/config/dansguardian/dansguardian_limits.xml b/config/dansguardian/dansguardian_limits.xml
index 4974bc7d..c8011357 100644
--- a/config/dansguardian/dansguardian_limits.xml
+++ b/config/dansguardian/dansguardian_limits.xml
@@ -9,7 +9,7 @@
/*
dansguardian_limits.xml
part of the dansguardian for pfSense
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
@@ -18,7 +18,7 @@
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,
+ 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
@@ -65,8 +65,8 @@
<url>/pkg_edit.php?xml=dansguardian_blacklist.xml&amp;id=0</url>
</tab>
<tab>
- <text>Access Lists</text>
- <url>/pkg_edit.php?xml=dansguardian_antivirus_acl.xml&amp;id=0</url>
+ <text>ACLs</text>
+ <url>/pkg.php?xml=dansguardian_site_acl.xml</url>
</tab>
<tab>
<text>LDAP</text>
@@ -89,7 +89,7 @@
<url>/pkg_edit.php?xml=dansguardian_log.xml&amp;id=0</url>
</tab>
<tab>
- <text>XMLRPC Sync</text>
+ <text>Sync</text>
<url>/pkg_edit.php?xml=dansguardian_sync.xml&amp;id=0</url>
</tab>
<tab>
diff --git a/config/dansguardian/dansguardian_log.xml b/config/dansguardian/dansguardian_log.xml
index a9b9d0e9..88281dff 100644
--- a/config/dansguardian/dansguardian_log.xml
+++ b/config/dansguardian/dansguardian_log.xml
@@ -9,7 +9,7 @@
/*
dansguardian_log.xml
part of the Dansguardian package for pfSense
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
@@ -18,7 +18,7 @@
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,
+ 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
@@ -64,8 +64,8 @@
<url>/pkg_edit.php?xml=dansguardian_blacklist.xml&amp;id=0</url>
</tab>
<tab>
- <text>Access Lists</text>
- <url>/pkg_edit.php?xml=dansguardian_antivirus_acl.xml&amp;id=0</url>
+ <text>ACLs</text>
+ <url>/pkg.php?xml=dansguardian_site_acl.xml</url>
</tab>
<tab>
<text>LDAP</text>
@@ -89,7 +89,7 @@
<active/>
</tab>
<tab>
- <text>XMLRPC Sync</text>
+ <text>Sync</text>
<url>/pkg_edit.php?xml=dansguardian_sync.xml&amp;id=0</url>
</tab>
<tab>
diff --git a/config/dansguardian/dansguardian_phrase_acl.xml b/config/dansguardian/dansguardian_phrase_acl.xml
index 74448bee..c32f7720 100755
--- a/config/dansguardian/dansguardian_phrase_acl.xml
+++ b/config/dansguardian/dansguardian_phrase_acl.xml
@@ -8,7 +8,7 @@
/*
dansguardian_phrase_acl.xml
part of pfSense (http://www.pfSense.com)
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
@@ -17,7 +17,7 @@
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,
+ 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
@@ -46,54 +46,100 @@
<title>Services: Dansguardian - Access Lists</title>
<include_file>/usr/local/pkg/dansguardian.inc</include_file>
<tabs>
- <tab>
- <text>Back to Config</text>
+<tab>
+ <text>Daemon</text>
<url>/pkg_edit.php?xml=dansguardian.xml&amp;id=0</url>
</tab>
<tab>
+ <text>General</text>
+ <url>/pkg_edit.php?xml=dansguardian_config.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Limits</text>
+ <url>/pkg_edit.php?xml=dansguardian_limits.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Blacklist</text>
+ <url>/pkg_edit.php?xml=dansguardian_blacklist.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>ACLs</text>
+ <url>/pkg.php?xml=dansguardian_site_acl.xml</url>
+ <active/>
+ </tab>
+ <tab>
+ <text>LDAP</text>
+ <url>/pkg.php?xml=dansguardian_ldap.xml</url>
+ </tab>
+ <tab>
+ <text>Groups</text>
+ <url>/pkg.php?xml=dansguardian_groups.xml</url>
+ </tab>
+ <tab>
+ <text>Users</text>
+ <url>/pkg_edit.php?xml=dansguardian_users.xml</url>
+ </tab>
+ <tab>
+ <text>IPs</text>
+ <url>/pkg_edit.php?xml=dansguardian_ips.xml</url>
+ </tab>
+ <tab>
+ <text>Report and log</text>
+ <url>/pkg_edit.php?xml=dansguardian_log.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Sync</text>
+ <url>/pkg_edit.php?xml=dansguardian_sync.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Help</text>
+ <url>/dansguardian_about.php</url>
+ </tab>
+ <tab>
<text>Antivirus</text>
<url>/pkg_edit.php?xml=dansguardian_antivirus_acl.xml&amp;id=0</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Pics</text>
<url>/pkg.php?xml=dansguardian_pics_acl.xml&amp;id=0</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Phrase</text>
+ <text>Phrase Lists</text>
<url>/pkg.php?xml=dansguardian_phrase_acl.xml</url>
+ <tab_level>2</tab_level>
<active/>
</tab>
<tab>
- <text>Site</text>
+ <text>Site Lists</text>
<url>/pkg.php?xml=dansguardian_site_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>URL</text>
+ <text>URL Lists</text>
<url>/pkg.php?xml=dansguardian_url_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Extension</text>
+ <text>Extension Lists</text>
<url>/pkg.php?xml=dansguardian_file_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Content</text>
+ <text>Content Lists</text>
<url>/pkg.php?xml=dansguardian_content_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Header</text>
<url>/pkg.php?xml=dansguardian_header_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Searche Engine</text>
<url>/pkg.php?xml=dansguardian_search_acl.xml</url>
- </tab>
- <tab>
- <text>Groups</text>
- <url>/pkg.php?xml=dansguardian_groups.xml</url>
- </tab>
- <tab>
- <text>Users</text>
- <url>/pkg_edit.php?xml=dansguardian_users.xml</url>
+ <tab_level>2</tab_level>
</tab>
</tabs>
<adddeleteeditpagefields>
@@ -104,7 +150,8 @@
<columnitem>
<fielddescr>Access List Descriptions</fielddescr>
<fieldname>description</fieldname>
- </columnitem>
+ </columnitem>
+ <movable>on</movable>
</adddeleteeditpagefields>
<fields>
<field>
diff --git a/config/dansguardian/dansguardian_pics_acl.xml b/config/dansguardian/dansguardian_pics_acl.xml
index bda76a50..c2f4b52c 100644
--- a/config/dansguardian/dansguardian_pics_acl.xml
+++ b/config/dansguardian/dansguardian_pics_acl.xml
@@ -9,7 +9,7 @@
/*
dansguardian_limits.xml
part of the dansguardian for pfSense
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
@@ -18,7 +18,7 @@
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,
+ 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
@@ -47,54 +47,100 @@
<title>Services: Dansguardian - Access Lists</title>
<include_file>/usr/local/pkg/dansguardian.inc</include_file>
<tabs>
- <tab>
- <text>Back to Config</text>
+<tab>
+ <text>Daemon</text>
<url>/pkg_edit.php?xml=dansguardian.xml&amp;id=0</url>
</tab>
<tab>
+ <text>General</text>
+ <url>/pkg_edit.php?xml=dansguardian_config.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Limits</text>
+ <url>/pkg_edit.php?xml=dansguardian_limits.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Blacklist</text>
+ <url>/pkg_edit.php?xml=dansguardian_blacklist.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>ACLs</text>
+ <url>/pkg.php?xml=dansguardian_site_acl.xml</url>
+ <active/>
+ </tab>
+ <tab>
+ <text>LDAP</text>
+ <url>/pkg.php?xml=dansguardian_ldap.xml</url>
+ </tab>
+ <tab>
+ <text>Groups</text>
+ <url>/pkg.php?xml=dansguardian_groups.xml</url>
+ </tab>
+ <tab>
+ <text>Users</text>
+ <url>/pkg_edit.php?xml=dansguardian_users.xml</url>
+ </tab>
+ <tab>
+ <text>IPs</text>
+ <url>/pkg_edit.php?xml=dansguardian_ips.xml</url>
+ </tab>
+ <tab>
+ <text>Report and log</text>
+ <url>/pkg_edit.php?xml=dansguardian_log.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Sync</text>
+ <url>/pkg_edit.php?xml=dansguardian_sync.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Help</text>
+ <url>/dansguardian_about.php</url>
+ </tab>
+ <tab>
<text>Antivirus</text>
<url>/pkg_edit.php?xml=dansguardian_antivirus_acl.xml&amp;id=0</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Pics</text>
<url>/pkg.php?xml=dansguardian_pics_acl.xml&amp;id=0</url>
+ <tab_level>2</tab_level>
<active/>
</tab>
<tab>
- <text>Phrase</text>
+ <text>Phrase Lists</text>
<url>/pkg.php?xml=dansguardian_phrase_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Site</text>
+ <text>Site Lists</text>
<url>/pkg.php?xml=dansguardian_site_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>URL</text>
+ <text>URL Lists</text>
<url>/pkg.php?xml=dansguardian_url_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Extension</text>
+ <text>Extension Lists</text>
<url>/pkg.php?xml=dansguardian_file_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Content</text>
+ <text>Content Lists</text>
<url>/pkg.php?xml=dansguardian_content_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Header</text>
<url>/pkg.php?xml=dansguardian_header_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Searche Engine</text>
<url>/pkg.php?xml=dansguardian_search_acl.xml</url>
- </tab>
- <tab>
- <text>Groups</text>
- <url>/pkg.php?xml=dansguardian_groups.xml</url>
- </tab>
- <tab>
- <text>Users</text>
- <url>/pkg_edit.php?xml=dansguardian_users.xml</url>
+ <tab_level>2</tab_level>
</tab>
</tabs>
<adddeleteeditpagefields>
@@ -105,7 +151,8 @@
<columnitem>
<fielddescr>Access List Description</fielddescr>
<fieldname>description</fieldname>
- </columnitem>
+ </columnitem>
+ <movable>on</movable>
</adddeleteeditpagefields>
<fields>
<field>
diff --git a/config/dansguardian/dansguardian_search_acl.xml b/config/dansguardian/dansguardian_search_acl.xml
index 86ef67ff..9f9cfa49 100755
--- a/config/dansguardian/dansguardian_search_acl.xml
+++ b/config/dansguardian/dansguardian_search_acl.xml
@@ -8,7 +8,7 @@
/*
dansguardian_search_acl.xml
part of pfSense (http://www.pfSense.com)
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
@@ -17,7 +17,7 @@
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,
+ 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
@@ -46,55 +46,101 @@
<title>Services: Dansguardian - Access Lists</title>
<include_file>/usr/local/pkg/dansguardian.inc</include_file>
<tabs>
- <tab>
- <text>Back to Config</text>
+<tab>
+ <text>Daemon</text>
<url>/pkg_edit.php?xml=dansguardian.xml&amp;id=0</url>
</tab>
<tab>
+ <text>General</text>
+ <url>/pkg_edit.php?xml=dansguardian_config.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Limits</text>
+ <url>/pkg_edit.php?xml=dansguardian_limits.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Blacklist</text>
+ <url>/pkg_edit.php?xml=dansguardian_blacklist.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>ACLs</text>
+ <url>/pkg.php?xml=dansguardian_site_acl.xml</url>
+ <active/>
+ </tab>
+ <tab>
+ <text>LDAP</text>
+ <url>/pkg.php?xml=dansguardian_ldap.xml</url>
+ </tab>
+ <tab>
+ <text>Groups</text>
+ <url>/pkg.php?xml=dansguardian_groups.xml</url>
+ </tab>
+ <tab>
+ <text>Users</text>
+ <url>/pkg_edit.php?xml=dansguardian_users.xml</url>
+ </tab>
+ <tab>
+ <text>IPs</text>
+ <url>/pkg_edit.php?xml=dansguardian_ips.xml</url>
+ </tab>
+ <tab>
+ <text>Report and log</text>
+ <url>/pkg_edit.php?xml=dansguardian_log.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Sync</text>
+ <url>/pkg_edit.php?xml=dansguardian_sync.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Help</text>
+ <url>/dansguardian_about.php</url>
+ </tab>
+ <tab>
<text>Antivirus</text>
<url>/pkg_edit.php?xml=dansguardian_antivirus_acl.xml&amp;id=0</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Pics</text>
<url>/pkg.php?xml=dansguardian_pics_acl.xml&amp;id=0</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Phrase</text>
+ <text>Phrase Lists</text>
<url>/pkg.php?xml=dansguardian_phrase_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Site</text>
+ <text>Site Lists</text>
<url>/pkg.php?xml=dansguardian_site_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>URL</text>
+ <text>URL Lists</text>
<url>/pkg.php?xml=dansguardian_url_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Extension</text>
+ <text>Extension Lists</text>
<url>/pkg.php?xml=dansguardian_file_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Content</text>
+ <text>Content Lists</text>
<url>/pkg.php?xml=dansguardian_content_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Header</text>
<url>/pkg.php?xml=dansguardian_header_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Searche Engine</text>
<url>/pkg.php?xml=dansguardian_search_acl.xml</url>
+ <tab_level>2</tab_level>
<active/>
</tab>
- <tab>
- <text>Groups</text>
- <url>/pkg.php?xml=dansguardian_groups.xml</url>
- </tab>
- <tab>
- <text>Users</text>
- <url>/pkg_edit.php?xml=dansguardian_users.xml</url>
- </tab>
</tabs>
<adddeleteeditpagefields>
<columnitem>
@@ -104,7 +150,8 @@
<columnitem>
<fielddescr>Access List Description</fielddescr>
<fieldname>description</fieldname>
- </columnitem>
+ </columnitem>
+ <movable>on</movable>
</adddeleteeditpagefields>
<fields>
<field>
diff --git a/config/dansguardian/dansguardian_site_acl.xml b/config/dansguardian/dansguardian_site_acl.xml
index fcddfea6..7804d9f6 100755
--- a/config/dansguardian/dansguardian_site_acl.xml
+++ b/config/dansguardian/dansguardian_site_acl.xml
@@ -8,7 +8,7 @@
/*
dansguardian_site_acl.xml
part of pfSense (http://www.pfSense.com)
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
@@ -17,7 +17,7 @@
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,
+ 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
@@ -46,54 +46,100 @@
<title>Services: Dansguardian - Access Lists</title>
<include_file>/usr/local/pkg/dansguardian.inc</include_file>
<tabs>
- <tab>
- <text>Back to Config</text>
+<tab>
+ <text>Daemon</text>
<url>/pkg_edit.php?xml=dansguardian.xml&amp;id=0</url>
</tab>
<tab>
+ <text>General</text>
+ <url>/pkg_edit.php?xml=dansguardian_config.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Limits</text>
+ <url>/pkg_edit.php?xml=dansguardian_limits.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Blacklist</text>
+ <url>/pkg_edit.php?xml=dansguardian_blacklist.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>ACLs</text>
+ <url>/pkg.php?xml=dansguardian_site_acl.xml</url>
+ <active/>
+ </tab>
+ <tab>
+ <text>LDAP</text>
+ <url>/pkg.php?xml=dansguardian_ldap.xml</url>
+ </tab>
+ <tab>
+ <text>Groups</text>
+ <url>/pkg.php?xml=dansguardian_groups.xml</url>
+ </tab>
+ <tab>
+ <text>Users</text>
+ <url>/pkg_edit.php?xml=dansguardian_users.xml</url>
+ </tab>
+ <tab>
+ <text>IPs</text>
+ <url>/pkg_edit.php?xml=dansguardian_ips.xml</url>
+ </tab>
+ <tab>
+ <text>Report and log</text>
+ <url>/pkg_edit.php?xml=dansguardian_log.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Sync</text>
+ <url>/pkg_edit.php?xml=dansguardian_sync.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Help</text>
+ <url>/dansguardian_about.php</url>
+ </tab>
+ <tab>
<text>Antivirus</text>
<url>/pkg_edit.php?xml=dansguardian_antivirus_acl.xml&amp;id=0</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Pics</text>
<url>/pkg.php?xml=dansguardian_pics_acl.xml&amp;id=0</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Phrase</text>
+ <text>Phrase Lists</text>
<url>/pkg.php?xml=dansguardian_phrase_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Site</text>
+ <text>Site Lists</text>
<url>/pkg.php?xml=dansguardian_site_acl.xml</url>
+ <tab_level>2</tab_level>
<active/>
</tab>
<tab>
- <text>URL</text>
+ <text>URL Lists</text>
<url>/pkg.php?xml=dansguardian_url_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Extension</text>
+ <text>Extension Lists</text>
<url>/pkg.php?xml=dansguardian_file_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Content</text>
+ <text>Content Lists</text>
<url>/pkg.php?xml=dansguardian_content_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Header</text>
<url>/pkg.php?xml=dansguardian_header_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Searche Engine</text>
<url>/pkg.php?xml=dansguardian_search_acl.xml</url>
- </tab>
- <tab>
- <text>Groups</text>
- <url>/pkg.php?xml=dansguardian_groups.xml</url>
- </tab>
- <tab>
- <text>Users</text>
- <url>/pkg_edit.php?xml=dansguardian_users.xml</url>
+ <tab_level>2</tab_level>
</tab>
</tabs>
<adddeleteeditpagefields>
@@ -105,6 +151,7 @@
<fielddescr>Access List Description</fielddescr>
<fieldname>description</fieldname>
</columnitem>
+ <movable>on</movable>
</adddeleteeditpagefields>
<fields>
<field>
diff --git a/config/dansguardian/dansguardian_sync.xml b/config/dansguardian/dansguardian_sync.xml
index f91eae6a..7f714051 100755
--- a/config/dansguardian/dansguardian_sync.xml
+++ b/config/dansguardian/dansguardian_sync.xml
@@ -9,7 +9,7 @@
/*
dansguardian_sync.xml
part of the Dansguardian package for pfSense
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
/* ========================================================================== */
@@ -17,7 +17,7 @@
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,
+ 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
@@ -63,8 +63,8 @@
<url>/pkg_edit.php?xml=dansguardian_blacklist.xml&amp;id=0</url>
</tab>
<tab>
- <text>Access Lists</text>
- <url>/pkg_edit.php?xml=dansguardian_antivirus_acl.xml&amp;id=0</url>
+ <text>ACLs</text>
+ <url>/pkg.php?xml=dansguardian_site_acl.xml</url>
</tab>
<tab>
<text>LDAP</text>
@@ -87,7 +87,7 @@
<url>/pkg_edit.php?xml=dansguardian_log.xml&amp;id=0</url>
</tab>
<tab>
- <text>XMLRPC Sync</text>
+ <text>Sync</text>
<url>/pkg_edit.php?xml=dansguardian_sync.xml&amp;id=0</url>
<active/>
</tab>
diff --git a/config/dansguardian/dansguardian_url_acl.xml b/config/dansguardian/dansguardian_url_acl.xml
index 556e0bab..8adf46c0 100755
--- a/config/dansguardian/dansguardian_url_acl.xml
+++ b/config/dansguardian/dansguardian_url_acl.xml
@@ -8,7 +8,7 @@
/*
dansguardian_url_acl.xml
part of pfSense (http://www.pfSense.com)
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
@@ -17,7 +17,7 @@
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,
+ 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
@@ -46,54 +46,100 @@
<title>Services: Dansguardian - Access Lists</title>
<include_file>/usr/local/pkg/dansguardian.inc</include_file>
<tabs>
- <tab>
- <text>Back to Config</text>
+<tab>
+ <text>Daemon</text>
<url>/pkg_edit.php?xml=dansguardian.xml&amp;id=0</url>
</tab>
<tab>
+ <text>General</text>
+ <url>/pkg_edit.php?xml=dansguardian_config.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Limits</text>
+ <url>/pkg_edit.php?xml=dansguardian_limits.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Blacklist</text>
+ <url>/pkg_edit.php?xml=dansguardian_blacklist.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>ACLs</text>
+ <url>/pkg.php?xml=dansguardian_site_acl.xml</url>
+ <active/>
+ </tab>
+ <tab>
+ <text>LDAP</text>
+ <url>/pkg.php?xml=dansguardian_ldap.xml</url>
+ </tab>
+ <tab>
+ <text>Groups</text>
+ <url>/pkg.php?xml=dansguardian_groups.xml</url>
+ </tab>
+ <tab>
+ <text>Users</text>
+ <url>/pkg_edit.php?xml=dansguardian_users.xml</url>
+ </tab>
+ <tab>
+ <text>IPs</text>
+ <url>/pkg_edit.php?xml=dansguardian_ips.xml</url>
+ </tab>
+ <tab>
+ <text>Report and log</text>
+ <url>/pkg_edit.php?xml=dansguardian_log.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Sync</text>
+ <url>/pkg_edit.php?xml=dansguardian_sync.xml&amp;id=0</url>
+ </tab>
+ <tab>
+ <text>Help</text>
+ <url>/dansguardian_about.php</url>
+ </tab>
+ <tab>
<text>Antivirus</text>
<url>/pkg_edit.php?xml=dansguardian_antivirus_acl.xml&amp;id=0</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Pics</text>
<url>/pkg.php?xml=dansguardian_pics_acl.xml&amp;id=0</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Phrase</text>
+ <text>Phrase Lists</text>
<url>/pkg.php?xml=dansguardian_phrase_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Site</text>
+ <text>Site Lists</text>
<url>/pkg.php?xml=dansguardian_site_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>URL</text>
+ <text>URL Lists</text>
<url>/pkg.php?xml=dansguardian_url_acl.xml</url>
+ <tab_level>2</tab_level>
<active/>
</tab>
<tab>
- <text>Extension</text>
+ <text>Extension Lists</text>
<url>/pkg.php?xml=dansguardian_file_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
- <text>Content</text>
+ <text>Content Lists</text>
<url>/pkg.php?xml=dansguardian_content_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Header</text>
<url>/pkg.php?xml=dansguardian_header_acl.xml</url>
+ <tab_level>2</tab_level>
</tab>
<tab>
<text>Searche Engine</text>
<url>/pkg.php?xml=dansguardian_search_acl.xml</url>
- </tab>
- <tab>
- <text>Groups</text>
- <url>/pkg.php?xml=dansguardian_groups.xml</url>
- </tab>
- <tab>
- <text>Users</text>
- <url>/pkg_edit.php?xml=dansguardian_users.xml</url>
+ <tab_level>2</tab_level>
</tab>
</tabs>
<adddeleteeditpagefields>
@@ -104,7 +150,8 @@
<columnitem>
<fielddescr>Access List Description</fielddescr>
<fieldname>description</fieldname>
- </columnitem>
+ </columnitem>
+ <movable>on</movable>
</adddeleteeditpagefields>
<fields>
<field>
diff --git a/config/dansguardian/dansguardian_users_header.xml b/config/dansguardian/dansguardian_users_header.xml
index 1f15a610..1cc038d5 100644
--- a/config/dansguardian/dansguardian_users_header.xml
+++ b/config/dansguardian/dansguardian_users_header.xml
@@ -9,7 +9,7 @@
/*
dansguardian_users.xml
part of the dansguardian for pfSense
- Copyright (C) 2012 Marcello Coutinho
+ Copyright (C) 2012-2013 Marcello Coutinho
All rights reserved.
*/
@@ -18,7 +18,7 @@
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,
+ 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
@@ -63,8 +63,8 @@
<url>/pkg_edit.php?xml=dansguardian_blacklist.xml&amp;id=0</url>
</tab>
<tab>
- <text>Access Lists</text>
- <url>/pkg_edit.php?xml=dansguardian_antivirus_acl.xml&amp;id=0</url>
+ <text>ACLs</text>
+ <url>/pkg.php?xml=dansguardian_site_acl.xml</url>
</tab>
<tab>
<text>LDAP</text>
@@ -88,7 +88,7 @@
<url>/pkg_edit.php?xml=dansguardian_log.xml&amp;id=0</url>
</tab>
<tab>
- <text>XMLRPC Sync</text>
+ <text>Sync</text>
<url>/pkg_edit.php?xml=dansguardian_sync.xml&amp;id=0</url>
</tab>
<tab>
diff --git a/config/dansguardian/dansguardianfx.conf.template b/config/dansguardian/dansguardianfx.conf.template
index cfc9645e..f5296622 100644
--- a/config/dansguardian/dansguardianfx.conf.template
+++ b/config/dansguardian/dansguardianfx.conf.template
@@ -29,7 +29,7 @@
*/
$dgf= <<<EOF
-# DansGuardian filter group config file for version 2.12.0.0
+# DansGuardian filter group config file for version 2.12.0
# Filter group mode
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 46b5c388..9bfbcb95 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -598,16 +598,16 @@
<category>Services</category>
<config_file>http://www.pfsense.com/packages/config/dansguardian/dansguardian.xml</config_file>
<pkginfolink>http://forum.pfsense.org/index.php/topic,43786.0.html</pkginfolink>
- <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.tbz</depends_on_package>
- <depends_on_package>clamav-0.97.3_1.tbz</depends_on_package>
- <depends_on_package>ca_root_nss-3.13.3.tbz</depends_on_package>
- <depends_on_package_pbi>dansguardian-2.12.0.0_2-i386.pbi</depends_on_package_pbi>
- <version>2.12.0.0 pkg v.0.1.6_1</version>
+ <depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
+ <depends_on_package>dansguardian-2.12.0.3.tbz</depends_on_package>
+ <depends_on_package>ca_root_nss-3.14.1.tbz</depends_on_package>
+ <depends_on_package_pbi>dansguardian-2.12.0.3-i386.pbi</depends_on_package_pbi>
+ <version>2.12.0.3 pkg v.0.1.7</version>
<status>beta</status>
<required_version>2.0</required_version>
<configurationfile>dansguardian.xml</configurationfile>
<build_port_path>/usr/ports/www/dansguardian-devel</build_port_path>
+ <build_port_path>/usr/ports/security/ca_root_nss</build_port_path>
<build_options>dansguardian-devel_UNSET=APACHE;dansguardian-devel_SET=TRICKLE CLAMD ICAP NTLM SSL</build_options>
<!-- NOTE: Distfile must be fetched manually from http://dansguardian.org/downloads/2/Alpha/dansguardian-2.12.0.0.tar.gz -->
</package>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 8d71dd6a..cec2812a 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -585,16 +585,16 @@
<category>Services</category>
<config_file>http://www.pfsense.com/packages/config/dansguardian/dansguardian.xml</config_file>
<pkginfolink>http://forum.pfsense.org/index.php/topic,43786.0.html</pkginfolink>
- <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.tbz</depends_on_package>
- <depends_on_package>clamav-0.97.3_1.tbz</depends_on_package>
- <depends_on_package>ca_root_nss-3.13.3.tbz</depends_on_package>
- <depends_on_package_pbi>dansguardian-2.12.0.0_2-amd64.pbi</depends_on_package_pbi>
- <version>2.12.0.0 pkg v.0.1.6_1</version>
+ <depends_on_package_base_url>http://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
+ <depends_on_package>dansguardian-2.12.0.3.tbz</depends_on_package>
+ <depends_on_package>ca_root_nss-3.14.1.tbz</depends_on_package>
+ <depends_on_package_pbi>dansguardian-2.12.0.3-amd64.pbi</depends_on_package_pbi>
+ <version>2.12.0.3 pkg v.0.1.7</version>
<status>beta</status>
<required_version>2.0</required_version>
<configurationfile>dansguardian.xml</configurationfile>
<build_port_path>/usr/ports/www/dansguardian-devel</build_port_path>
+ <build_port_path>/usr/ports/www/ca_root_nss</build_port_path>
<build_options>dansguardian-devel_UNSET=APACHE;dansguardian-devel_SET=TRICKLE CLAMD ICAP NTLM SSL</build_options>
<!-- NOTE: Distfile must be fetched manually from http://dansguardian.org/downloads/2/Alpha/dansguardian-2.12.0.0.tar.gz -->
</package>