mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-03-03 11:40:04 +02:00
3ea540c757
I started with the patches from Red Hat. The entries below tell how the code evolved. * src/ls.c (print_long_format, print_file_name_and_frills): When there is no security context (due to getfilecon/lgetfilecon failing with e.g. ENOTSUP), print it as "?", not "". * src/ls.c (print_file_name_and_frills): Make -Z work without -l. (length_of_file_name_and_frills): Likewise. * src/ls.c: Remove the --lcontext and --scontext options. Change the way -Z, --context work so that it no longer implies -l. Thus, -Z -l will work like -lcontext and -Z without -l will work like --scontext. Adjust tests to reflect new 'ls -l' syntax -- affects only systems with SELinux when operating on a file with no ACL. These tests assumed that everything before the first space on each line is the 10-byte mode string. But there may also be a "+" in the 11th column, just before the space. However, note that this is not new. The same thing would have happened even without the change below, when listing a file with an ACL. * tests/chmod/equals, tests/cp/cp-parents, tests/cp/fail-perm: * tests/cp/link-preserve, tests/install/basic-1, tests/misc/mknod: * tests/mkdir/parents, tests/mkdir/special-1, tests/mv/partition-perm: Don't make compilation depend on USE_ACL. An SELinux security context counts as an "alternate access control method", so ls must output a "+" for each file with a security context. * src/ls.c [struct fileinfo] (have_acl): Declare unconditionally. (FILE_HAS_ACL): Remove macro definition. Use f->have_acl directly. (gobble_file): Record whether a file has a security context, and update the condition used to determine whether to print the "+". (gobble_file): Call getfilecon/lgetfilecon also when format == long_format, so that we get the "+". * src/ls.c (gobble_file): Add a comment explaining why (with a security context option) ls doesn't exit nonzero due to e.g., getfilecon failing with errno == ENOTSUP. * src/ls.c (gobble_file): Ignore failure of getfilecon if it's due to ENOTSUP. * src/ls.c (gobble_file): Factor out three small blocks using getfilecon and lgetfilecon. Don't ignore return value from getfilecon and lgetfilecon. * src/ls.c (print_long_format): Don't use ?: (empty 2nd arg with C ternary operator). (print_scontext_format): Likewise. (print_scontext): Declare to be "bool", not int. Adjust uses. * src/Makefile.am (dir_LDADD, ls_LDADD, vdir_LDADD): Add $(LIB_SELINUX). * tests/misc/chcon: New file. * tests/misc/chcon-fail: New file. * tests/Makefile.am (check-root): Run new, root-only misc/chcon test. * tests/misc/Makefile.am (TESTS): Add chcon and chcon-fail. * tests/misc/Makefile.am (TESTS): Add selinux. * tests/misc/selinux: New file. * tests/help-version: Skip chcon.
154 lines
4.3 KiB
Bash
Executable File
154 lines
4.3 KiB
Bash
Executable File
#! /bin/sh
|
|
# Basic tests for "install".
|
|
|
|
# Copyright (C) 1998, 2000-2002, 2004-2007 Free Software Foundation, Inc.
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
# (at your option) any later version.
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software
|
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
# 02110-1301, USA.
|
|
|
|
if test "$VERBOSE" = yes; then
|
|
set -x
|
|
ginstall --version
|
|
fi
|
|
|
|
# Make sure we get English translations.
|
|
LANGUAGE=C
|
|
export LANGUAGE
|
|
LC_ALL=C
|
|
export LC_ALL
|
|
LANG=C
|
|
export LANG
|
|
|
|
. $srcdir/../envvar-check
|
|
PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check
|
|
|
|
dir=dir
|
|
file=file
|
|
|
|
pwd=`pwd`
|
|
t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$
|
|
trap 'status=$?; cd "$pwd" && chmod -R u+rwx $t0 && rm -rf $t0 && exit $status' 0
|
|
trap '(exit $?); exit $?' 1 2 13 15
|
|
|
|
framework_failure=0
|
|
mkdir -p $tmp || framework_failure=1
|
|
cd $tmp || framework_failure=1
|
|
|
|
rm -rf $dir $file || framework_failure=1
|
|
mkdir -p $dir || framework_failure=1
|
|
echo foo > $file || framework_failure=1
|
|
|
|
if test $framework_failure = 1; then
|
|
echo 'failure in testing framework'
|
|
exit 1
|
|
fi
|
|
|
|
fail=0
|
|
ginstall $file $dir || fail=1
|
|
# Make sure the source file still exists.
|
|
test -f $file || fail=1
|
|
# Make sure the dest file has been created.
|
|
test -f $dir/$file || fail=1
|
|
|
|
# Make sure strip works.
|
|
dd=dd$EXEEXT
|
|
dd2=dd2$EXEEXT
|
|
|
|
just_built_dd=$pwd/../../src/$dd
|
|
|
|
test -r "$just_built_dd" || \
|
|
{
|
|
cat 1>&2 <<EOF
|
|
$0: WARNING!!!
|
|
Your just-built dd binary, $just_built_dd
|
|
is not readable, so skipping the remaining tests in this file.
|
|
EOF
|
|
exit 77
|
|
}
|
|
|
|
cp "$just_built_dd" . || fail=1
|
|
cp $dd $dd2 || fail=1
|
|
|
|
strip $dd2 || \
|
|
{
|
|
cat 1>&2 <<EOF
|
|
$0: WARNING!!!
|
|
Your strip command doesn't seem to work, so skipping
|
|
the test of install's --strip option.
|
|
EOF
|
|
exit 77
|
|
}
|
|
|
|
# This test would fail with 3.16s when using versions of strip that
|
|
# don't work on read-only files (the one from binutils works fine).
|
|
ginstall -s -c -m 555 $dd $dir || fail=1
|
|
# Make sure the source file is still around.
|
|
test -f $dd || fail=1
|
|
|
|
# Make sure that the destination file has the requested permissions.
|
|
mode=`ls -l $dir/$dd|cut -b-10`
|
|
test "$mode" = -r-xr-xr-x || fail=1
|
|
|
|
# These failed in coreutils CVS from 2004-06-25 to 2004-08-11.
|
|
ginstall -d . || fail=1
|
|
ginstall -d newdir || fail=1
|
|
test -d newdir || fail=1
|
|
ginstall -d newdir1 newdir2 newdir3 || fail=1
|
|
test -d newdir1 || fail=1
|
|
test -d newdir2 || fail=1
|
|
test -d newdir3 || fail=1
|
|
|
|
# This fails because mkdir-p.c's make_dir_parents fails to return to its
|
|
# initial working directory ($abs) after creating the first argument, and
|
|
# hence cannot do anything meaningful with the following relative-named dirs.
|
|
abs=$pwd/$tmp
|
|
mkdir sub || fail=1
|
|
(cd sub && chmod 0 . && ginstall -d "$abs/xx/yy" rel/sub1 rel/sub2 2> /dev/null) && fail=1
|
|
chmod 755 sub
|
|
|
|
# Ensure that the first argument-dir has been created.
|
|
test -d xx/yy || fail=1
|
|
|
|
# Make sure that the `rel' directory was not created...
|
|
test -d sub/rel && fail=1
|
|
# and make sure it was not created in the wrong place.
|
|
test -d xx/rel && fail=1
|
|
|
|
# Test that we can install from an unreadable directory with an
|
|
# inaccessible parent. coreutils 5.97 fails this test.
|
|
# Perform this test only if "." is on a local file system.
|
|
# Otherwise, it would fail e.g., on an NFS-mounted file system.
|
|
if df --local . >/dev/null 2>&1; then
|
|
mkdir -p sub1/d || fail=1
|
|
(cd sub1/d && chmod a-r . && chmod a-rx .. &&
|
|
ginstall -d "$abs/xx/zz" rel/a rel/b) || fail=1
|
|
chmod 755 sub1 sub1/d || fail=1
|
|
test -d xx/zz || fail=1
|
|
test -d sub1/d/rel/a || fail=1
|
|
test -d sub1/d/rel/b || fail=1
|
|
fi
|
|
|
|
touch file || fail=1
|
|
ginstall -Dv file sub3/a/b/c/file >out 2>&1 || fail=1
|
|
diff - out <<\EOF || fail=1
|
|
ginstall: creating directory `sub3'
|
|
ginstall: creating directory `sub3/a'
|
|
ginstall: creating directory `sub3/a/b'
|
|
ginstall: creating directory `sub3/a/b/c'
|
|
`file' -> `sub3/a/b/c/file'
|
|
EOF
|
|
|
|
(exit $fail); exit $fail
|