X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=tools%2Fprivoxy-regression-test.pl;h=f20ad523bc5236fc19b51bf67036e4cc29321ab6;hp=9b57beac9766333c202206e9470360c10c8f11b8;hb=de2de93ff16bc3f4dc3976657ee73bd94c266c54;hpb=ff105e479f5d9504c9dba1f099aa516416f58e3e
diff --git a/tools/privoxy-regression-test.pl b/tools/privoxy-regression-test.pl
index 9b57beac..f20ad523 100755
--- a/tools/privoxy-regression-test.pl
+++ b/tools/privoxy-regression-test.pl
@@ -7,20 +7,15 @@
# A regression test "framework" for Privoxy. For documentation see:
# perldoc privoxy-regression-test.pl
#
-# $Id: privoxy-regression-test.pl,v 1.145 2008/04/12 12:27:51 fk Exp $
+# $Id: privoxy-regression-test.pl,v 1.160 2008/10/25 15:39:27 fk Exp $
#
# Wish list:
#
# - Update documentation
# - Validate HTTP times.
-# - Understand default.action.master comment syntax
-# and verify that we actually block and unblock what
-# the comments claim we do.
# - Implement a HTTP_VERSION directive or allow to
# specify whole request lines.
# - Support filter regression tests.
-# - Add option to fork regression tests and run them in parallel,
-# possibly optional forever.
# - Document magic Expect Header values
# - Internal fuzz support?
#
@@ -45,19 +40,20 @@ use strict;
use Getopt::Long;
use constant {
- PRT_VERSION => 'Privoxy-Regression-Test 0.2',
+ PRT_VERSION => 'Privoxy-Regression-Test 0.3',
- CURL => 'curl',
+ CURL => 'curl',
# CLI option defaults
- CLI_RETRIES => 1,
- CLI_LOOPS => 1,
- CLI_MAX_TIME => 5,
- CLI_MIN_LEVEL => 0,
- CLI_MAX_LEVEL => 25,
+ CLI_RETRIES => 1,
+ CLI_LOOPS => 1,
+ CLI_MAX_TIME => 5,
+ CLI_MIN_LEVEL => 0,
+ CLI_MAX_LEVEL => 25,
+ CLI_FORKS => 0,
PRIVOXY_CGI_URL => 'http://p.p/',
- FELLATIO_URL => 'http://10.0.0.1:8080/',
+ FELLATIO_URL => 'http://127.0.0.1:8080/',
LEADING_LOG_DATE => 1,
LEADING_LOG_TIME => 1,
@@ -159,9 +155,11 @@ sub load_regressions_tests () {
our $privoxy_cgi_url;
our @privoxy_config;
+ our %privoxy_features;
my @actionfiles;
my $curl_url = '';
my $file_number = 0;
+ my $feature;
$curl_url .= $privoxy_cgi_url;
$curl_url .= 'show-status';
@@ -180,6 +178,15 @@ sub load_regressions_tests () {
my $directive = $1 . " " . $2;
push (@privoxy_config, $directive);
+
+ } elsif (m@([^<]*) | @) {
+
+ $feature = $1;
+
+ } elsif (m@ (Yes|No) | @) {
+
+ $privoxy_features{$feature} = $1 if defined $feature;
+ $feature = undef;
}
}
@@ -314,7 +321,8 @@ sub load_action_files ($) {
my $ignored = 0;
- l(LL_STATUS, "Loading regression tests from action file(s) delivered by Privoxy.");
+ l(LL_STATUS, "Gathering regression tests from " .
+ @actionfiles . " action file(s) delivered by Privoxy.");
for my $file_number (0 .. @actionfiles - 1) {
@@ -542,6 +550,8 @@ sub dependency_unsatisfied ($) {
my $level = shift;
our %dependencies;
our @privoxy_config;
+ our %privoxy_features;
+
my $dependency_problem = 0;
if (defined ($dependencies{$level}{'config line'})) {
@@ -552,6 +562,19 @@ sub dependency_unsatisfied ($) {
foreach (@privoxy_config) {
$dependency_problem = 0 if (/$dependency/);
+ last;
+ }
+
+ } elsif (defined ($dependencies{$level}{'feature status'})) {
+
+ my $dependency = $dependencies{$level}{'feature status'};
+ $dependency_problem = 1;
+ my ($feature, $status) = $dependency =~ /([^\s]*)\s+(Yes|No)/;
+
+ if (defined($privoxy_features{$feature})
+ and ($privoxy_features{$feature} eq $status))
+ {
+ $dependency_problem = 0;
}
}
@@ -566,7 +589,12 @@ sub register_dependency ($$) {
if ($dependency =~ /config line\s+(.*)/) {
- $dependencies{$level}{'config line'} = $1;
+ $dependencies{$level}{'config line'} = $1;
+
+ } elsif ($dependency =~ /feature status\s+(.*)/) {
+
+ $dependencies{$level}{'feature status'} = $1;
+
}
}
@@ -744,7 +772,13 @@ sub check_status_code_result ($$) {
my $expected_status_code = shift;
my $result = 0;
- if ($expected_status_code == $status_code) {
+ unless (defined $status_code) {
+
+ # XXX: should probably be caught earlier.
+ l(LL_VERBOSE_FAILURE,
+ "Ooops. We expected status code " . $expected_status_code . ", but didn't get any status code at all.");
+
+ } elsif ($expected_status_code == $status_code) {
$result = 1;
l(LL_VERBOSE_SUCCESS,
@@ -791,7 +825,6 @@ sub execute_server_header_regression_test ($) {
return check_header_result($test_ref, $header);
}
-
sub interpret_result ($) {
my $success = shift;
return $success ? "Success" : "Failure";
@@ -806,8 +839,6 @@ sub check_header_result ($$) {
my $expect_header = $test{'expect-header'};
my $success = 0;
- $header =~ s@ @ @g if defined($header);
-
if ($expect_header eq 'NO CHANGE') {
if (defined($header) and $header eq $test{'data'}) {
@@ -922,6 +953,9 @@ sub get_header ($$) {
s@^\s*<.*?>@@g;
s@\s*$@@g;
+ # Decode characters we care about.
+ s@"@"@g;
+
$filtered_request .= "\n" . $_;
if (/^$header_to_get/) {
@@ -1021,6 +1055,20 @@ sub test_content_as_string ($) {
return $s;
}
+sub fuzz_header($) {
+ my $header = shift;
+ my $white_space = int(rand(2)) - 1 ? " " : "\t";
+
+ $white_space = $white_space x (1 + int(rand(5)));
+
+ # Only fuzz white space before the first quoted token.
+ # (Privoxy doesn't touch white space inside quoted tokens
+ # and modifying it would cause the tests to fail).
+ $header =~ s@(^[^"]*?)\s@$1$white_space@g;
+
+ return $header;
+}
+
############################################################################
#
# HTTP fetch functions
@@ -1059,6 +1107,7 @@ sub get_cgi_page_or_else ($) {
return $content_ref;
}
+# XXX: misleading name
sub get_show_request_with_curl ($) {
our $privoxy_cgi_url;
@@ -1066,11 +1115,16 @@ sub get_show_request_with_curl ($) {
my %test = %{$test_ref};
my $curl_parameters = ' ';
+ my $header = $test{'data'};
+
+ if (cli_option_is_set('header-fuzzing')) {
+ $header = fuzz_header($header);
+ }
# Enable the action to test
$curl_parameters .= '-H \'X-Privoxy-Control: ' . $test{'tag'} . '\' ';
# The header to filter
- $curl_parameters .= '-H \'' . $test{'data'} . '\' ';
+ $curl_parameters .= '-H \'' . $header . '\' ';
$curl_parameters .= ' ';
$curl_parameters .= $privoxy_cgi_url;
@@ -1079,7 +1133,6 @@ sub get_show_request_with_curl ($) {
return get_cgi_page_or_else($curl_parameters);
}
-
sub get_head_with_curl ($) {
our $fellatio_url = FELLATIO_URL;
@@ -1100,18 +1153,17 @@ sub get_head_with_curl ($) {
return get_page_with_curl($curl_parameters);
}
-
sub get_page_with_curl ($) {
+ our $proxy;
+
my $parameters = shift;
my @buffer;
my $curl_line = CURL;
my $retries_left = get_cli_option('retries') + 1;
my $failure_reason;
- if (cli_option_is_set('privoxy-address')) {
- $curl_line .= ' --proxy ' . get_cli_option('privoxy-address');
- }
+ $curl_line .= ' --proxy ' . $proxy if (defined $proxy);
# We want to see the HTTP status code
$curl_line .= " --include ";
@@ -1170,7 +1222,6 @@ sub array_as_string ($) {
return $string;
}
-
sub show_test ($) {
my $test_ref = shift;
log_message('Test is:' . test_content_as_string($test_ref));
@@ -1307,7 +1358,7 @@ sub log_result ($$) {
}
}
- log_message($message) unless ($result && cli_option_is_set('silent'));
+ log_message($message) if (!$result or cli_option_is_set('verbose'));
}
sub quote ($) {
@@ -1329,8 +1380,11 @@ sub help () {
Options and their default values if they have any:
[--debug $cli_options{'debug'}]
+ [--forks $cli_options{'forks'}]
+ [--fuzzer-address]
[--fuzzer-feeding]
[--help]
+ [--header-fuzzing]
[--level]
[--loops $cli_options{'loops'}]
[--max-level $cli_options{'max-level'}]
@@ -1338,7 +1392,8 @@ Options and their default values if they have any:
[--min-level $cli_options{'min-level'}]
[--privoxy-address]
[--retries $cli_options{'retries'}]
- [--silent]
+ [--test-number]
+ [--verbose]
[--version]
see "perldoc $0" for more information
EOF
@@ -1357,6 +1412,7 @@ sub init_cli_options () {
$cli_options{'loops'} = CLI_LOOPS;
$cli_options{'max-time'} = CLI_MAX_TIME;
$cli_options{'retries'} = CLI_RETRIES;
+ $cli_options{'forks'} = CLI_FORKS;
}
sub parse_cli_options () {
@@ -1368,17 +1424,20 @@ sub parse_cli_options () {
GetOptions (
'debug=s' => \$cli_options{'debug'},
+ 'forks=s' => \$cli_options{'forks'},
'help' => sub { help },
- 'silent' => \$cli_options{'silent'},
+ 'header-fuzzing' => \$cli_options{'header-fuzzing'},
'min-level=s' => \$cli_options{'min-level'},
'max-level=s' => \$cli_options{'max-level'},
'privoxy-address=s' => \$cli_options{'privoxy-address'},
+ 'fuzzer-address=s' => \$cli_options{'fuzzer-address'},
'level=s' => \$cli_options{'level'},
'loops=s' => \$cli_options{'loops'},
'test-number=s' => \$cli_options{'test-number'},
'fuzzer-feeding' => \$cli_options{'fuzzer-feeding'},
'retries=s' => \$cli_options{'retries'},
'max-time=s' => \$cli_options{'max-time'},
+ 'verbose' => \$cli_options{'verbose'},
'version' => sub { print_version && exit(0) }
);
$log_level |= $cli_options{'debug'};
@@ -1402,12 +1461,47 @@ sub get_cli_option ($) {
return $cli_options{$cli_option};
}
+sub init_proxy_settings($) {
+
+ my $choice = shift;
+ our $proxy = undef;
+
+ if (($choice eq 'fuzz-proxy') and cli_option_is_set('fuzzer-address')) {
+ $proxy = get_cli_option('fuzzer-address');
+ }
+
+ if ((not defined $proxy) or ($choice eq 'vanilla-proxy')) {
+
+ if (cli_option_is_set('privoxy-address')) {
+ $proxy .= get_cli_option('privoxy-address');
+ }
+
+ }
+}
+
+sub start_forks($) {
+ my $forks = shift;
+
+ l(LL_ERROR, "Invalid --fork value: " . $forks . ".") if ($forks < 0);
+
+ foreach my $fork (1 .. $forks) {
+ log_message("Starting fork $fork");
+ my $pid = fork();
+ if (defined $pid && !$pid) {
+ return;
+ }
+ }
+}
+
sub main () {
init_our_variables();
parse_cli_options();
check_for_curl();
+ init_proxy_settings('vanilla-proxy');
load_regressions_tests();
+ init_proxy_settings('fuzz-proxy');
+ start_forks(get_cli_option('forks')) if cli_option_is_set('forks');
execute_regression_tests();
}
@@ -1419,10 +1513,12 @@ B - A regression test "framework" for Privoxy.
=head1 SYNOPSIS
-B [B<--debug bitmask>] [B<--fuzzer-feeding>] [B<--help>]
-[B<--level level>] [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<--silent>] [B<--version>]
+B [B<--debug bitmask>] [B<--forks> forks]
+[B<--fuzzer-feeding>] [B<--fuzzer-feeding>] [B<--help>] [B<--level level>]
+[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<--verbose>]
+[B<--version>]
=head1 DESCRIPTION
@@ -1521,6 +1617,13 @@ requests to level 3 and client-header-action tests to level 1.
B<--debug bitmask> Add the bitmask provided as integer
to the debug settings.
+B<--forks forks> Number of forks to start before executing
+the regression tests. This is mainly useful for stress-testing.
+
+B<--fuzzer-address> Listening address used when executing
+the regression tests. Useful to make sure that the requests
+to load the regression tests don't fail due to fuzzing.
+
B<--fuzzer-feeding> Ignore some errors that would otherwise
cause Privoxy-Regression-Test to abort the test because
they shouldn't happen in normal operation. This option is
@@ -1531,6 +1634,9 @@ message.
B<--help> Shows available command line options.
+B<--header-fuzzing> Modifies linear white space in
+headers in a way that should not affect the test result.
+
B<--level level> Only execute tests with the specified B.
B<--loop count> Loop through the regression tests B times.
@@ -1557,7 +1663,10 @@ syntax.
B<--retries retries> Retry B times.
-B<--silent> Don't log succesful test runs.
+B<--test-number test-number> Only run the test with the specified
+number.
+
+B<--verbose> Also log succesful test runs.
B<--version> Print version and exit.