tyler.durden/squidanalyzer
1
0
Fork 0
mirror of https://github.com/darold/squidanalyzer.git synced 2025-07-31 01:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not report Kerberos challange TCP_DENIED/407 when it is followed

Browse Source 
by a TCP_MISS/200. Thanks to Mike Surcouf for the report.
This commit is contained in:
Darold Gilles 2019-04-27 13:43:54 +02:00
parent 621095125d
commit d7b6ea0267
1 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
SquidAnalyzer.pm
View File

@ -1368,7 +1368,11 @@ sub _parse_file_part
} elsif ($code =~ m#(MISS|MODIFIED|TUNNEL)[:/]#) {
$code = 'MISS';
} elsif ($code =~ m#(DENIED|DENIED_REPLY|REDIRECT)[:/]#) {
$code = 'DENIED';
if ($code =~ m#DENIED[:/]407#) {
$code = 'DENIED_407';
} else {
$code = 'DENIED';
}
} else {
next;
}
@ -1400,7 +1404,7 @@ sub _parse_file_part
if ($login ne '-') {
$id = $login;
}
next if (!$id || (!$bytes && ($code ne 'DENIED')));
next if (!$id || (!$bytes && ($code !~ /DENIED/)));
#####
# If there's some mandatory inclusion, check the entry against the definitions
@ -1423,9 +1427,20 @@ sub _parse_file_part
$id = $self->{AnonymizedId}{$id};
}
# Now parse data and generate statistics
$self->_parseData($time, $elapsed, $client_ip, $code, $bytes, $url, $id, $mime_type, $acl, $method);
$line_stored_count++;
# With code TCP_DENIED/407 we need to store it until
# we are sure that no 200 response is found later
if ($code eq 'DENIED_407')
{
$code = 'DENIED';
push(@{ $self->{'Kerberos_Challenge'}{$client_ip}{$url}{$time} }, $elapsed, $client_ip, $code, $bytes, $url, $id, $mime_type, $acl, $method);
$self->{has_407} = 1;
}
else
{
# Now parse data and generate statistics
$self->_parseData($time, $elapsed, $client_ip, $code, $bytes, $url, $id, $mime_type, $acl, $method);
$line_stored_count++;
}
}
$line_processed_count++;
@ -1433,6 +1448,21 @@ sub _parse_file_part
}
$logfile->close();
foreach my $ip (keys %{ $self->{'Kerberos_Challenge'} })
{
foreach my $url (keys %{ $self->{'Kerberos_Challenge'}{$ip} })
{
foreach my $time (keys %{ $self->{'Kerberos_Challenge'}{$ip}{$url} })
{
# Now parse data and generate statistics
$self->_parseData($time, @{ $self->{'Kerberos_Challenge'}{$ip}{$url}{$time} });
$line_stored_count++;
}
}
}
$self->{'Kerberos_Challenge'} = ();
$self->{has_407} = 0;
if ($self->{cur_year}) {
# Save last parsed data
$self->_append_data($self->{cur_year}, $self->{cur_month}, $self->{cur_day});
@ -1755,6 +1785,8 @@ sub _init
$self->{sg_end_offset} = 0;
$self->{ug_end_time} = 0;
$self->{ug_end_offset} = 0;
$self->{'Kerberos_Challenge'} = ();
$self->{has_407} = 0;
# Override verbose mode
$self->{QuietMode} = 0 if ($debug);
@ -2046,7 +2078,8 @@ sub _parseData
$hour = sprintf("%02d", $hour);
#### Store access denied statistics
if ($code eq 'DENIED') {
if ($code eq 'DENIED')
{
$self->{stat_code_hour}{$code}{$hour}{hits}++;
$self->{stat_code_hour}{$code}{$hour}{bytes} += $bytes;
$self->{stat_code_day}{$code}{$self->{last_day}}{hits}++;
@ -2076,6 +2109,11 @@ sub _parseData
}
return;
}
elsif ($self->{has_407} && exists $self->{'Kerberos_Challenge'}{$client}{$url})
{
delete $self->{'Kerberos_Challenge'}{$client}{$url};
delete $self->{'Kerberos_Challenge'}{$client} if (scalar keys %{ $self->{'Kerberos_Challenge'}{$client} } == 0);
}
#### Store client statistics
if ($self->{UserReport}) {