X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=tools%2Fprivoxy-log-parser.pl;h=ae4ef3eee73c793769b935b1158993bda51069f4;hp=00fc2bdb9c952cdeb0320f329c3b5bd723f537d3;hb=2f70740f2b352c5d75853ef5d7e90ec75c9c6c82;hpb=a238f1da1c29627d69c79150dd10b410adbee1c8 diff --git a/tools/privoxy-log-parser.pl b/tools/privoxy-log-parser.pl index 00fc2bdb..ae4ef3ee 100755 --- a/tools/privoxy-log-parser.pl +++ b/tools/privoxy-log-parser.pl @@ -23,7 +23,7 @@ # hash key as input. # - Add --compress and --decompress options. # -# Copyright (c) 2007-2021 Fabian Keil +# Copyright (c) 2007-2022 Fabian Keil # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -43,7 +43,7 @@ use warnings; use Getopt::Long; use constant { - PRIVOXY_LOG_PARSER_VERSION => '0.9.4', + PRIVOXY_LOG_PARSER_VERSION => '0.9.5', # Feel free to mess with these ... DEFAULT_BACKGROUND => 'black', # Choose registered colour (like 'black') DEFAULT_TEXT_COLOUR => 'white', # Choose registered colour (like 'black') @@ -186,6 +186,8 @@ sub prepare_our_stuff() { 'configuration-line' => 'red', 'content-type' => 'yellow', 'HOST' => HEADER_DEFAULT_COLOUR, + 'tls-version' => 'pink', + 'cipher-suite' => 'light_cyan', ); %h_colours = %h; @@ -1625,9 +1627,10 @@ sub handle_loglevel_connect($) { $c = highlight_matched_host($c, '(?<=for )[^\s]+'); $c =~ s@(?<=in slot )(\d+)@$h{'Number'}$1$h{'Standard'}@; - } elsif ($c =~ m/^Socket/) { + } elsif ($c =~ m/^Socket \d+ (already|closed)/) { # Socket 16 already forgotten or never remembered. + # Socket 9 closed while waiting for client headers $c =~ s@(?<=Socket )(\d+)@$h{'Number'}$1$h{'Standard'}@; } elsif ($c =~ m/^The connection to/) { @@ -1644,7 +1647,7 @@ sub handle_loglevel_connect($) { $c =~ s@(?<=Assumed latency: )(\d+)@$h{'Number'}$1$h{'Standard'}@; } elsif ($c =~ m/^Stopped waiting for the request line/ or - $c =~ m/^No request line on socket \d received in time/ or + $c =~ m/^No request line on socket \d+ received in time/ or $c =~ m/^The client side of the connection on socket \d/) { # Stopped waiting for the request line. Timeout: 121. @@ -1903,6 +1906,52 @@ sub handle_loglevel_connect($) { # Client socket 7 is no longer usable. The server socket has been closed. $c =~ s@(?<=socket )(\d+)@$h{'Number'}$1$h{'Standard'}@; + } elsif ($c =~ m/^Socket timeout \d+ reached/) { + + # Socket timeout 3 reached: http://127.0.0.1:20000/no-filter/chunked-content/36 + $c =~ s@(?<=timeout )(\d+)@$h{'Number'}$1$h{'Standard'}@; + $c = highlight_matched_url($c, "(?<=reached: ).*") + + } elsif ($c =~ m/^Prepared to read up to /) { + + # Prepared to read up to 157 bytes of encrypted request body from the client. + $c =~ s@(?<=up to )(\d+)@$h{'Number'}$1$h{'Standard'}@; + + } elsif ($c =~ m/^Forwarding \d+ bytes /) { + + # Forwarding 157 bytes of encrypted request body. + $c =~ s@(?<=Forwarding )(\d+)@$h{'Number'}$1$h{'Standard'}@; + + } elsif ($c =~ m/^Buffering encrypted client body/) { + + # Buffering encrypted client body. Prepared to read up to 2236 bytes. + $c =~ s@(?<=up to )(\d+)@$h{'Number'}$1$h{'Standard'}@; + + } elsif ($c =~ m/^The last \d+ bytes of the encrypted request body have been read/) { + + # The last 6945 bytes of the encrypted request body have been read. + $c =~ s@(?<=The last )(\d+)@$h{'Number'}$1$h{'Standard'}@; + + } elsif ($c =~ m/^Reducing the chunk offset from/) { + + # Reducing the chunk offset from 1096654 to 32704 after discarding 1063950 bytes to make room in the buffer. + # Reducing the chunk offset from 16219 to 128 after flushing 16091 bytes. + $c =~ s@(?<=\d to )(\d+)@$h{'Number'}$1$h{'Standard'}@; + $c =~ s@(?<=offset from )(\d+)@$h{'Number'}$1$h{'Standard'}@; + $c =~ s@(?<=after discarding )(\d+)@$h{'Number'}$1$h{'Standard'}@; + $c =~ s@(?<=after flushing )(\d+)@$h{'Number'}$1$h{'Standard'}@; + + } elsif ($c =~ m/^Client socket \d+ is no longer usable/) { + + # Client socket 21 is no longer usable. The server socket has been closed. + $c =~ s@(?<=Client socket )(\d+)@$h{'Number'}$1$h{'Standard'}@; + + } elsif ($c =~ m/^Server successfully connected over/) { + + # Server successfully connected over TLSv1.3 (TLS_AES_256_GCM_SHA384). + $c =~ s@(?<=connected over )(TLSv\d\.\d)@$h{'tls-version'}$1$h{'Standard'}@; + $c =~ s@(?<=\()([^)]+)@$h{'cipher-suite'}$1$h{'Standard'}@; + } elsif ($c =~ m/^Looks like we / or $c =~ m/^Unsetting keep-alive flag/ or $c =~ m/^No connections to wait/ or @@ -2149,6 +2198,10 @@ sub handle_loglevel_error($) { $c =~ s@(?<=digested )(\d+)@$h{'Number'}$1$h{'Standard'}@; $c =~ s@(?<=of )(\d+)@$h{'Number'}$1$h{'Standard'}@; + } elsif ($c =~ m/^The socks connection timed out after/) { + + # The socks connection timed out after 60 seconds. + $c =~ s@(?<=after )(\d+)@$h{'Number'}$1$h{'Standard'}@; } # XXX: There are probably more messages that deserve highlighting. @@ -2741,7 +2794,7 @@ sub stats_loop() { } -# Convert a timestamp like 18:07:28.733 into miliseconds +# Convert a timestamp like 18:07:28.733 into milliseconds sub time_stamp_to_msecs($) { my $time_stamp = shift; @@ -2773,7 +2826,7 @@ sub inactivity_detection_loop() { next if ($time_stamp eq "-"); $msecs = time_stamp_to_msecs($time_stamp); unless (defined $msecs) { - print "Failed to convert $time_stamp into miliseconds\n"; + print "Failed to convert $time_stamp into milliseconds\n"; print "$_"; next; } @@ -2984,8 +3037,9 @@ will hide the "filter foo caused 0 hits" message. =head1 OPTIONS -[B<--detect-inactivity>] Instead of syntax highlighting, detect inactivities -of more than B miliseconds. Mainly useful for debugging. +[B<--detect-inactivity>] Instead of syntax highlighting, detect periods +of log inactivity of more than the amount of milliseconds specified with +the B<--inactivity-threshold> option. Mainly useful for debugging. [B<--host-statistics-threshold>] Only show the request count for a host if it's above or equal to the given threshold. If the threshold is 0, host @@ -2996,8 +3050,9 @@ omitted, ANSI escape sequences are used unless B<--no-syntax-highlighting> is ac This option is only intended to make embedding log excerpts in web pages easier. It does not escape any input! -[B<--inactivity-threshold>] Specifies the number of miliseconds between log -messages to consider inactivity when running in [B<--detect-inactivity>] mode. +[B<--inactivity-threshold msecs>] Specifies the number of milliseconds between +log messages to consider inactivity when running in [B<--detect-inactivity>] +mode. [B<--keep-date>] Don't remove the date when printing highlighted log messages. Useful when parsing multiple log files at once.