From 12ce72438f609fed0a22248ab0945466252dc936 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Thu, 9 Apr 2015 16:02:08 +0000 Subject: [PATCH 2/2] Make TAP tests of SSL more portable by avoiding cp Instead, glob takes care of the wildcard, and is used with File::Copy to copy the set of files necessary for the tests in PGDATA. --- src/test/ssl/ServerSetup.pm | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/src/test/ssl/ServerSetup.pm b/src/test/ssl/ServerSetup.pm index 1579dc9..ee4daf0 100644 --- a/src/test/ssl/ServerSetup.pm +++ b/src/test/ssl/ServerSetup.pm @@ -19,6 +19,8 @@ package ServerSetup; use strict; use warnings; use TestLib; +use File::Basename; +use File::Copy; use Test::More; use Exporter 'import'; @@ -26,6 +28,20 @@ our @EXPORT = qw( configure_test_server_for_ssl switch_server_cert ); +# Copy a set of files, taking into account wildcards +sub copy_files +{ + my $orig = shift; + my $dest = shift; + + my @orig_files = glob $orig; + foreach my $orig_file (@orig_files) + { + my $base_file = basename($orig_file); + copy($orig_file, "$dest/$base_file") or die "Could not copy $orig_file to $dest"; + } +} + sub configure_test_server_for_ssl { my $tempdir = $_[0]; @@ -48,13 +64,12 @@ sub configure_test_server_for_ssl close CONF; - # Copy all server certificates and keys, and client root cert, to the data dir - system_or_bail "cp ssl/server-*.crt '$tempdir'/pgdata"; - system_or_bail "cp ssl/server-*.key '$tempdir'/pgdata"; + copy_files("ssl/server-*.crt", "$tempdir/pgdata"); + copy_files("ssl/server-*.key", "$tempdir/pgdata"); system_or_bail "chmod 0600 '$tempdir'/pgdata/server-*.key"; - system_or_bail "cp ssl/root+client_ca.crt '$tempdir'/pgdata"; - system_or_bail "cp ssl/root+client.crl '$tempdir'/pgdata"; + copy_files("ssl/root+client_ca.crt", "$tempdir/pgdata"); + copy_files("ssl/root+client.crl", "$tempdir/pgdata"); # Only accept SSL connections from localhost. Our tests don't depend on this # but seems best to keep it as narrow as possible for security reasons. -- 2.3.5