X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=tools%2Fprivoxy-regression-test.pl;h=8a6be062a7fbe809eb59272a117c2b8c1d878757;hp=0b66251c584b9f84cf2f3eae46237b54f11e0de8;hb=ccc7412790da979b56a1b171bcf64c48ff764e17;hpb=14b9c9c8d4cb6f06d38b54655ffc96ab778fdba7 diff --git a/tools/privoxy-regression-test.pl b/tools/privoxy-regression-test.pl index 0b66251c..8a6be062 100755 --- a/tools/privoxy-regression-test.pl +++ b/tools/privoxy-regression-test.pl @@ -47,11 +47,13 @@ use constant { CLI_LOOPS => 1, CLI_MAX_TIME => 5, CLI_MIN_LEVEL => 0, - # XXX: why limit at all? + # The reason for a maximum test level is explained in the + # perldoc section TEST LEVELS near the end of this file. CLI_MAX_LEVEL => 100, CLI_FORKS => 0, CLI_SLEEP_TIME => 0, + PRIVOXY_ADDRESS => 'http://127.0.0.1:8118/', PRIVOXY_CGI_URL => 'http://p.p/', FELLATIO_URL => 'http://127.0.0.1:8080/', LEADING_LOG_DATE => 1, @@ -89,6 +91,7 @@ sub init_our_variables() { our $leading_log_date = LEADING_LOG_DATE; our $privoxy_cgi_url = PRIVOXY_CGI_URL; our $log_level = get_default_log_level(); + our $proxy = defined $ENV{'http_proxy'} ? $ENV{'http_proxy'} : PRIVOXY_ADDRESS; } sub get_default_log_level() { @@ -132,7 +135,7 @@ sub parse_tag($) { sub check_for_forbidden_characters($) { my $string = shift; - my $allowed = '[-=\dA-Za-z~{}\[\]:./();\t ,+@"_%?&*^]'; + my $allowed = '[-=\dA-Za-z~{}\[\]:./();\t ,+@"_%?&*^|]'; unless ($string =~ m/^$allowed*$/o) { my $forbidden = $string; @@ -1299,10 +1302,20 @@ sub get_server_header($$) { sub get_status_code($) { my $buffer_ref = shift; + our $privoxy_cgi_url; + + my $skip_connection_established_response = $privoxy_cgi_url =~ m@^https://@; my @buffer = @{$buffer_ref}; foreach (@buffer) { + if ($skip_connection_established_response) { + + next if (m@^HTTP/1\.1 200 Connection established@); + next if (m@^\r\n$@); + $skip_connection_established_response = 0; + } + if (/^HTTP\/\d\.\d (\d{3})/) { return $1; @@ -1370,7 +1383,7 @@ sub get_cgi_page_or_else($) { if (200 != $status_code) { - my $log_message = "Failed to fetch Privoxy CGI Page. " . + my $log_message = "Failed to fetch Privoxy CGI page '$cgi_url'. " . "Received status code ". $status_code . " while only 200 is acceptable."; @@ -1403,8 +1416,13 @@ sub get_show_request_with_curl($) { # Enable the action to test $curl_parameters .= '-H \'X-Privoxy-Control: ' . $test->{'tag'} . '\' '; - # The header to filter - $curl_parameters .= '-H \'' . $header . '\' '; + + # Add the header to filter + if ($privoxy_cgi_url =~ m@^https://@ and $header =~ m@^Host:@) { + $curl_parameters .= '--proxy-header \'' . $header . '\' '; + } else { + $curl_parameters .= '-H \'' . $header . '\' '; + } $curl_parameters .= ' '; $curl_parameters .= $privoxy_cgi_url; @@ -1668,6 +1686,7 @@ sub list_test_types() { sub help() { our %cli_options; + our $privoxy_cgi_url; print_version(); @@ -1686,7 +1705,8 @@ Options and their default values if they have any: [--max-level $cli_options{'max-level'}] [--max-time $cli_options{'max-time'}] [--min-level $cli_options{'min-level'}] - [--privoxy-address] + [--privoxy-address $cli_options{'privoxy-address'}] + [--privoxy-cgi-prefix $privoxy_cgi_url] [--retries $cli_options{'retries'}] [--show-skipped-tests] [--shuffle-tests] @@ -1712,6 +1732,7 @@ sub init_cli_options() { our %cli_options; our $log_level; + our $proxy; $cli_options{'debug'} = $log_level; $cli_options{'forks'} = CLI_FORKS; @@ -1721,12 +1742,14 @@ sub init_cli_options() { $cli_options{'min-level'} = CLI_MIN_LEVEL; $cli_options{'sleep-time'}= CLI_SLEEP_TIME; $cli_options{'retries'} = CLI_RETRIES; + $cli_options{'privoxy-address'} = $proxy; } sub parse_cli_options() { our %cli_options; our $log_level; + our $privoxy_cgi_url; init_cli_options(); @@ -1744,6 +1767,7 @@ sub parse_cli_options() { 'max-time=i' => \$cli_options{'max-time'}, 'min-level=i' => \$cli_options{'min-level'}, 'privoxy-address=s' => \$cli_options{'privoxy-address'}, + 'privoxy-cgi-prefix=s' => \$privoxy_cgi_url, # XXX: Should use cli_options() 'retries=i' => \$cli_options{'retries'}, 'shuffle-tests' => \$cli_options{'shuffle-tests'}, 'show-skipped-tests' => \$cli_options{'show-skipped-tests'}, @@ -1827,7 +1851,7 @@ B [B<--debug bitmask>] [B<--forks> forks] [B<--fuzzer-feeding>] [B<--fuzzer-feeding>] [B<--help>] [B<--level level>] [B<--local-test-file testfile>] [B<--loops count>] [B<--max-level max-level>] [B<--max-time max-time>] [B<--min-level min-level>] B<--privoxy-address proxy-address> -[B<--retries retries>] [B<--test-number test-number>] +B<--privoxy-cgi-prefix cgi-prefix> [B<--retries retries>] [B<--test-number test-number>] [B<--show-skipped-tests>] [B<--sleep-time> seconds] [B<--verbose>] [B<--version>] @@ -2023,8 +2047,23 @@ above or equal to the numerical B. B<--privoxy-address proxy-address> Privoxy's listening address. If it's not set, the value of the environment variable http_proxy -will be used. B has to be specified in http_proxy -syntax. +will be used unless the variable isn't set in which case +http://127.0.0.1:8118/ will be used. B has to +be specified in http_proxy syntax. + +B<--privoxy-cgi-prefix privoxy-cgi-prefix> The prefix to use when +building URLs that are supposed to reach Privoxy's CGI interface. +If it's not set, B is used, which is supposed to work +with the default Privoxy configuration. +If Privoxy has been built with B enabled, +and if https inspection is activated with the B<+https-inspection> +action, this option can be used with +B provided the system running Privoxy-Regression-Test +has been configured to trust the certificate used by Privoxy. +Note that there are currently two tests in the official +B file that are expected to fail when +using a B with B and aren't automatically +skipped. B<--retries retries> Retry B times. @@ -2096,7 +2135,7 @@ Privoxy-Regression-Test in a meaningful way. =head1 SEE ALSO -privoxy(1) curl(1) +privoxy(8) curl(1) =head1 AUTHOR