@@ -, +, @@ extensions --- .../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(-) --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/dansguardian.conf +++ a/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: --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedextensionlist +++ a/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 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannediplist +++ a/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 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedmimetypelist +++ a/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 ''' @!@ --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedregexpurllist +++ a/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(): --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedsitelist +++ a/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( ' ' ): --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedurllist +++ a/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( ' ' ): --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirusextensionlist +++ a/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 @!@ --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirusmimetypelist +++ a/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 @!@ --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirussitelist +++ a/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 @!@ - --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirusurllist +++ a/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 @!@ - --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionextensionlist +++ a/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( ' ' ): --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptioniplist +++ a/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 --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionmimetypelist +++ a/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( ' ' ): --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionregexpurllist +++ a/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(): --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionsitelist +++ a/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( ' ' ): --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionurllist +++ a/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( ' ' ): --- a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/debian/changelog +++ a/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) --