From 8cd1135f77d535a726c72d3b75446551e2b8dfbf Mon Sep 17 00:00:00 2001 Message-Id: <8cd1135f77d535a726c72d3b75446551e2b8dfbf.1418639888.git.hahn@univention.de> From: Philipp Hahn Date: Mon, 15 Dec 2014 08:58:42 +0100 Subject: [PATCH] Bug #37329 DansGuardian: Remove .gz and .bz2 from banned extensions Organization: Univention GmbH, Bremen, Germany Use ucs.is_true() --- .../conffiles/etc/dansguardian/dansguardian.conf | 7 +++---- .../conffiles/etc/dansguardian/lists/bannedextensionlist | 8 ++++---- .../conffiles/etc/dansguardian/lists/bannediplist | 2 +- .../conffiles/etc/dansguardian/lists/bannedmimetypelist | 10 +++++----- .../conffiles/etc/dansguardian/lists/bannedregexpurllist | 2 +- .../conffiles/etc/dansguardian/lists/bannedsitelist | 2 +- .../conffiles/etc/dansguardian/lists/bannedurllist | 2 +- .../lists/contentscanners/exceptionvirusextensionlist | 4 ++-- .../lists/contentscanners/exceptionvirusmimetypelist | 4 ++-- .../dansguardian/lists/contentscanners/exceptionvirussitelist | 5 ++--- .../dansguardian/lists/contentscanners/exceptionvirusurllist | 5 ++--- .../conffiles/etc/dansguardian/lists/exceptionextensionlist | 2 +- .../conffiles/etc/dansguardian/lists/exceptioniplist | 2 +- .../conffiles/etc/dansguardian/lists/exceptionmimetypelist | 2 +- .../conffiles/etc/dansguardian/lists/exceptionregexpurllist | 2 +- .../conffiles/etc/dansguardian/lists/exceptionsitelist | 2 +- .../conffiles/etc/dansguardian/lists/exceptionurllist | 2 +- .../services/univention-dansguardian/debian/changelog | 6 ++++++ 18 files changed, 36 insertions(+), 33 deletions(-) diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/dansguardian.conf b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/dansguardian.conf index 470dcdd..7243242 100644 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/dansguardian.conf +++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/dansguardian.conf @@ -167,7 +167,7 @@ custombannedimagefile = '/usr/share/dansguardian/transparent1x1.gif' @!@ groups = configRegistry.get( 'dansguardian/groups', 'defaultgroup' ) print 'filtergroups = %d' % len( groups.split( ';' ) ) -if configRegistry.get( 'dansguardian/groups/system', 'on' ).lower() in ( 'on', 'yes', 'true', '1' ): +if configRegistry.is_true('dansguardian/groups/system', True): print 'usefiltersystemgroups=on' @!@ filtergroupslist = '/etc/dansguardian/lists/filtergroupslist' @@ -487,13 +487,12 @@ contentscanexceptions = off # If you do not use multiple filter groups, you need not specify this option. # @!@ - -if configRegistry.get( 'dansguardian/auth/ip', 'no' ).lower() in ( 'yes', 'true', '1' ): +if configRegistry.is_true('dansguardian/auth/ip'): print "authplugin = '/etc/dansguardian/authplugins/ip.conf'" else: auth = False for var in ( 'ldapauth', 'basicauth', 'ntlmauth' ): - if configRegistry.get( 'squid/%s' % var, '' ).lower() in ( 'yes', 'true' ): + if configRegistry.is_true('squid/%s' % var): auth = True break if auth: diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedextensionlist b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedextensionlist index 2ad8be3..cb40bcc 100644 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedextensionlist +++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedextensionlist @@ -3,7 +3,7 @@ #Banned extension list @!@ -if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]: +if baseConfig.is_true('squid/contentscan'): group = configRegistry.get( 'dansguardian/current/group' ) banned = configRegistry.get( 'dansguardian/groups/%s/banned/extensions' % group, '' ) for entry in banned.split( ' ' ): @@ -56,7 +56,7 @@ if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]: .scf # Windows Explorer command .scr # Screen saver .sct # Windows Script Component -.sh # Shell script +#.sh # Shell script .shs # Shell Scrap object .shb # Shell Scrap object .sys # Windows system file @@ -82,11 +82,11 @@ if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]: # Other files which may contain files with executable code -.gz # Gziped file +#.gz # Gziped file .tar # Tape ARchive file .zip # Windows compressed file .tgz # Unix compressed file -.bz2 # Unix compressed file +#.bz2 # Unix compressed file .cdr # Mac disk image .dmg # Mac disk image .smi # Mac self mounting disk image diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannediplist b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannediplist index 0aac366..bd021eb 100644 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannediplist +++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannediplist @@ -10,7 +10,7 @@ #you want to filter. @!@ -if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]: +if baseConfig.is_true('squid/contentscan'): banned = configRegistry.get( 'dansguardian/bannedipaddresses', '' ) for entry in banned.split( ' ' ): print entry diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedmimetypelist b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedmimetypelist index 43a16e1..742bd37 100644 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedmimetypelist +++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedmimetypelist @@ -3,7 +3,7 @@ # banned MIME types @!@ -if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]: +if baseConfig.is_true('squid/contentscan'): group = configRegistry.get( 'dansguardian/current/group' ) banned = configRegistry.get( 'dansguardian/groups/%s/banned/mimetypes' % group, '' ) for entry in banned.split( ' ' ): @@ -22,11 +22,11 @@ video/acorn-replay video/quicktime video/x-msvideo video/msvideo -application/gzip -application/x-gzip +# application/gzip +# application/x-gzip application/zip -application/compress -application/x-compress +# application/compress +# application/x-compress application/java-vm ''' @!@ diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedregexpurllist b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedregexpurllist index d76fb26..d43b7f9 100644 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedregexpurllist +++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedregexpurllist @@ -42,7 +42,7 @@ #(proxy) @!@ -if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]: +if baseConfig.is_true('squid/contentscan'): group = configRegistry.get( 'dansguardian/current/group' ) prefix = 'dansguardian/groups/%s/banned/regexp/urls/' % group for key in configRegistry.keys(): diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedsitelist b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedsitelist index cfdb738..e4011d6 100644 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedsitelist +++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedsitelist @@ -50,7 +50,7 @@ @!@ -if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]: +if baseConfig.is_true('squid/contentscan'): group = configRegistry.get( 'dansguardian/current/group' ) banned = configRegistry.get( 'dansguardian/groups/%s/banned/sites' % group, '' ) for entry in banned.split( ' ' ): diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedurllist b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedurllist index 61ca581..9b8596e 100644 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedurllist +++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedurllist @@ -34,7 +34,7 @@ #.Include @!@ -if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]: +if baseConfig.is_true('squid/contentscan'): group = configRegistry.get( 'dansguardian/current/group' ) banned = configRegistry.get( 'dansguardian/groups/%s/banned/urls' % group, '' ) for entry in banned.split( ' ' ): diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirusextensionlist b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirusextensionlist index d0716b1..59e35cd 100644 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirusextensionlist +++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirusextensionlist @@ -4,8 +4,8 @@ # The Virus scanning code will ignore files with these extensions. @!@ -if baseConfig.get('squid/virusscan', 'no').lower() in [ 'yes', 'true' ]: - if not baseConfig.get('dansguardian/virus/exception/extensions', '') == '': +if baseConfig.is_true('squid/virusscan'): + if baseConfig.get('dansguardian/virus/exception/extensions', ''): for extension in baseConfig['dansguardian/virus/exception/extensions'].split(" "): print extension @!@ diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirusmimetypelist b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirusmimetypelist index b3c39c4..dcf0b9c 100644 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirusmimetypelist +++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirusmimetypelist @@ -3,8 +3,8 @@ # MIME types the virus scanning code ignores. @!@ -if baseConfig.get('squid/virusscan', 'no').lower() in [ 'yes', 'true' ]: - if not baseConfig.get('dansguardian/virus/exception/mimetypes', '') == '': +if baseConfig.is_true('squid/virusscan'): + if baseConfig.get('dansguardian/virus/exception/mimetypes', ''): for extension in baseConfig['dansguardian/virus/exception/mimetypes'].split(" "): print extension @!@ diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirussitelist b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirussitelist index 89c5ba2..c50128a 100644 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirussitelist +++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirussitelist @@ -15,9 +15,8 @@ @!@ -if baseConfig.get('squid/virusscan', 'no').lower() in [ 'yes', 'true' ]: - if not baseConfig.get('dansguardian/virus/exception/sites', '') == '': +if baseConfig.is_true('squid/virusscan'): + if baseConfig.get('dansguardian/virus/exception/sites', ''): for site in baseConfig['dansguardian/virus/exception/sites'].split(" "): print site @!@ - diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirusurllist b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirusurllist index 472171e..6361685 100644 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirusurllist +++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirusurllist @@ -17,9 +17,8 @@ #generallybadsite.tld/partthatisok/ @!@ -if baseConfig.get('squid/virusscan', 'no').lower() in [ 'yes', 'true' ]: - if not baseConfig.get('dansguardian/virus/exception/urls', '') == '': +if baseConfig.is_true('squid/virusscan'): + if baseConfig.get('dansguardian/virus/exception/urls', ''): for url in baseConfig['dansguardian/virus/exception/urls'].split(" "): print url @!@ - diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionextensionlist b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionextensionlist index f1df452..1c923cc 100644 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionextensionlist +++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionextensionlist @@ -9,7 +9,7 @@ # @!@ -if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]: +if baseConfig.is_true('squid/contentscan'): group = configRegistry.get( 'dansguardian/current/group' ) exception = configRegistry.get( 'dansguardian/groups/%s/exception/extensions' % group, '' ) for entry in exception.split( ' ' ): diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptioniplist b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptioniplist index 3ed0d2a..11c4af1 100644 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptioniplist +++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptioniplist @@ -18,7 +18,7 @@ #you don't want to filter. @!@ -if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]: +if baseConfig.is_true('squid/contentscan'): exception = configRegistry.get( 'dansguardian/exceptionipaddresses', '' ) for entry in exception.split( ' ' ): print entry diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionmimetypelist b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionmimetypelist index 7a1b78f..7e0c5a7 100644 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionmimetypelist +++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionmimetypelist @@ -9,7 +9,7 @@ # @!@ -if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]: +if baseConfig.is_true('squid/contentscan'): group = configRegistry.get( 'dansguardian/current/group' ) exception = configRegistry.get( 'dansguardian/groups/%s/exception/mimetypes' % group, '' ) for entry in exception.split( ' ' ): diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionregexpurllist b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionregexpurllist index 7b5038f..71bf47b 100644 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionregexpurllist +++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionregexpurllist @@ -9,7 +9,7 @@ @!@ -if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]: +if baseConfig.is_true('squid/contentscan'): group = configRegistry.get( 'dansguardian/current/group' ) prefix = 'dansguardian/groups/%s/exception/regexp/urls/' % group for key in configRegistry.keys(): diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionsitelist b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionsitelist index 727ed22..6660785 100644 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionsitelist +++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionsitelist @@ -19,7 +19,7 @@ # windowsupdate.com @!@ -if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]: +if baseConfig.is_true('squid/contentscan'): group = configRegistry.get( 'dansguardian/current/group' ) exception = configRegistry.get( 'dansguardian/groups/%s/exception/sites' % group, '' ) for entry in exception.split( ' ' ): diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionurllist b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionurllist index 561ddbd..048e7a1 100644 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionurllist +++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionurllist @@ -17,7 +17,7 @@ #generallybadsite.tld/partthatsok/ @!@ -if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]: +if baseConfig.is_true('squid/contentscan'): group = configRegistry.get( 'dansguardian/current/group' ) exception = configRegistry.get( 'dansguardian/groups/%s/exception/urls' % group, '' ) for entry in exception.split( ' ' ): diff --git a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/debian/changelog b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/debian/changelog index 1347a68..6a43d4a 100644 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/debian/changelog +++ b/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/debian/changelog @@ -1,3 +1,9 @@ +univention-dansguardian (8.0.0-3) unstable; urgency=low + + * Bug #37329: Remove .gz and .bz2 from banned extensions + + -- Philipp Hahn Mon, 15 Dec 2014 08:58:04 +0100 + univention-dansguardian (8.0.0-2) unstable; urgency=low * Updated config files (Bug #36114) -- 1.9.1