Skip to content

tests/int: use run -N|! for runc #4946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

tests/int: use run -N|! for runc #4946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fbf65a
tests/int: improve runc wrapper
kolyshkin Oct 16, 2025
7cc09a0
tests/int: refactor to use runc status checks
kolyshkin Oct 16, 2025
4f9e318
tests/int: add missing runc exit code checks
kolyshkin Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 11 additions & 22 deletions tests/integration/capabilities.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ function teardown() {
}

@test "runc run no capability" {
runc run test_no_caps
[ "$status" -eq 0 ]
runc -0 run test_no_caps

[[ "${output}" == *"CapInh: 0000000000000000"* ]]
[[ "${output}" == *"CapAmb: 0000000000000000"* ]]
Expand All @@ -22,8 +21,7 @@ function teardown() {

@test "runc run with unknown capability" {
update_config '.process.capabilities.bounding = ["CAP_UNKNOWN", "UNKNOWN_CAP"]'
runc run test_unknown_caps
[ "$status" -eq 0 ]
runc -0 run test_unknown_caps

[[ "${output}" == *"CapInh: 0000000000000000"* ]]
[[ "${output}" == *"CapAmb: 0000000000000000"* ]]
Expand All @@ -32,8 +30,7 @@ function teardown() {

@test "runc run with new privileges" {
update_config '.process.noNewPrivileges = false'
runc run test_new_privileges
[ "$status" -eq 0 ]
runc -0 run test_new_privileges

[[ "${output}" == *"CapInh: 0000000000000000"* ]]
[[ "${output}" == *"CapAmb: 0000000000000000"* ]]
Expand All @@ -44,8 +41,7 @@ function teardown() {
update_config '.process.user = {"uid":0}'
update_config '.process.capabilities.bounding = ["CAP_SYS_ADMIN"]'
update_config '.process.capabilities.permitted = ["CAP_SYS_ADMIN", "CAP_AUDIT_WRITE", "CAP_KILL", "CAP_NET_BIND_SERVICE"]'
runc run test_some_caps
[ "$status" -eq 0 ]
runc -0 run test_some_caps

[[ "${output}" == *"CapInh: 0000000000000000"* ]]
[[ "${output}" == *"CapBnd: 0000000000200000"* ]]
Expand All @@ -57,20 +53,17 @@ function teardown() {
@test "runc exec --cap" {
update_config ' .process.args = ["/bin/sh"]
| .process.capabilities = {}'
runc run -d --console-socket "$CONSOLE_SOCKET" test_exec_cap
[ "$status" -eq 0 ]
runc -0 run -d --console-socket "$CONSOLE_SOCKET" test_exec_cap

runc exec test_exec_cap cat /proc/self/status
[ "$status" -eq 0 ]
runc -0 exec test_exec_cap cat /proc/self/status
# Check no capabilities are set.
[[ "${output}" == *"CapInh: 0000000000000000"* ]]
[[ "${output}" == *"CapPrm: 0000000000000000"* ]]
[[ "${output}" == *"CapEff: 0000000000000000"* ]]
[[ "${output}" == *"CapBnd: 0000000000000000"* ]]
[[ "${output}" == *"CapAmb: 0000000000000000"* ]]

runc exec --cap CAP_KILL --cap CAP_AUDIT_WRITE test_exec_cap cat /proc/self/status
[ "$status" -eq 0 ]
runc -0 exec --cap CAP_KILL --cap CAP_AUDIT_WRITE test_exec_cap cat /proc/self/status
# Check capabilities are added into bounding/effective/permitted only,
# but not to inheritable or ambient.
#
Expand All @@ -90,11 +83,9 @@ function teardown() {
| .process.capabilities.effective = ["CAP_KILL"]
| .process.capabilities.bounding = ["CAP_KILL", "CAP_CHOWN", "CAP_SYSLOG"]
| .process.capabilities.ambient = ["CAP_CHOWN"]'
runc run -d --console-socket "$CONSOLE_SOCKET" test_some_caps
[ "$status" -eq 0 ]
runc -0 run -d --console-socket "$CONSOLE_SOCKET" test_some_caps

runc exec test_some_caps cat /proc/self/status
[ "$status" -eq 0 ]
runc -0 exec test_some_caps cat /proc/self/status
# Check that capabilities are as set in spec.
#
# CAP_CHOWN is 0, the bit mask is 0x1 (1 << 0)
Expand All @@ -108,8 +99,7 @@ function teardown() {

# Check that if config.json has an inheritable capability set,
# runc exec --cap adds ambient capabilities.
runc exec --cap CAP_SYSLOG test_some_caps cat /proc/self/status
[ "$status" -eq 0 ]
runc -0 exec --cap CAP_SYSLOG test_some_caps cat /proc/self/status
[[ "${output}" == *"CapInh: 0000000400000001"* ]]
[[ "${output}" == *"CapPrm: 0000000400000021"* ]]
[[ "${output}" == *"CapEff: 0000000400000021"* ]]
Expand All @@ -120,8 +110,7 @@ function teardown() {
@test "runc run [ambient caps not set in inheritable result in a warning]" {
update_config ' .process.capabilities.inheritable = ["CAP_KILL"]
| .process.capabilities.ambient = ["CAP_KILL", "CAP_CHOWN"]'
runc run test_amb
[ "$status" -eq 0 ]
runc -0 run test_amb
# This should result in CAP_KILL set in ambient,
# and a warning about inability to set CAP_CHOWN.
#
Expand Down
18 changes: 6 additions & 12 deletions tests/integration/cgroup_delegation.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,9 @@ function setup() {
}

@test "runc exec (cgroup v2, ro cgroupfs, new cgroupns) does not chown cgroup" {
runc run -d --console-socket "$CONSOLE_SOCKET" test_cgroup_chown
[ "$status" -eq 0 ]
runc -0 run -d --console-socket "$CONSOLE_SOCKET" test_cgroup_chown

runc exec test_cgroup_chown sh -c "stat -c %U /sys/fs/cgroup"
[ "$status" -eq 0 ]
runc -0 exec test_cgroup_chown sh -c "stat -c %U /sys/fs/cgroup"
[ "$output" = "nobody" ] # /sys/fs/cgroup owned by unmapped user
}

Expand All @@ -41,21 +39,17 @@ function setup() {
# inherit cgroup namespace (remove cgroup from namespaces list)
update_config '.linux.namespaces |= map(select(.type != "cgroup"))'

runc run -d --console-socket "$CONSOLE_SOCKET" test_cgroup_chown
[ "$status" -eq 0 ]
runc -0 run -d --console-socket "$CONSOLE_SOCKET" test_cgroup_chown

runc exec test_cgroup_chown sh -c "stat -c %U /sys/fs/cgroup"
[ "$status" -eq 0 ]
runc -0 exec test_cgroup_chown sh -c "stat -c %U /sys/fs/cgroup"
[ "$output" = "nobody" ] # /sys/fs/cgroup owned by unmapped user
}

@test "runc exec (cgroup v2, rw cgroupfs, new cgroupns) does chown cgroup" {
set_cgroup_mount_writable

runc run -d --console-socket "$CONSOLE_SOCKET" test_cgroup_chown
[ "$status" -eq 0 ]
runc -0 run -d --console-socket "$CONSOLE_SOCKET" test_cgroup_chown

runc exec test_cgroup_chown sh -c "stat -c %U /sys/fs/cgroup"
[ "$status" -eq 0 ]
runc -0 exec test_cgroup_chown sh -c "stat -c %U /sys/fs/cgroup"
[ "$output" = "root" ] # /sys/fs/cgroup owned by root (of user namespace)
}
Loading
Loading