mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix sourcing prologue.inc if parent directory contains spaces

Browse source 
Most `tests/regression/apparmor/*.sh` scripts contain

    . $bin/prologue.inc

This will explode if one of the parent directories contains a space.

Minimized reproducer:

```
pwd=`dirname $0`
pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
echo "pwd: $bin"
. $bin/prologue.inc
pwd: /tmp/foo bar
./test.sh: line 9: /tmp/foo: No such file or directory
```

Notice that test.sh tries to source `/tmp/foo` instead of `/tmp/foo bar/prologue.inc`.

The fix - as done in this commit - is to quote the prologue.inc path:

    . "$bin/prologue.inc"
This commit is contained in:
Christian Boltz 2024-11-10 20:58:21 +01:00
parent 4c32ad8fb7
commit e1972eb22f
Failed to generate hash of commit
76 changed files with 76 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/regression/apparmor/aa_exec.sh
View file

@ -19,7 +19,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
ns=aa_exec_ns

2
tests/regression/apparmor/aa_policy_cache.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
# cacheloc is the top level directory of cache directories
cacheloc="$tmpdir/cache"

2
tests/regression/apparmor/access.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
file=$tmpdir/file

2
tests/regression/apparmor/at_secure.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
settest transition
at_secure=$pwd/at_secure

2
tests/regression/apparmor/attach_disconnected.sh
View file

@ -17,7 +17,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
settest unix_fd_server
disk_img=$tmpdir/disk_img

2
tests/regression/apparmor/capabilities.sh
View file

@ -27,7 +27,7 @@ pwd=`dirname $0`
pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
TESTS="syscall_ptrace syscall_sethostname \
syscall_setdomainname syscall_setpriority syscall_setscheduler \

2
tests/regression/apparmor/changehat.sh
View file

@ -17,7 +17,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
file=$tmpdir/file
subfile=$tmpdir/file2

2
tests/regression/apparmor/changehat_fork.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
file=$tmpdir/file
subfile=$tmpdir/file2

2
tests/regression/apparmor/changehat_misc.sh
View file

@ -18,7 +18,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
file=$tmpdir/file
subfile=$tmpdir/file2

2
tests/regression/apparmor/changeprofile.sh
View file

@ -17,7 +17,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
file=$tmpdir/file
subfile=$tmpdir/file2

2
tests/regression/apparmor/chdir.sh
View file

@ -18,7 +18,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
dir=$tmpdir/tmpdir

2
tests/regression/apparmor/clone.sh
View file

@ -17,7 +17,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
# TEST1 unconfined

2
tests/regression/apparmor/coredump.sh
View file

@ -63,7 +63,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
coreperm=r
nocoreperm=ix

2
tests/regression/apparmor/dbus_eavesdrop.sh
View file

@ -17,7 +17,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
requires_kernel_features dbus
requires_parser_support "dbus,"
. $bin/dbus.inc

2
tests/regression/apparmor/dbus_message.sh
View file

@ -17,7 +17,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
requires_kernel_features dbus
requires_parser_support "dbus,"
. $bin/dbus.inc

2
tests/regression/apparmor/dbus_service.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
requires_kernel_features dbus
requires_parser_support "dbus,"
. $bin/dbus.inc

2
tests/regression/apparmor/dbus_unrequested_reply.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
requires_kernel_features dbus
requires_parser_support "dbus,"
. $bin/dbus.inc

2
tests/regression/apparmor/deleted.sh
View file

@ -20,7 +20,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
file=$tmpdir/file
file2="$tmpdir/file (deleted)"

2
tests/regression/apparmor/e2e.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
# load_and_verify - Generate and load a profile, then verify that raw_data
# matches the generated cached policy

2
tests/regression/apparmor/environ.sh
View file

@ -17,7 +17,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
helper=$pwd/env_check
setuid_helper=${tmpdir}/env_check

2
tests/regression/apparmor/exec.sh
View file

@ -14,7 +14,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
cp -pL /bin/true ${tmpdir}/true
file=${tmpdir}/true

2
tests/regression/apparmor/exec_qual.sh
View file

@ -19,7 +19,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
file=/etc/group

2
tests/regression/apparmor/exec_stack.sh
View file

@ -17,7 +17,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
requires_kernel_features domain/stack
settest transition

2
tests/regression/apparmor/fchdir.sh
View file

@ -18,7 +18,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
dir=$tmpdir/tmpdir/

2
tests/regression/apparmor/fd_inheritance.sh
View file

@ -29,7 +29,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
file=$tmpdir/file
inheritor=$bin/fd_inheritor

2
tests/regression/apparmor/fork.sh
View file

@ -19,7 +19,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
file1=$tmpdir/file1
file2=$tmpdir/file2

2
tests/regression/apparmor/i18n.sh
View file

@ -20,7 +20,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
okperm=rw
badperm1=r

2
tests/regression/apparmor/introspect.sh
View file

@ -14,7 +14,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
ok_ix_perm=rix
badperm=r

2
tests/regression/apparmor/io_uring.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
requires_kernel_features io_uring
requires_parser_support "io_uring,"

2
tests/regression/apparmor/link.sh
View file

@ -20,7 +20,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
target=$tmpdir/target
linkfile=$tmpdir/linkfile

2
tests/regression/apparmor/link_subset.sh
View file

@ -20,7 +20,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
target=$tmpdir/target_
linkfile=$tmpdir/link_

2
tests/regression/apparmor/longpath.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
genrandname()
{

2
tests/regression/apparmor/mkdir.sh
View file

@ -14,7 +14,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
dir=$tmpdir/tmpdir/
perms=w

2
tests/regression/apparmor/mmap.sh
View file

@ -21,7 +21,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
file=$tmpdir/src
okperm=rw

2
tests/regression/apparmor/mount.sh
View file

@ -20,7 +20,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
##
## A. MOUNT

2
tests/regression/apparmor/mult_mount.sh
View file

@ -17,7 +17,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
cleandir()
{

2
tests/regression/apparmor/named_pipe.sh
View file

@ -20,7 +20,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
fifo=${tmpdir}/pipe

2
tests/regression/apparmor/namespaces.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
requires_namespace_interface
# unique_ns - Print a randomly generated, unused namespace identifier to stdout

2
tests/regression/apparmor/net_inet.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
requires_kernel_features network_v8/af_inet
requires_parser_support "network ip=::1,"

2
tests/regression/apparmor/net_raw.sh
View file

@ -17,7 +17,7 @@ pwd=$(cd $pwd ; /bin/pwd)
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
dir=$tmpdir/tmpdir

2
tests/regression/apparmor/nfs.sh
View file

@ -18,7 +18,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
srcdir=$tmpdir/src
mntdir=$tmpdir/mnt

2
tests/regression/apparmor/nnp.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
settest transition

2
tests/regression/apparmor/onexec.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
settest transition
file=$tmpdir/file

2
tests/regression/apparmor/open.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
file=$tmpdir/file
okperm=rw

2
tests/regression/apparmor/openat.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
dir=${tmpdir}
subdir=deleteme

2
tests/regression/apparmor/owlsm.sh
View file

@ -26,7 +26,7 @@ pwd=$(cd ${pwd} ; /bin/pwd)
bin=${pwd}
. ${bin}/prologue.inc
. "${bin}/prologue.inc"
target=file1
source=file2

2
tests/regression/apparmor/pipe.sh
View file

@ -21,7 +21,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
subtest=sub

2
tests/regression/apparmor/pivot_root.sh
View file

@ -17,7 +17,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
disk_img=$tmpdir/disk_img
new_root=$tmpdir/new_root/

2
tests/regression/apparmor/posix_mq.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
requires_kernel_features ipc/posix_mqueue
requires_parser_support "mqueue,"

2
tests/regression/apparmor/ptrace.sh
View file

@ -21,7 +21,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
# Read permission was required for a confined process to be able to be traced
# using ptrace. This stopped being required or functioning correctly

2
tests/regression/apparmor/pwrite.sh
View file

@ -14,7 +14,7 @@ pwd=`cd $pwd ; pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
file=${tmpdir}/pwrite
okperm=rw

2
tests/regression/apparmor/query_label.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
requires_query_interface
settest query_label

2
tests/regression/apparmor/readdir.sh
View file

@ -18,7 +18,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
dir=$tmpdir/tmpdir
# x is not really needed, see chdir.sh

2
tests/regression/apparmor/regex.sh
View file

@ -22,7 +22,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
file=$tmpdir/file
file2=$tmpdir/filealpha

2
tests/regression/apparmor/rename.sh
View file

@ -18,7 +18,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
file1=$tmpdir/file1
file2=$tmpdir/file2

2
tests/regression/apparmor/rw.sh
View file

@ -21,7 +21,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
file=$tmpdir/src
okperm=rw

2
tests/regression/apparmor/sd_flags.sh
View file

@ -14,7 +14,7 @@ pwd=$(cd $pwd ; /bin/pwd)
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
settest open

2
tests/regression/apparmor/setattr.sh
View file

@ -47,7 +47,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
file=$tmpdir/file
dir="$tmpdir/dir/"

2
tests/regression/apparmor/socketpair.sh
View file

@ -17,7 +17,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
requires_kernel_features network/af_unix

2
tests/regression/apparmor/stackonexec.sh
View file

@ -17,7 +17,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
requires_kernel_features domain/stack
settest transition

2
tests/regression/apparmor/stackprofile.sh
View file

@ -17,7 +17,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
requires_kernel_features domain/stack
settest transition

2
tests/regression/apparmor/swap.sh
View file

@ -21,7 +21,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
##
## A. SWAP

2
tests/regression/apparmor/symlink.sh
View file

@ -14,7 +14,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
src=$tmpdir/src1
target=$tmpdir/target

2
tests/regression/apparmor/syscall.sh
View file

@ -20,7 +20,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
##
## A. PTRACE

2
tests/regression/apparmor/syscall_sysctl.sh
View file

@ -20,7 +20,7 @@ sysctlbad=/proc/sys/kernel/sysrq
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
##
## C. SYSCTL

2
tests/regression/apparmor/sysv_mq.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
requires_kernel_features ipc/sysv_mqueue
requires_parser_support "mqueue,"

2
tests/regression/apparmor/tcp.sh
View file

@ -20,7 +20,7 @@ bin=$pwd
# kernel feature supported
# need to be able to query the parser if it supports the
# kernel feature
. $bin/prologue.inc
. "$bin/prologue.inc"
requires_any_of_kernel_features network network_v8
port=34567

2
tests/regression/apparmor/unix_fd_server.sh
View file

@ -18,7 +18,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
file=${tmpdir}/file
socket=${tmpdir}/unix_fd_test

2
tests/regression/apparmor/unix_socket_abstract.sh
View file

@ -26,7 +26,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
. $bin/unix_socket.inc
requires_kernel_features policy/versions/v7
requires_kernel_features network/af_unix

2
tests/regression/apparmor/unix_socket_autobind.sh
View file

@ -31,7 +31,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
. $bin/unix_socket.inc
requires_kernel_features policy/versions/v7
requires_kernel_features network/af_unix

2
tests/regression/apparmor/unix_socket_pathname.sh
View file

@ -26,7 +26,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
requires_kernel_features policy/versions/v6
#af_mask for downgrade test af_unix for full test
requires_any_of_kernel_features network/af_mask network_v8/af_mask

2
tests/regression/apparmor/unix_socket_unnamed.sh
View file

@ -26,7 +26,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
. $bin/unix_socket.inc
requires_kernel_features policy/versions/v7
requires_kernel_features network/af_unix

2
tests/regression/apparmor/unlink.sh
View file

@ -17,7 +17,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
file=$tmpdir/file
okperm=rwix

2
tests/regression/apparmor/userns.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
requires_kernel_features namespaces/mask/userns_create
requires_parser_support "userns,"

2
tests/regression/apparmor/xattrs.sh
View file

@ -34,7 +34,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
requires_kernel_features file/xattr

2
tests/regression/apparmor/xattrs_profile.sh
View file

@ -16,7 +16,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd
. $bin/prologue.inc
. "$bin/prologue.inc"
file="$bin/xattrs_profile"