From 35a6b7a8f23808d4c817866ff77b2255a8cff0af Mon Sep 17 00:00:00 2001 From: Georgia Garcia Date: Mon, 25 Mar 2024 10:42:22 -0300 Subject: [PATCH] tests: rename net_finegrained to net_inet net_inet makes more sense since other finegrained network types can be added in the future. Signed-off-by: Georgia Garcia --- .gitignore | 4 +-- tests/regression/apparmor/Makefile | 4 +-- .../{net_finegrained.h => net_inet.h} | 0 .../{net_finegrained.sh => net_inet.sh} | 25 ++++++++----------- .../{net_finegrained_rcv.c => net_inet_rcv.c} | 2 +- .../{net_finegrained_snd.c => net_inet_snd.c} | 2 +- 6 files changed, 17 insertions(+), 20 deletions(-) rename tests/regression/apparmor/{net_finegrained.h => net_inet.h} (100%) rename tests/regression/apparmor/{net_finegrained.sh => net_inet.sh} (92%) rename tests/regression/apparmor/{net_finegrained_rcv.c => net_inet_rcv.c} (99%) rename tests/regression/apparmor/{net_finegrained_snd.c => net_inet_snd.c} (99%) diff --git a/.gitignore b/.gitignore index 2c779f2ae..f78a9901e 100644 --- a/.gitignore +++ b/.gitignore @@ -266,8 +266,8 @@ tests/regression/apparmor/mmap tests/regression/apparmor/mount tests/regression/apparmor/move_mount tests/regression/apparmor/named_pipe -tests/regression/apparmor/net_finegrained_rcv -tests/regression/apparmor/net_finegrained_snd +tests/regression/apparmor/net_inet_rcv +tests/regression/apparmor/net_inet_snd tests/regression/apparmor/net_raw tests/regression/apparmor/open tests/regression/apparmor/openat diff --git a/tests/regression/apparmor/Makefile b/tests/regression/apparmor/Makefile index fde2958f8..551ff538c 100644 --- a/tests/regression/apparmor/Makefile +++ b/tests/regression/apparmor/Makefile @@ -111,8 +111,8 @@ SRC=access.c \ mount.c \ move_mount.c \ named_pipe.c \ - net_finegrained_rcv.c \ - net_finegrained_snd.c \ + net_inet_rcv.c \ + net_inet_snd.c \ net_raw.c \ open.c \ openat.c \ diff --git a/tests/regression/apparmor/net_finegrained.h b/tests/regression/apparmor/net_inet.h similarity index 100% rename from tests/regression/apparmor/net_finegrained.h rename to tests/regression/apparmor/net_inet.h diff --git a/tests/regression/apparmor/net_finegrained.sh b/tests/regression/apparmor/net_inet.sh similarity index 92% rename from tests/regression/apparmor/net_finegrained.sh rename to tests/regression/apparmor/net_inet.sh index 0e5b9f24a..f5060740a 100644 --- a/tests/regression/apparmor/net_finegrained.sh +++ b/tests/regression/apparmor/net_inet.sh @@ -6,9 +6,9 @@ #published by the Free Software Foundation, version 2 of the #License. -#=NAME posix_mq +#=NAME net_inet #=DESCRIPTION -# This test verifies if mediation of posix message queues is working +# This test verifies if finegrained inet mediation is working #=END pwd=`dirname $0` @@ -18,13 +18,13 @@ bin=$pwd . $bin/prologue.inc -#requires_kernel_features network_v8/finegrained +requires_kernel_features network_v8/af_inet requires_parser_support "network ip=::1," -settest net_finegrained_rcv +settest net_inet_rcv -sender="$bin/net_finegrained_snd" -receiver="$bin/net_finegrained_rcv" +sender="$bin/net_inet_snd" +receiver="$bin/net_inet_rcv" # local ipv6 address generated according to https://www.rfc-editor.org/rfc/rfc4193.html #ipv6_subnet=fd74:1820:b03a:b361::/64 @@ -47,7 +47,7 @@ do_onexit="cleanup" do_test() { - local desc="FINEGRAINED NETWORK ($1)" + local desc="NETWORK INET ($1)" shift runchecktest "$desc" "$@" } @@ -65,12 +65,11 @@ do_tests() protocol=$8 generate_profile=$9 - settest net_finegrained_rcv + settest net_inet_rcv $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 - - settest -u "foo" net_finegrained_rcv + settest -u "foo" net_inet_rcv $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 @@ -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" 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)" 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" 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)" 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" do_tests "ipv6 tcp generic perms" pass pass $bind_ipv6 $bind_port $remote_ipv6 $remote_port tcp "$generate_profile" - - diff --git a/tests/regression/apparmor/net_finegrained_rcv.c b/tests/regression/apparmor/net_inet_rcv.c similarity index 99% rename from tests/regression/apparmor/net_finegrained_rcv.c rename to tests/regression/apparmor/net_inet_rcv.c index b426b85fc..c19ad3cef 100644 --- a/tests/regression/apparmor/net_finegrained_rcv.c +++ b/tests/regression/apparmor/net_inet_rcv.c @@ -9,7 +9,7 @@ #include #include #include -#include "net_finegrained.h" +#include "net_inet.h" struct connection_info { char *bind_ip; diff --git a/tests/regression/apparmor/net_finegrained_snd.c b/tests/regression/apparmor/net_inet_snd.c similarity index 99% rename from tests/regression/apparmor/net_finegrained_snd.c rename to tests/regression/apparmor/net_inet_snd.c index b208f2a55..c1370dd70 100644 --- a/tests/regression/apparmor/net_finegrained_snd.c +++ b/tests/regression/apparmor/net_inet_snd.c @@ -12,7 +12,7 @@ #include #include #include -#include "net_finegrained.h" +#include "net_inet.h" struct connection_info { char *bind_ip;