mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-22 10:07:12 +00:00
Code Issues Releases Wiki Activity

tests: rename net_finegrained to net_inet

Browse Source 
net_inet makes more sense since other finegrained network types can be
added in the future.

Signed-off-by: Georgia Garcia <georgia.garcia@canonical.com>
This commit is contained in:
Georgia Garcia 2024-03-25 10:42:22 -03:00
parent e96fdc0f5b
commit 35a6b7a8f2
6 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -266,8 +266,8 @@ tests/regression/apparmor/mmap
tests/regression/apparmor/mount tests/regression/apparmor/mount
tests/regression/apparmor/move_mount tests/regression/apparmor/move_mount
tests/regression/apparmor/named_pipe tests/regression/apparmor/named_pipe
tests/regression/apparmor/net_finegrained_rcv tests/regression/apparmor/net_inet_rcv
tests/regression/apparmor/net_finegrained_snd tests/regression/apparmor/net_inet_snd
tests/regression/apparmor/net_raw tests/regression/apparmor/net_raw
tests/regression/apparmor/open tests/regression/apparmor/open
tests/regression/apparmor/openat tests/regression/apparmor/openat

4
tests/regression/apparmor/Makefile
View File

@ -111,8 +111,8 @@ SRC=access.c \
mount.c \ mount.c \
move_mount.c \ move_mount.c \
named_pipe.c \ named_pipe.c \
net_finegrained_rcv.c \ net_inet_rcv.c \
net_finegrained_snd.c \ net_inet_snd.c \
net_raw.c \ net_raw.c \
open.c \ open.c \
openat.c \ openat.c \

0
tests/regression/apparmor/net_finegrained.h → tests/regression/apparmor/net_inet.h
View File

25
tests/regression/apparmor/net_finegrained.sh → tests/regression/apparmor/net_inet.sh
View File

@ -6,9 +6,9 @@
#published by the Free Software Foundation, version 2 of the #published by the Free Software Foundation, version 2 of the
#License. #License.
#=NAME posix_mq #=NAME net_inet
#=DESCRIPTION #=DESCRIPTION
# This test verifies if mediation of posix message queues is working # This test verifies if finegrained inet mediation is working
#=END #=END
pwd=`dirname $0` pwd=`dirname $0`
@ -18,13 +18,13 @@ bin=$pwd
. $bin/prologue.inc . $bin/prologue.inc
#requires_kernel_features network_v8/finegrained requires_kernel_features network_v8/af_inet
requires_parser_support "network ip=::1," requires_parser_support "network ip=::1,"
settest net_finegrained_rcv settest net_inet_rcv
sender="$bin/net_finegrained_snd" sender="$bin/net_inet_snd"
receiver="$bin/net_finegrained_rcv" receiver="$bin/net_inet_rcv"
# local ipv6 address generated according to https://www.rfc-editor.org/rfc/rfc4193.html # local ipv6 address generated according to https://www.rfc-editor.org/rfc/rfc4193.html
#ipv6_subnet=fd74:1820:b03a:b361::/64 #ipv6_subnet=fd74:1820:b03a:b361::/64
@ -47,7 +47,7 @@ do_onexit="cleanup"
do_test() do_test()
{ {
local desc="FINEGRAINED NETWORK ($1)" local desc="NETWORK INET ($1)"
shift shift
runchecktest "$desc" "$@" runchecktest "$desc" "$@"
} }
@ -65,12 +65,11 @@ do_tests()
protocol=$8 protocol=$8
generate_profile=$9 generate_profile=$9
settest net_finegrained_rcv settest net_inet_rcv
$generate_profile $generate_profile
do_test "$prefix - root" $expect_rcv --bind_ip $bind_ip --bind_port $bind_port --remote_ip $remote_ip --remote_port $remote_port --protocol $protocol --timeout 5 --sender $sender do_test "$prefix - root" $expect_rcv --bind_ip $bind_ip --bind_port $bind_port --remote_ip $remote_ip --remote_port $remote_port --protocol $protocol --timeout 5 --sender $sender
settest -u "foo" net_inet_rcv
settest -u "foo" net_finegrained_rcv
$generate_profile $generate_profile
do_test "$prefix - user" $expect_rcv --bind_ip $bind_ip --bind_port $bind_port --remote_ip $remote_ip --remote_port $remote_port --protocol $protocol --timeout 5 --sender $sender do_test "$prefix - user" $expect_rcv --bind_ip $bind_ip --bind_port $bind_port --remote_ip $remote_ip --remote_port $remote_port --protocol $protocol --timeout 5 --sender $sender
@ -97,7 +96,7 @@ do_tests "ipv4 udp no conds" pass pass $bind_ipv4 $bind_port $remote_ipv4 $remot
generate_profile="genprofile network $sender:px -- image=$sender network" generate_profile="genprofile network $sender:px -- image=$sender network"
do_tests "ipv4 tcp no conds" pass pass $bind_ipv4 $bind_port $remote_ipv4 $remote_port tcp "$generate_profile" do_tests "ipv4 tcp no conds" pass pass $bind_ipv4 $bind_port $remote_ipv4 $remote_port tcp "$generate_profile"
setsockopt_rules="network;(setopt,getopt);ip=0.0.0.0;port=0" setsockopt_rules="network;(setopt,getopt);ip=0.0.0.0;port=0" # INADDR_ANY
rcv_rules="network;ip=$bind_ipv4;peer=(ip=anon)" rcv_rules="network;ip=$bind_ipv4;peer=(ip=anon)"
snd_rules="network;ip=$remote_ipv4;peer=(ip=anon)" snd_rules="network;ip=$remote_ipv4;peer=(ip=anon)"
@ -126,7 +125,7 @@ do_tests "ipv6 udp no conds" pass pass $bind_ipv6 $bind_port $remote_ipv6 $remot
generate_profile="genprofile network $sender:px -- image=$sender network" generate_profile="genprofile network $sender:px -- image=$sender network"
do_tests "ipv6 tcp no conds" pass pass $bind_ipv6 $bind_port $remote_ipv6 $remote_port tcp "$generate_profile" do_tests "ipv6 tcp no conds" pass pass $bind_ipv6 $bind_port $remote_ipv6 $remote_port tcp "$generate_profile"
setsockopt_rules="network;(setopt,getopt);ip=::0;port=0" setsockopt_rules="network;(setopt,getopt);ip=::0;port=0" # IN6ADDR_ANY_INIT
rcv_rules="network;ip=$bind_ipv6;peer=(ip=anon)" rcv_rules="network;ip=$bind_ipv6;peer=(ip=anon)"
snd_rules="network;ip=$remote_ipv6;peer=(ip=anon)" snd_rules="network;ip=$remote_ipv6;peer=(ip=anon)"
@ -135,5 +134,3 @@ do_tests "ipv6 udp generic perms" pass pass $bind_ipv6 $bind_port $remote_ipv6 $
generate_profile="genprofile network;ip=$bind_ipv6;port=$bind_port;peer=(ip=$remote_ipv6,port=$remote_port) $setsockopt_rules $rcv_rules $sender:px -- image=$sender network;ip=$remote_ipv6;port=$remote_port;peer=(ip=$bind_ipv6,port=$bind_port) $setsockopt_rules $snd_rules" generate_profile="genprofile network;ip=$bind_ipv6;port=$bind_port;peer=(ip=$remote_ipv6,port=$remote_port) $setsockopt_rules $rcv_rules $sender:px -- image=$sender network;ip=$remote_ipv6;port=$remote_port;peer=(ip=$bind_ipv6,port=$bind_port) $setsockopt_rules $snd_rules"
do_tests "ipv6 tcp generic perms" pass pass $bind_ipv6 $bind_port $remote_ipv6 $remote_port tcp "$generate_profile" do_tests "ipv6 tcp generic perms" pass pass $bind_ipv6 $bind_port $remote_ipv6 $remote_port tcp "$generate_profile"

2
tests/regression/apparmor/net_finegrained_rcv.c → tests/regression/apparmor/net_inet_rcv.c
View File

@ -9,7 +9,7 @@
#include <string.h> #include <string.h>
#include <getopt.h> #include <getopt.h>
#include <sys/stat.h> #include <sys/stat.h>
#include "net_finegrained.h" #include "net_inet.h"
struct connection_info { struct connection_info {
char *bind_ip; char *bind_ip;

2
tests/regression/apparmor/net_finegrained_snd.c → tests/regression/apparmor/net_inet_snd.c
View File

@ -12,7 +12,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include "net_finegrained.h" #include "net_inet.h"
struct connection_info { struct connection_info {
char *bind_ip; char *bind_ip;