From 30eb606ed59da1c3c511f961abfe75a2749a3228 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 19 Nov 2009 10:13:22 +0100 Subject: tests: avoid spurious failures due to insecure directory in PATH These tests perform no PATH search, and used to simply delete PATH from the environment. However, that is not portable, as seen on Cygwin, where cygwin.dll must be resolvable via PATH when starting a sub-shell. With commit 0cc04241, we took the alternate approach of untainting the incoming $ENV{PATH}, but that fails when it contains an other-writable directory. Instead, now we hard code it to '/bin:/usr/bin'. * tests/misc/pwd-long: Hard code $ENV{PATH} to a safe value. * tests/rm/fail-eperm: Likewise. Reported by Gilles Espinasse, Andreas Schwab, and Bauke Jan Douma. --- tests/misc/pwd-long | 10 +++++----- tests/rm/fail-eperm | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/misc/pwd-long b/tests/misc/pwd-long index c67db024f..df1590c7d 100755 --- a/tests/misc/pwd-long +++ b/tests/misc/pwd-long @@ -56,11 +56,11 @@ sub normalize_to_cwd_relative ($$$) # Set up a safe, well-known environment delete @ENV{qw(BASH_ENV CDPATH ENV)}; $ENV{IFS} = ''; -# PATH is tricky - we can't just clear it, or cygwin will fail. But we -# can't use it as-is, or taint checking in `` will stop us. For this -# script, it is enough to scrub the incoming $PATH first. -$ENV{'PATH'} =~ /(.*)/; -$ENV{'PATH'} = "$1"; + +# Taint checking requires a sanitized $PATH. This script performs no $PATH +# search, so on most Unix-based systems, it is fine simply to clear $ENV{PATH}. +# However, on Cygwin, it's used to find cygwin.dll, so set it. +$ENV{PATH} = '/bin:/usr/bin'; # Save CWD's device and inode numbers. my ($dev, $ino) = (stat '.')[0, 1]; diff --git a/tests/rm/fail-eperm b/tests/rm/fail-eperm index 36192c2e5..16811c2ff 100755 --- a/tests/rm/fail-eperm +++ b/tests/rm/fail-eperm @@ -34,11 +34,11 @@ $ENV{LC_ALL} = 'C'; # Set up a safe, well-known environment delete @ENV{qw(BASH_ENV CDPATH ENV)}; $ENV{IFS} = ''; -# PATH is tricky - we can't just clear it, or cygwin will fail. But we -# can't use it as-is, or taint checking in `` will stop us. For this -# script, it is enough to scrub the incoming $PATH first. -$ENV{'PATH'} =~ /(.*)/; -$ENV{'PATH'} = "$1"; + +# Taint checking requires a sanitized $PATH. This script performs no $PATH +# search, so on most Unix-based systems, it is fine simply to clear $ENV{PATH}. +# However, on Cygwin, it's used to find cygwin.dll, so set it. +$ENV{PATH} = '/bin:/usr/bin'; my @dir_list = qw(/tmp /var/tmp /usr/tmp); my $rm = "$ENV{abs_top_builddir}/src/rm"; -- cgit v1.2.3-54-g00ecf