View | Details | Raw Unified | Return to bug 37329 | Differences between
and this patch

Collapse All | Expand All

(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/dansguardian.conf (-4 / +3 lines)
 Lines 167-173   custombannedimagefile = '/usr/share/dansguardian/transparent1x1.gif' Link Here 
167
@!@
167
@!@
168
groups = configRegistry.get( 'dansguardian/groups', 'defaultgroup' )
168
groups = configRegistry.get( 'dansguardian/groups', 'defaultgroup' )
169
print 'filtergroups = %d' % len( groups.split( ';' ) )
169
print 'filtergroups = %d' % len( groups.split( ';' ) )
170
if configRegistry.get( 'dansguardian/groups/system', 'on' ).lower() in ( 'on', 'yes', 'true', '1' ):
170
if configRegistry.is_true('dansguardian/groups/system', True):
171
   print 'usefiltersystemgroups=on'
171
   print 'usefiltersystemgroups=on'
172
@!@
172
@!@
173
filtergroupslist = '/etc/dansguardian/lists/filtergroupslist'
173
filtergroupslist = '/etc/dansguardian/lists/filtergroupslist'
 Lines 487-499   contentscanexceptions = off Link Here 
487
# If you do not use multiple filter groups, you need not specify this option.
487
# If you do not use multiple filter groups, you need not specify this option.
488
#
488
#
489
@!@
489
@!@
490
490
if configRegistry.is_true('dansguardian/auth/ip'):
491
if configRegistry.get( 'dansguardian/auth/ip', 'no' ).lower() in ( 'yes', 'true', '1' ):
492
	print "authplugin = '/etc/dansguardian/authplugins/ip.conf'"
491
	print "authplugin = '/etc/dansguardian/authplugins/ip.conf'"
493
else:
492
else:
494
	auth = False
493
	auth = False
495
	for var in ( 'ldapauth', 'basicauth', 'ntlmauth' ):
494
	for var in ( 'ldapauth', 'basicauth', 'ntlmauth' ):
496
		if configRegistry.get( 'squid/%s' % var, '' ).lower() in ( 'yes', 'true' ):
495
		if configRegistry.is_true('squid/%s' % var):
497
			auth = True
496
			auth = True
498
			break
497
			break
499
	if auth:
498
	if auth:
(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedextensionlist (-4 / +4 lines)
 Lines 3-9    Link Here 
3
#Banned extension list
3
#Banned extension list
4
4
5
@!@
5
@!@
6
if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]:
6
if baseConfig.is_true('squid/contentscan'):
7
	group = configRegistry.get( 'dansguardian/current/group' )
7
	group = configRegistry.get( 'dansguardian/current/group' )
8
	banned = configRegistry.get( 'dansguardian/groups/%s/banned/extensions' % group, '' )
8
	banned = configRegistry.get( 'dansguardian/groups/%s/banned/extensions' % group, '' )
9
	for entry in banned.split( ' ' ):
9
	for entry in banned.split( ' ' ):
 Lines 56-62   if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]: Link Here 
56
.scf  # Windows Explorer command
56
.scf  # Windows Explorer command
57
.scr  # Screen saver
57
.scr  # Screen saver
58
.sct  # Windows Script Component
58
.sct  # Windows Script Component
59
.sh   # Shell script
59
#.sh   # Shell script
60
.shs  # Shell Scrap object
60
.shs  # Shell Scrap object
61
.shb  # Shell Scrap object
61
.shb  # Shell Scrap object
62
.sys  # Windows system file
62
.sys  # Windows system file
 Lines 82-92   if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]: Link Here 
82
82
83
# Other files which may contain files with executable code
83
# Other files which may contain files with executable code
84
84
85
.gz   # Gziped file
85
#.gz   # Gziped file
86
.tar  # Tape ARchive file
86
.tar  # Tape ARchive file
87
.zip  # Windows compressed file
87
.zip  # Windows compressed file
88
.tgz  # Unix compressed file
88
.tgz  # Unix compressed file
89
.bz2  # Unix compressed file
89
#.bz2  # Unix compressed file
90
.cdr  # Mac disk image
90
.cdr  # Mac disk image
91
.dmg  # Mac disk image
91
.dmg  # Mac disk image
92
.smi  # Mac self mounting disk image
92
.smi  # Mac self mounting disk image
(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannediplist (-1 / +1 lines)
 Lines 10-16    Link Here 
10
#you want to filter.
10
#you want to filter.
11
11
12
@!@
12
@!@
13
if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]:
13
if baseConfig.is_true('squid/contentscan'):
14
	banned = configRegistry.get( 'dansguardian/bannedipaddresses', '' )
14
	banned = configRegistry.get( 'dansguardian/bannedipaddresses', '' )
15
	for entry in banned.split( ' ' ):
15
	for entry in banned.split( ' ' ):
16
		print entry
16
		print entry
(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedmimetypelist (-5 / +5 lines)
 Lines 3-9    Link Here 
3
# banned MIME types
3
# banned MIME types
4
4
5
@!@
5
@!@
6
if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]:
6
if baseConfig.is_true('squid/contentscan'):
7
	group = configRegistry.get( 'dansguardian/current/group' )
7
	group = configRegistry.get( 'dansguardian/current/group' )
8
	banned = configRegistry.get( 'dansguardian/groups/%s/banned/mimetypes' % group, '' )
8
	banned = configRegistry.get( 'dansguardian/groups/%s/banned/mimetypes' % group, '' )
9
	for entry in banned.split( ' ' ):
9
	for entry in banned.split( ' ' ):
 Lines 22-32   video/acorn-replay Link Here 
22
video/quicktime
22
video/quicktime
23
video/x-msvideo
23
video/x-msvideo
24
video/msvideo
24
video/msvideo
25
application/gzip
25
# application/gzip
26
application/x-gzip
26
# application/x-gzip
27
application/zip
27
application/zip
28
application/compress
28
# application/compress
29
application/x-compress
29
# application/x-compress
30
application/java-vm
30
application/java-vm
31
'''
31
'''
32
@!@
32
@!@
(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedregexpurllist (-1 / +1 lines)
 Lines 42-48    Link Here 
42
#(proxy)
42
#(proxy)
43
43
44
@!@
44
@!@
45
if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]:
45
if baseConfig.is_true('squid/contentscan'):
46
	group = configRegistry.get( 'dansguardian/current/group' )
46
	group = configRegistry.get( 'dansguardian/current/group' )
47
	prefix = 'dansguardian/groups/%s/banned/regexp/urls/' % group
47
	prefix = 'dansguardian/groups/%s/banned/regexp/urls/' % group
48
	for key in configRegistry.keys():
48
	for key in configRegistry.keys():
(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedsitelist (-1 / +1 lines)
 Lines 50-56    Link Here 
50
50
51
51
52
@!@
52
@!@
53
if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]:
53
if baseConfig.is_true('squid/contentscan'):
54
	group = configRegistry.get( 'dansguardian/current/group' )
54
	group = configRegistry.get( 'dansguardian/current/group' )
55
	banned = configRegistry.get( 'dansguardian/groups/%s/banned/sites' % group, '' )
55
	banned = configRegistry.get( 'dansguardian/groups/%s/banned/sites' % group, '' )
56
	for entry in banned.split( ' ' ):
56
	for entry in banned.split( ' ' ):
(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/bannedurllist (-1 / +1 lines)
 Lines 34-40    Link Here 
34
#.Include</etc/dansguardian/blacklists/ads/urls>
34
#.Include</etc/dansguardian/blacklists/ads/urls>
35
35
36
@!@
36
@!@
37
if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]:
37
if baseConfig.is_true('squid/contentscan'):
38
	group = configRegistry.get( 'dansguardian/current/group' )
38
	group = configRegistry.get( 'dansguardian/current/group' )
39
	banned = configRegistry.get( 'dansguardian/groups/%s/banned/urls' % group, '' )
39
	banned = configRegistry.get( 'dansguardian/groups/%s/banned/urls' % group, '' )
40
	for entry in banned.split( ' ' ):
40
	for entry in banned.split( ' ' ):
(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirusextensionlist (-2 / +2 lines)
 Lines 4-11    Link Here 
4
# The Virus scanning code will ignore files with these extensions.
4
# The Virus scanning code will ignore files with these extensions.
5
5
6
@!@
6
@!@
7
if baseConfig.get('squid/virusscan', 'no').lower() in [ 'yes', 'true' ]:
7
if baseConfig.is_true('squid/virusscan'):
8
        if not baseConfig.get('dansguardian/virus/exception/extensions', '') == '':
8
        if baseConfig.get('dansguardian/virus/exception/extensions', ''):
9
                for extension in baseConfig['dansguardian/virus/exception/extensions'].split(" "):
9
                for extension in baseConfig['dansguardian/virus/exception/extensions'].split(" "):
10
                        print extension
10
                        print extension
11
@!@
11
@!@
(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirusmimetypelist (-2 / +2 lines)
 Lines 3-10    Link Here 
3
# MIME types the virus scanning code ignores.
3
# MIME types the virus scanning code ignores.
4
4
5
@!@
5
@!@
6
if baseConfig.get('squid/virusscan', 'no').lower() in [ 'yes', 'true' ]:
6
if baseConfig.is_true('squid/virusscan'):
7
        if not baseConfig.get('dansguardian/virus/exception/mimetypes', '') == '':
7
        if baseConfig.get('dansguardian/virus/exception/mimetypes', ''):
8
                for extension in baseConfig['dansguardian/virus/exception/mimetypes'].split(" "):
8
                for extension in baseConfig['dansguardian/virus/exception/mimetypes'].split(" "):
9
                        print extension
9
                        print extension
10
@!@
10
@!@
(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirussitelist (-3 / +2 lines)
 Lines 15-23    Link Here 
15
15
16
16
17
@!@
17
@!@
18
if baseConfig.get('squid/virusscan', 'no').lower() in [ 'yes', 'true' ]:
18
if baseConfig.is_true('squid/virusscan'):
19
        if not baseConfig.get('dansguardian/virus/exception/sites', '') == '':
19
        if baseConfig.get('dansguardian/virus/exception/sites', ''):
20
                for site in baseConfig['dansguardian/virus/exception/sites'].split(" "):
20
                for site in baseConfig['dansguardian/virus/exception/sites'].split(" "):
21
                        print site
21
                        print site
22
@!@
22
@!@
23
(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/contentscanners/exceptionvirusurllist (-3 / +2 lines)
 Lines 17-25    Link Here 
17
#generallybadsite.tld/partthatisok/
17
#generallybadsite.tld/partthatisok/
18
18
19
@!@
19
@!@
20
if baseConfig.get('squid/virusscan', 'no').lower() in [ 'yes', 'true' ]:
20
if baseConfig.is_true('squid/virusscan'):
21
        if not baseConfig.get('dansguardian/virus/exception/urls', '') == '':
21
        if baseConfig.get('dansguardian/virus/exception/urls', ''):
22
                for url in baseConfig['dansguardian/virus/exception/urls'].split(" "):
22
                for url in baseConfig['dansguardian/virus/exception/urls'].split(" "):
23
                        print url
23
                        print url
24
@!@
24
@!@
25
(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionextensionlist (-1 / +1 lines)
 Lines 9-15    Link Here 
9
#
9
#
10
10
11
@!@
11
@!@
12
if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]:
12
if baseConfig.is_true('squid/contentscan'):
13
	group = configRegistry.get( 'dansguardian/current/group' )
13
	group = configRegistry.get( 'dansguardian/current/group' )
14
	exception = configRegistry.get( 'dansguardian/groups/%s/exception/extensions' % group, '' )
14
	exception = configRegistry.get( 'dansguardian/groups/%s/exception/extensions' % group, '' )
15
	for entry in exception.split( ' ' ):
15
	for entry in exception.split( ' ' ):
(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptioniplist (-1 / +1 lines)
 Lines 18-24    Link Here 
18
#you don't want to filter.
18
#you don't want to filter.
19
19
20
@!@
20
@!@
21
if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]:
21
if baseConfig.is_true('squid/contentscan'):
22
	exception = configRegistry.get( 'dansguardian/exceptionipaddresses', '' )
22
	exception = configRegistry.get( 'dansguardian/exceptionipaddresses', '' )
23
	for entry in exception.split( ' ' ):
23
	for entry in exception.split( ' ' ):
24
		print entry
24
		print entry
(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionmimetypelist (-1 / +1 lines)
 Lines 9-15    Link Here 
9
#
9
#
10
10
11
@!@
11
@!@
12
if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]:
12
if baseConfig.is_true('squid/contentscan'):
13
	group = configRegistry.get( 'dansguardian/current/group' )
13
	group = configRegistry.get( 'dansguardian/current/group' )
14
	exception = configRegistry.get( 'dansguardian/groups/%s/exception/mimetypes' % group, '' )
14
	exception = configRegistry.get( 'dansguardian/groups/%s/exception/mimetypes' % group, '' )
15
	for entry in exception.split( ' ' ):
15
	for entry in exception.split( ' ' ):
(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionregexpurllist (-1 / +1 lines)
 Lines 9-15    Link Here 
9
9
10
10
11
@!@
11
@!@
12
if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]:
12
if baseConfig.is_true('squid/contentscan'):
13
	group = configRegistry.get( 'dansguardian/current/group' )
13
	group = configRegistry.get( 'dansguardian/current/group' )
14
	prefix = 'dansguardian/groups/%s/exception/regexp/urls/' % group
14
	prefix = 'dansguardian/groups/%s/exception/regexp/urls/' % group
15
	for key in configRegistry.keys():
15
	for key in configRegistry.keys():
(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionsitelist (-1 / +1 lines)
 Lines 19-25    Link Here 
19
# windowsupdate.com
19
# windowsupdate.com
20
20
21
@!@
21
@!@
22
if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]:
22
if baseConfig.is_true('squid/contentscan'):
23
	group = configRegistry.get( 'dansguardian/current/group' )
23
	group = configRegistry.get( 'dansguardian/current/group' )
24
	exception = configRegistry.get( 'dansguardian/groups/%s/exception/sites' % group, '' )
24
	exception = configRegistry.get( 'dansguardian/groups/%s/exception/sites' % group, '' )
25
	for entry in exception.split( ' ' ):
25
	for entry in exception.split( ' ' ):
(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/conffiles/etc/dansguardian/lists/exceptionurllist (-1 / +1 lines)
 Lines 17-23    Link Here 
17
#generallybadsite.tld/partthatsok/
17
#generallybadsite.tld/partthatsok/
18
18
19
@!@
19
@!@
20
if baseConfig.get('squid/contentscan', 'no').lower() in [ 'yes', 'true' ]:
20
if baseConfig.is_true('squid/contentscan'):
21
	group = configRegistry.get( 'dansguardian/current/group' )
21
	group = configRegistry.get( 'dansguardian/current/group' )
22
	exception = configRegistry.get( 'dansguardian/groups/%s/exception/urls' % group, '' )
22
	exception = configRegistry.get( 'dansguardian/groups/%s/exception/urls' % group, '' )
23
	for entry in exception.split( ' ' ):
23
	for entry in exception.split( ' ' ):
(-)a/branches/ucs-4.0/ucs-4.0-0/services/univention-dansguardian/debian/changelog (-1 / +6 lines)
 Lines 1-3    Link Here 
1
univention-dansguardian (8.0.0-3) unstable; urgency=low
2
3
  * Bug #37329: Remove .gz and .bz2 from banned extensions
4
5
 -- Philipp Hahn <hahn@univention.de>  Mon, 15 Dec 2014 08:58:04 +0100
6
1
univention-dansguardian (8.0.0-2) unstable; urgency=low
7
univention-dansguardian (8.0.0-2) unstable; urgency=low
2
8
3
  * Updated config files (Bug #36114) 
9
  * Updated config files (Bug #36114) 
4
- 

Return to bug 37329