mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-01 06:45:38 +00:00
Code Issues Releases Wiki Activity

fix af_unix tests for v8 networking.

Browse Source 
Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen
2022-06-16 12:07:52 -07:00
parent cf6539b217
commit f47d5c70a3
4 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/regression/apparmor/deleted.sh
View File

@@ -65,7 +65,9 @@ okperm=rwl
badperm=wl badperm=wl
af_unix="" af_unix=""
if [ "$(kernel_features network/af_unix)" == "true" -a "$(parser_supports 'unix,')" == "true" ]; then if [ "$(kernel_features network_v8)" = "true" -a "$(parser_supports 'unix,')" = "true" ]; then
af_unix="unix:create"
elif [ "$(kernel_features network/af_unix)" = "true" -a "$(parser_supports 'unix,')" = "true" ]; then
af_unix="unix:create" af_unix="unix:create"
fi fi

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

@@ -92,6 +92,19 @@ requires_kernel_features()
fi fi
} }
requires_any_of_kernel_features()
{
while [ $# -gt 0 ]; do
local res=$(kernel_features "$1")
if [ "$res" = "true" ] ; then
return 0;
fi
shift
done
echo "$res. Skipping tests ..."
exit 0
}
# requires_namespace_interface() - exit if namespace interface is not available # requires_namespace_interface() - exit if namespace interface is not available
requires_namespace_interface() requires_namespace_interface()
{ {

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

@@ -27,7 +27,9 @@ okperm=rw
badperm=w badperm=w
af_unix="" af_unix=""
if [ "$(kernel_features network/af_unix)" == "true" -a "$(parser_supports 'unix,')" == "true" ]; then if [ "$(kernel_features network_v8)" = "true" -a "$(parser_supports 'unix,')" = "true" ]; then
af_unix="unix:create"
elif [ "$(kernel_features network/af_unix)" = "true" -a "$(parser_supports 'unix,')" = "true" ]; then
af_unix="unix:create" af_unix="unix:create"
fi fi
@@ -137,7 +139,7 @@ runchecktest "fd passing; confined -> confined (no perm)" fail $file $fd_client
sleep 1 sleep 1
rm -f ${socket} rm -f ${socket}
if [ "$(kernel_features policy/network/af_unix)" == "true" -a "$(parser_supports 'unix,')" == "true" ] ; then if [ "$(kernel_features policy/network/af_unix)" = "true" -a "$(parser_supports 'unix,')" == "true" ] ; then
# FAIL - confined client, no access to the socket file # FAIL - confined client, no access to the socket file
genprofile $file:$okperm $af_unix $socket:rw $fd_client:px -- image=$fd_client $file:$okperm $af_unix genprofile $file:$okperm $af_unix $socket:rw $fd_client:px -- image=$fd_client $file:$okperm $af_unix

17
tests/regression/apparmor/unix_socket_pathname.sh
View File

@@ -29,7 +29,7 @@ bin=$pwd
. $bin/prologue.inc . $bin/prologue.inc
requires_kernel_features policy/versions/v6 requires_kernel_features policy/versions/v6
#af_mask for downgrade test af_unix for full test #af_mask for downgrade test af_unix for full test
requires_kernel_features network/af_mask requires_any_of_kernel_features network/af_mask network_v8/af_mask
settest unix_socket settest unix_socket
@@ -43,9 +43,9 @@ message=4a0c83d87aaa7afa2baab5df3ee4df630f0046d5bfb7a3080c550b721f401b3b\
okserver=w okserver=w
badserver1=r badserver1=r
badserver2= badserver2=
if [ "$(kernel_features policy/versions/v7)" == "true" ] ; then if [ "$(kernel_features policy/versions/v7)" = "true" ] ; then
okserver=rw okserver=rw
badserver2=w # badserver2=w
fi fi
# af_unix support requires 'unix create' to call socket() # af_unix support requires 'unix create' to call socket()
@@ -54,9 +54,16 @@ fi
# af_unix support requires 'unix getattr' to call getsockname() # af_unix support requires 'unix getattr' to call getsockname()
af_unix_okserver= af_unix_okserver=
af_unix_okclient= af_unix_okclient=
if [ "$(kernel_features network/af_unix)" == "true" -a "$(parser_supports 'unix,')" == "true" ] ; then if ( [ "$(kernel_features network_v8/af_unix)" = "true" ] ||
[ "$(kernel_features network/af_unix)" = "true" ] ) &&
[ "$(parser_supports 'unix,')" = "true" ] ; then
af_unix_okserver="create,setopt" af_unix_okserver="create,setopt"
af_unix_okclient="create,getopt,setopt,getattr" af_unix_okclient="create,getopt,setopt,getattr"
elif [ "$(kernel_features network_v8)" = "true" ] ; then
# af_unix_okserver="create,setopt"
# af_unix_okclient="create,getopt,setopt,getattr"
af_unix_okserver="create"
af_unix_okclient="create"
fi fi
okclient=rw okclient=rw
@@ -88,7 +95,7 @@ testsocktype()
# https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1373176 # https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1373176
# get resolved # get resolved
local ex_result="pass" local ex_result="pass"
if [ "${socktype}" == "dgram" ] ; then if [ "${socktype}" = "dgram" ] ; then
ex_result="xpass" ex_result="xpass"
fi fi