mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-29 13:28:19 +00:00
Code Issues Releases Wiki Activity

tests: Update the regression tests for v6 policy

Browse Source 
This updates the regression tests for v6 policy. It refactors the
required_features test into a have_features fn, and a new
requires_features fn (renamed to catch all instances make sure they
where right)

The have_features fn is then applied to several test to make them
conditionally apply based off of availability of the feature
and policy version.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Tyler Hicks <tyhicks@canonical.com>
This commit is contained in:
John Johansen 2014-03-26 21:08:59 -05:00 committed by Tyler Hicks
parent 74b523f248
commit 40c2d811f9
7 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd bin=$pwd
. $bin/prologue.inc . $bin/prologue.inc
required_features dbus requires_features dbus
. $bin/dbus.inc . $bin/dbus.inc
args="--session" args="--session"

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

@ -18,7 +18,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd bin=$pwd
. $bin/prologue.inc . $bin/prologue.inc
required_features dbus requires_features dbus
. $bin/dbus.inc . $bin/dbus.inc
listnames="--type=method_call --session --name=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.ListNames" listnames="--type=method_call --session --name=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.ListNames"

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

@ -17,7 +17,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd bin=$pwd
. $bin/prologue.inc . $bin/prologue.inc
required_features dbus requires_features dbus
. $bin/dbus.inc . $bin/dbus.inc
service="--$bus --name=$dest $path $iface" service="--$bus --name=$dest $path $iface"

23
tests/regression/apparmor/prologue.inc
View File

@ -21,19 +21,32 @@
# #
# For this file, functions are first, entry point code is at end, see "MAIN" # For this file, functions are first, entry point code is at end, see "MAIN"
required_features() #use $() to retreive the failure message or "true" if success
have_features()
{ {
if [ ! -e "/sys/kernel/security/apparmor/features/" ] ; then if [ ! -e "/sys/kernel/security/apparmor/features/" ] ; then
echo "Kernel feature masks not supported. Skipping tests ..." echo "Kernel feature masks not supported."
exit 0 return 1;
fi fi
for f in $@ ; do for f in $@ ; do
if [ ! -e "/sys/kernel/security/apparmor/features/$f" ] ; then if [ ! -e "/sys/kernel/security/apparmor/features/$f" ] ; then
echo "Required feature $f not available. Skipping tests ..." echo "Required feature '$f' not available."
exit 0 return 2;
fi fi
done done
echo "true"
return 0;
}
requires_features()
{
local res=$(have_features $@)
if [ "$res" != "true" ] ; then
echo "$res. Skipping tests ..."
exit 0
fi
} }
requires_query_interface() requires_query_interface()

1
tests/regression/apparmor/tcp.sh
View File

@ -15,6 +15,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd bin=$pwd
. $bin/prologue.inc . $bin/prologue.inc
requires_features network
port=34567 port=34567
ip="127.0.0.1" ip="127.0.0.1"

12
tests/regression/apparmor/unix_fd_server.sh
View File

@ -132,10 +132,12 @@ runchecktest "fd passing; confined -> confined (no perm)" fail $file $socket $fd
sleep 1 sleep 1
rm -f ${socket} rm -f ${socket}
# FAIL - confined client, no access to the socket file if [ "$(have_features policy/versions/v6)" == "true" ] ; then
# FAIL - confined client, no access to the socket file
genprofile $file:$okperm $socket:rw $fd_client:px -- image=$fd_client $file:$okperm genprofile $file:$okperm $socket:rw $fd_client:px -- image=$fd_client $file:$okperm
runchecktest "fd passing; confined client w/o socket access" fail $file $socket $fd_client runchecktest "fd passing; confined client w/o socket access" fail $file $socket $fd_client
sleep 1 sleep 1
rm -f ${socket} rm -f ${socket}
fi

1
tests/regression/apparmor/unix_socket_file.sh
View File

@ -27,6 +27,7 @@ pwd=`cd $pwd ; /bin/pwd`
bin=$pwd bin=$pwd
. $bin/prologue.inc . $bin/prologue.inc
requires_features policy/versions/v6
client=$bin/unix_socket_file_client client=$bin/unix_socket_file_client
socket=${tmpdir}/unix_socket_file.sock socket=${tmpdir}/unix_socket_file.sock