emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

fix newuidmap testcase

Browse Source 
sleep 2s before running newxidmap - it seems we were sometimes
racing, causing newxidmap to fail.

Make sure to remove /tmp/test-xidmap, for some reason they
were sometimes still there, causing test to fail.

Fix some irregular tabbing.

Signed-off-by: Serge Hallyn <serge@hallyn.com>
This commit is contained in:
Serge Hallyn 2021-12-26 13:46:50 -06:00
parent 363eab25f0
commit 962c820fba
4 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/newgidmap/01_newgidmap/newgidmap.test
View File

@ -25,22 +25,24 @@ sysctl -q kernel.unprivileged_userns_clone=1
echo "OK"
echo -n "Create world writable tmp directory... "
rm -rf /tmp/test-gidmap
mkdir -m 0777 /tmp/test-gidmap
echo "OK"
echo -n "setup gidmapping... "
base=$(id -g foo)
runuser foo -g foo -c "unshare -U sleep 10 & pid=\$!; \
newgidmap \$pid 0 1000 1 1 1000000 1000; ret=\$?; \
cat /proc/\$pid/gid_map >/tmp/test-gidmap/gid_map;
sleep 2; newgidmap \$pid 0 $base 1 1 1000000 1000; ret=\$?; \
cat /proc/\$pid/gid_map >/tmp/test-gidmap/gid_map;
kill \$pid; exit \$ret"
../../common/compare_file.pl /tmp/test-gidmap/gid_map data/gid_map
echo "OK"
echo -n "Try to setup gidmapping with different primary group... "
runuser foo -g bar -c "unshare -U sleep 10 & pid=\$!; \
newgidmap \$pid 0 1001 1 1 1000000 1000 2>/tmp/test-gidmap/newgidmap.err; ret=\$?; \
sleep 2; newgidmap \$pid 0 $base 1 1 1000000 1000 2>/tmp/test-gidmap/newgidmap.err; ret=\$?; \
kill \$pid; exit \$ret" && exit 1 || {
status=$?
status=$?
}
echo "OK"

23
tests/newgidmap/02_newgidmap_relaxed_gid_check/newgidmap.test
View File

@ -23,21 +23,36 @@ change_config
sysctl -q kernel.unprivileged_userns_clone=1
echo -n "Create world writable tmp directory..."
rm -rf /tmp/test-gidmap
mkdir -m 0777 /tmp/test-gidmap
echo "OK"
echo -n "setup gidmapping... "
base=$(id -g foo)
runuser foo -g foo -c "unshare -U sleep 10 & pid=\$!; \
newgidmap \$pid 0 1000 1 1 1000000 1000; ret=\$?; \
cat /proc/\$pid/gid_map >/tmp/test-gidmap/gid_map;
sleep 2s; newgidmap \$pid 0 $base 1 1 1000000 1000; ret=\$?; \
cat /proc/\$pid/gid_map >/tmp/test-gidmap/gid_map;
kill \$pid; exit \$ret"
../../common/compare_file.pl /tmp/test-gidmap/gid_map data/gid_map
echo "OK"
# This next test should fail if setgroups on the ns is not
# USERNS_SETGROUPS_ALLOWED ("allow")
# TODO let's figure out what to do about this. For now skip
# that test.
log_status "$0" "SUCCESS"
sysctl -q kernel.unprivileged_userns_clone=$unpriv_userns
rm -rf /tmp/test-gidmap;
restore_config
trap '' 0
exit 0
echo -n "setup gidmapping with different primary group... "
runuser foo -g bar -c "unshare -U sleep 10 & pid=\$!; \
newgidmap \$pid 0 1001 1 1 1000000 1000; ret=\$?; \
cat /proc/\$pid/gid_map >/tmp/test-gidmap/gid_map;
sleep 2s; newgidmap \$pid 0 $base 1 1 1000000 1000; ret=\$?; \
cat /proc/\$pid/gid_map >/tmp/test-gidmap/gid_map;
kill \$pid; exit \$ret"
../../common/compare_file.pl /tmp/test-gidmap/gid_map data/gid_map.bar
echo "OK"

10
tests/newuidmap/01_newuidmap/newuidmap.test
View File

@ -1,6 +1,6 @@
#!/bin/sh
set -e
set -ex
cd $(dirname $0)
@ -25,20 +25,22 @@ sysctl -q kernel.unprivileged_userns_clone=1
echo "OK"
echo -n "Create world writable tmp directory... "
rm -rf /tmp/test-uidmap
mkdir -m 0777 /tmp/test-uidmap
echo "OK"
echo -n "setup uidmapping... "
base=$(id -u foo)
runuser foo -g foo -c "unshare -U sleep 10 & pid=\$!; \
newuidmap \$pid 0 1000 1 1 1000000 1000; ret=\$?; \
cat /proc/\$pid/uid_map >/tmp/test-uidmap/uid_map;
sleep 2s; newuidmap \$pid 0 $base 1 1 1000000 1000; ret=\$?; \
cat /proc/\$pid/uid_map >/tmp/test-uidmap/uid_map;
kill \$pid; exit \$ret"
../../common/compare_file.pl /tmp/test-uidmap/uid_map data/uid_map
echo "OK"
echo -n "Try to setup uidmapping with different primary group... "
runuser foo -g bar -c "unshare -U sleep 10 & pid=\$!; \
newuidmap \$pid 0 1000 1 1 1000000 1000 2>/tmp/test-uidmap/newuidmap.err; ret=\$?; \
newuidmap \$pid 0 $base 1 1 1000000 1000 2>/tmp/test-uidmap/newuidmap.err; ret=\$?; \
kill \$pid; exit \$ret" && exit 1 || {
status=$?
}

8
tests/newuidmap/02_newuidmap_relaxed_gid_check/newuidmap.test
View File

@ -1,6 +1,6 @@
#!/bin/sh
set -e
set -ex
cd $(dirname $0)
@ -23,12 +23,14 @@ change_config
sysctl -q kernel.unprivileged_userns_clone=1
echo -n "Create world writable tmp directory..."
rm -rf /tmp/test-uidmap
mkdir -m 0777 /tmp/test-uidmap
echo "OK"
echo -n "setup uidmapping... "
base=$(id -u foo)
runuser foo -g foo -c "unshare -U sleep 10 & pid=\$!; \
newuidmap \$pid 0 1000 1 1 1000000 1000; ret=\$?; \
sleep 2; newuidmap \$pid 0 $base 1 1 1000000 1000; ret=\$?; \
cat /proc/\$pid/uid_map >/tmp/test-uidmap/uid_map;
kill \$pid; exit \$ret"
../../common/compare_file.pl /tmp/test-uidmap/uid_map data/uid_map
@ -36,7 +38,7 @@ echo "OK"
echo -n "setup uidmapping with different primary group... "
runuser foo -g bar -c "unshare -U sleep 10 & pid=\$!; \
newuidmap \$pid 0 1000 1 1 1000000 1000; ret=\$?; \
sleep 2; newuidmap \$pid 0 $base 1 1 1000000 1000; ret=\$?; \
cat /proc/\$pid/uid_map >/tmp/test-uidmap/uid_map;
kill \$pid; exit \$ret"
../../common/compare_file.pl /tmp/test-uidmap/uid_map data/uid_map