diff -Nru zentyal-squid-3.1.6/ChangeLog zentyal-squid-3.1.7/ChangeLog --- zentyal-squid-3.1.6/ChangeLog 2013-09-17 09:14:56.000000000 +0000 +++ zentyal-squid-3.1.7/ChangeLog 2013-09-18 12:42:39.000000000 +0000 @@ -1,3 +1,6 @@ +3.1.7 + + Include domains with final slash as filtered when required + + Ignore 407 requests when auth is required in log helper 3.1.6 + Override daemons when migrating from 3.0 + Disable load_url_list by default to reduce CPU and memory usage diff -Nru zentyal-squid-3.1.6/debian/changelog zentyal-squid-3.1.7/debian/changelog --- zentyal-squid-3.1.6/debian/changelog 2013-09-17 09:14:56.000000000 +0000 +++ zentyal-squid-3.1.7/debian/changelog 2013-09-18 12:42:39.000000000 +0000 @@ -1,3 +1,9 @@ +zentyal-squid (3.1.7) precise; urgency=low + + * New upstream release + + -- José A. Calvo Wed, 18 Sep 2013 14:42:39 +0200 + zentyal-squid (3.1.6) precise; urgency=low * New upstream release diff -Nru zentyal-squid-3.1.6/src/EBox/Squid/LogHelper.pm zentyal-squid-3.1.7/src/EBox/Squid/LogHelper.pm --- zentyal-squid-3.1.6/src/EBox/Squid/LogHelper.pm 2013-09-17 09:14:56.000000000 +0000 +++ zentyal-squid-3.1.7/src/EBox/Squid/LogHelper.pm 2013-09-18 12:42:39.000000000 +0000 @@ -17,9 +17,10 @@ use warnings; package EBox::Squid::LogHelper; - use base 'EBox::LogHelper'; +use feature qw(switch); + use EBox; use EBox::Config; use EBox::Gettext; @@ -85,14 +86,21 @@ } my $event; - if ($fields[3] eq 'TCP_DENIED/403') { - if ($file eq DANSGUARDIANLOGFILE) { - $event = 'filtered'; - } else { - $event = 'denied'; + given($fields[3]) { + when ('TCP_DENIED/403') { + if ($file eq DANSGUARDIANLOGFILE) { + $event = 'filtered'; + } else { + $event = 'denied'; + } + } + when ('TCP_DENIED/407') { + # This entry requires authentication, so ignore it + return; + } + default { + $event = 'accepted'; } - } else { - $event = 'accepted'; } # Trim URL string as DB stores it as a varchar(1024) @@ -101,6 +109,12 @@ my $time = strftime ('%Y-%m-%d %H:%M:%S', localtime $fields[0]); my $domain = $self->_domain($fields[6]); + if ($url =~ m/$domain$/) { + # Squid logs adds a final slash as dansguardian does not + # So we must add final slash + $url .= '/'; + } + $temp{$url}->{timestamp} = $time; $temp{$url}->{elapsed} = $fields[1]; $temp{$url}->{remotehost} = $fields[2];