diff --git a/contrib/apparmor/abstractions/passt b/contrib/apparmor/abstractions/passt new file mode 100644 index 0000000..000e3db --- /dev/null +++ b/contrib/apparmor/abstractions/passt @@ -0,0 +1,47 @@ +# SPDX-License-Identifier: AGPL-3.0-or-later +# +# PASST - Plug A Simple Socket Transport +# for qemu/UNIX domain socket mode +# +# PASTA - Pack A Subtle Tap Abstraction +# for network namespace/tap device mode +# +# contrib/apparmor/abstractions/passt - Abstraction for passt(1) +# +# Copyright (c) 2022 Red Hat GmbH +# Author: Stefano Brivio + + abi , + + include + + # Alternatively: include + @{etc_ro}/resolv.conf r, # get_dns(), conf.c + + capability net_bind_service, # isolation.c, conf.c + capability setuid, + capability setgid, + capability sys_admin, + capability setpcap, + capability net_admin, + capability sys_ptrace, + + / r, # isolate_prefork(), isolation.c + mount "" -> "/", + mount "" -> "/tmp/", + pivot_root "/tmp/" -> "/tmp/", + umount "/", + + network netlink raw, # nl_sock_init_do(), netlink.c + + network inet stream, # tcp.c + network inet6 stream, + + network inet dgram, # udp.c + network inet6 dgram, + + network unix stream, # tap.c + + network unix dgram, # __openlog(), log.c + + /usr/bin/passt.avx2 ix, # arch_avx2_exec(), arch.c diff --git a/contrib/apparmor/abstractions/pasta b/contrib/apparmor/abstractions/pasta new file mode 100644 index 0000000..7d802ac --- /dev/null +++ b/contrib/apparmor/abstractions/pasta @@ -0,0 +1,35 @@ +# SPDX-License-Identifier: AGPL-3.0-or-later +# +# PASST - Plug A Simple Socket Transport +# for qemu/UNIX domain socket mode +# +# PASTA - Pack A Subtle Tap Abstraction +# for network namespace/tap device mode +# +# contrib/apparmor/abstractions/pasta - Abstraction for pasta(1) +# +# Copyright (c) 2022 Red Hat GmbH +# Author: Stefano Brivio + + abi , + + include + + @{PROC}/net/tcp r, # procfs_scan_listen(), util.c + @{PROC}/net/tcp6 r, + @{PROC}/net/udp r, + @{PROC}/net/udp6 r, + + @{run}/user/@{uid}/netns/* r, # pasta_open_ns(), pasta.c + + @{PROC}/[0-9]*/ns/net r, # pasta_wait_for_ns(), + @{PROC}/[0-9]*/ns/user r, # conf_pasta_ns() + + /dev/net/tun rw, # tap_ns_tun(), tap.c + + owner @{PROC}/@{pid}/gid_map w, # pasta_start_ns(), conf_ugid() + owner @{PROC}/@{pid}/setgroups w, + owner @{PROC}/@{pid}/uid_map rw, + + owner @{PROC}/sys/net/ipv4/ping_group_range w, # pasta_spawn_cmd(), pasta.c + /{usr/,}bin/** Ux, diff --git a/contrib/apparmor/usr.bin.passt b/contrib/apparmor/usr.bin.passt index 96b61ef..7433d01 100644 --- a/contrib/apparmor/usr.bin.passt +++ b/contrib/apparmor/usr.bin.passt @@ -16,38 +16,13 @@ abi , include profile passt /usr/bin/passt{,.avx2} flags=(attach_disconnected) { - ### Common rules for passt and pasta + ### TODO: AppArmor doesn't give us the chance to attach a separate profile + ### depending on the executable symlink. That's possible with SELinux. Two + ### alternatives: implement that in AppArmor, or consider aa_change_hat(2). + ### With this, rules for passt(1) could be restricted significantly. Note that + ### the attach_disconnected flag is not needed for passt(1). - include - - # Alternatively: include - @{etc_ro}/resolv.conf r, # get_dns(), conf.c - - capability net_bind_service, # isolation.c, conf.c - capability setuid, - capability setgid, - capability sys_admin, - capability setpcap, - capability net_admin, - capability sys_ptrace, - - / r, # isolate_prefork(), isolation.c - mount "" -> "/", - mount "" -> "/tmp/", - pivot_root "/tmp/" -> "/tmp/", - umount "/", - - network netlink raw, # nl_sock_init_do(), netlink.c - - network inet stream, # tcp.c - network inet6 stream, - - network inet dgram, # udp.c - network inet6 dgram, - - network unix stream, # tap.c - - network unix dgram, # __openlog(), log.c + include # Alternatively: include owner /tmp/** w, # tap_sock_unix_init(), pcap(), @@ -56,33 +31,5 @@ profile passt /usr/bin/passt{,.avx2} flags=(attach_disconnected) { owner @{HOME}/** w, # pcap(), write_pidfile() - /usr/bin/passt.avx2 ix, # arch_avx2_exec(), arch.c - - - ### Rules for pasta - ### - ### TODO: AppArmor doesn't give us the chance to attach a separate profile - ### depending on the executable symlink. That's possible with SELinux. Two - ### alternatives: implement that in AppArmor, or consider aa_change_hat(2). - ### With this, rules for passt(1) could be restricted significantly. Note that - ### the attach_disconnected flag is not needed for passt(1). - - @{PROC}/net/tcp r, # procfs_scan_listen(), util.c - @{PROC}/net/tcp6 r, - @{PROC}/net/udp r, - @{PROC}/net/udp6 r, - - @{run}/user/@{uid}/netns/* r, # pasta_open_ns(), pasta.c - - @{PROC}/[0-9]*/ns/net r, # pasta_wait_for_ns(), - @{PROC}/[0-9]*/ns/user r, # conf_pasta_ns() - - /dev/net/tun rw, # tap_ns_tun(), tap.c - - owner @{PROC}/@{pid}/gid_map w, # pasta_start_ns(), conf_ugid() - owner @{PROC}/@{pid}/setgroups w, - owner @{PROC}/@{pid}/uid_map rw, - - owner @{PROC}/sys/net/ipv4/ping_group_range w, # pasta_spawn_cmd(), pasta.c - /{usr/,}bin/** Ux, + include }