github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2026-08-31 03:37:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix path and VPATH issues of new https/TLS tests

Browse Source 
* tests/SSLTest.pm: Use $srcdir in read-only files,
  (_setup_server): Remove unneeded path fixation code
* tests/Test-https-*.px: Use $srcdir for read-only files,
  use $cdir for writable files
* tests/certs/interca.conf: Adjust paths
* tests/certs/rootca.conf: Adjust paths
This commit is contained in:
Tim Rühsen
2017-05-09 15:21:23 +02:00
parent 466afc62b0
commit b5c2d083ea
11 changed files with 217 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/Test-https-selfsigned.px
View File

@@ -27,23 +27,34 @@ unless ($ossl =~ m/OpenSSL 1/)
exit 77;
}
my $cdir = $ENV{'PWD'};
my $srcdir;
if (@ARGV) {
$srcdir = shift @ARGV;
} elsif (defined $ENV{srcdir}) {
$srcdir = $ENV{srcdir};
}
$srcdir = Cwd::abs_path("$srcdir");
my $cdir = $ENV{'PWD'};
# HOSTALIASES env variable allows us to create hosts file alias.
my $testhostname = "WgetTestingServer";
$ENV{'HOSTALIASES'} = "$cdir/certs/wgethosts";
$ENV{'HOSTALIASES'} = "$srcdir/certs/wgethosts";
my $addr = gethostbyname($testhostname) or
my $addr = gethostbyname($testhostname);
unless ($addr)
{
warn "Failed to resolve $addr, using $srcdir/certs/wgethosts\n";
exit 77;
}
unless (inet_ntoa($addr) =~ "127.0.0.1")
{
warn "Failed to resolve $testhostname";
warn "Failed to resolve $$addr, using $srcdir/certs/wgethosts\n";
exit 77;
}
# Prepare self-signed certificates
my $certfile="tmpsscert.pem";
my $keyfile="tmpsskey.pem";
my $certfile="$cdir/tmpsscert.pem";
my $keyfile="$cdir/tmpsskey.pem";
my $certsubj="/C=US/ST=CA/L=Mystery Spot/O=Dis/CN=$testhostname/emailAddress=tester";
my $sscertcmd="openssl req -x509 -nodes -newkey rsa:4096 -keyout $keyfile ".
" -out $certfile -days 365 -subj \"$certsubj\"";
@@ -61,7 +72,7 @@ unless(-e $certfile && -e $keyfile && $sscheck == 1)
# Try Wget using SSL first without --no-check-certificate. expect error
my $port = 26443;
my $cmdline = $WgetTest::WGETPATH . " --ca-certificate=$cdir/certs/test-ca-cert.pem".
my $cmdline = $WgetTest::WGETPATH . " --ca-certificate=$srcdir/certs/test-ca-cert.pem".
" https://$testhostname:$port/somefile.txt";
my $expected_error_code = 5;
my %existing_files = (
@@ -90,7 +101,7 @@ if ($sslsock->run() == 0)
# Retry the test with --no-check-certificate. expect success
$port = 27443;
$cmdline = $WgetTest::WGETPATH . " --no-check-certificate ".
" --ca-certificate=$cdir/certs/test-ca-cert.pem".
" --ca-certificate=$srcdir/certs/test-ca-cert.pem".
" https://$testhostname:$port/somefile.txt";
$expected_error_code = 0;