From 263ac00775597a0bb2aaf4fc6e11df8151262797 Mon Sep 17 00:00:00 2001 From: startx2017 Date: Fri, 28 Sep 2018 06:51:39 -0400 Subject: fixed some tests --- test/compile/compile.sh | 165 +++++++++--------------------------------------- 1 file changed, 31 insertions(+), 134 deletions(-) (limited to 'test/compile/compile.sh') diff --git a/test/compile/compile.sh b/test/compile/compile.sh index 9d35bbcde..cbe76a242 100755 --- a/test/compile/compile.sh +++ b/test/compile/compile.sh @@ -2,19 +2,13 @@ arr[1]="TEST 1: standard compilation" arr[2]="TEST 2: compile seccomp disabled" -arr[3]="TEST 3: compile chroot disabled" -arr[4]="TEST 4: compile bind disabled" -arr[5]="TEST 5: compile user namespace disabled" -arr[6]="TEST 6: compile network disabled" -arr[7]="TEST 7: compile X11 disabled" -arr[8]="deprecated: TEST 8: compile network restricted" -arr[9]="TEST 9: compile file transfer disabled" -arr[10]="TEST 10: compile disable whitelist" -arr[11]="TEST 11: compile disable global config" -arr[12]="TEST 12: compile apparmor" -arr[13]="TEST 13: compile busybox" -arr[14]="TEST 14: compile overlayfs disabled" -arr[15]="TEST 15: compile apparmor enabled" +arr[3]="TEST 3: compile user namespace disabled" +arr[4]="TEST 4: compile network disabled" +arr[5]="TEST 5: compile disable whitelist" +arr[6]="TEST 6: compile disable global config" +arr[7]="TEST 7: compile apparmor" +arr[8]="TEST 8: compile busybox" +arr[9]="TEST 9: compile apparmor enabled" # remove previous reports and output file cleanup() { @@ -92,13 +86,13 @@ rm output-configure output-make #***************************************************************** # TEST 3 #***************************************************************** -# - disable chroot configuration +# - disable user namespace configuration #***************************************************************** print_title "${arr[3]}" # seccomp cd firejail make distclean -./configure --prefix=/usr --disable-chroot --enable-fatal-warnings 2>&1 | tee ../output-configure +./configure --prefix=/usr --disable-userns --enable-fatal-warnings 2>&1 | tee ../output-configure make -j4 2>&1 | tee ../output-make cd .. grep Warning output-configure output-make > ./report-test3 @@ -110,13 +104,13 @@ rm output-configure output-make #***************************************************************** # TEST 4 #***************************************************************** -# - disable bind configuration +# - disable networking #***************************************************************** print_title "${arr[4]}" # seccomp cd firejail make distclean -./configure --prefix=/usr --disable-bind --enable-fatal-warnings 2>&1 | tee ../output-configure +./configure --prefix=/usr --disable-network --enable-fatal-warnings 2>&1 | tee ../output-configure make -j4 2>&1 | tee ../output-make cd .. grep Warning output-configure output-make > ./report-test4 @@ -125,16 +119,17 @@ cp output-configure oc4 cp output-make om4 rm output-configure output-make + #***************************************************************** # TEST 5 #***************************************************************** -# - disable user namespace configuration +# - disable whitelist #***************************************************************** -print_title "${arr[5]}" +print_title "${arr[10]}" # seccomp cd firejail make distclean -./configure --prefix=/usr --disable-userns --enable-fatal-warnings 2>&1 | tee ../output-configure +./configure --prefix=/usr --disable-whitelist --enable-fatal-warnings 2>&1 | tee ../output-configure make -j4 2>&1 | tee ../output-make cd .. grep Warning output-configure output-make > ./report-test5 @@ -146,14 +141,13 @@ rm output-configure output-make #***************************************************************** # TEST 6 #***************************************************************** -# - disable user namespace configuration -# - check compilation +# - disable global config #***************************************************************** print_title "${arr[6]}" # seccomp cd firejail make distclean -./configure --prefix=/usr --disable-network --enable-fatal-warnings 2>&1 | tee ../output-configure +./configure --prefix=/usr --disable-globalcfg --enable-fatal-warnings 2>&1 | tee ../output-configure make -j4 2>&1 | tee ../output-make cd .. grep Warning output-configure output-make > ./report-test6 @@ -165,13 +159,13 @@ rm output-configure output-make #***************************************************************** # TEST 7 #***************************************************************** -# - disable X11 support +# - enable apparmor #***************************************************************** print_title "${arr[7]}" # seccomp cd firejail make distclean -./configure --prefix=/usr --disable-x11 --enable-fatal-warnings 2>&1 | tee ../output-configure +./configure --prefix=/usr --enable-apparmor --enable-fatal-warnings 2>&1 | tee ../output-configure make -j4 2>&1 | tee ../output-make cd .. grep Warning output-configure output-make > ./report-test7 @@ -180,131 +174,40 @@ cp output-configure oc7 cp output-make om7 rm output-configure output-make - #***************************************************************** -# TEST 9 -#***************************************************************** -# - disable file transfer -#***************************************************************** -print_title "${arr[9]}" -# seccomp -cd firejail -make distclean -./configure --prefix=/usr --disable-file-transfer --enable-fatal-warnings 2>&1 | tee ../output-configure -make -j4 2>&1 | tee ../output-make -cd .. -grep Warning output-configure output-make > ./report-test9 -grep Error output-configure output-make >> ./report-test9 -cp output-configure oc9 -cp output-make om9 -rm output-configure output-make - -#***************************************************************** -# TEST 10 -#***************************************************************** -# - disable whitelist -#***************************************************************** -print_title "${arr[10]}" -# seccomp -cd firejail -make distclean -./configure --prefix=/usr --disable-whitelist --enable-fatal-warnings 2>&1 | tee ../output-configure -make -j4 2>&1 | tee ../output-make -cd .. -grep Warning output-configure output-make > ./report-test10 -grep Error output-configure output-make >> ./report-test10 -cp output-configure oc10 -cp output-make om10 -rm output-configure output-make - -#***************************************************************** -# TEST 11 -#***************************************************************** -# - disable global config -#***************************************************************** -print_title "${arr[11]}" -# seccomp -cd firejail -make distclean -./configure --prefix=/usr --disable-globalcfg --enable-fatal-warnings 2>&1 | tee ../output-configure -make -j4 2>&1 | tee ../output-make -cd .. -grep Warning output-configure output-make > ./report-test11 -grep Error output-configure output-make >> ./report-test11 -cp output-configure oc11 -cp output-make om11 -rm output-configure output-make - -#***************************************************************** -# TEST 12 -#***************************************************************** -# - enable apparmor -#***************************************************************** -print_title "${arr[12]}" -# seccomp -cd firejail -make distclean -./configure --prefix=/usr --enable-apparmor --enable-fatal-warnings 2>&1 | tee ../output-configure -make -j4 2>&1 | tee ../output-make -cd .. -grep Warning output-configure output-make > ./report-test12 -grep Error output-configure output-make >> ./report-test12 -cp output-configure oc12 -cp output-make om12 -rm output-configure output-make - -#***************************************************************** -# TEST 13 +# TEST 8 #***************************************************************** # - enable busybox workaround #***************************************************************** -print_title "${arr[13]}" +print_title "${arr[8]}" # seccomp cd firejail make distclean ./configure --prefix=/usr --enable-busybox-workaround --enable-fatal-warnings 2>&1 | tee ../output-configure make -j4 2>&1 | tee ../output-make cd .. -grep Warning output-configure output-make > ./report-test13 -grep Error output-configure output-make >> ./report-test13 -cp output-configure oc13 -cp output-make om13 +grep Warning output-configure output-make > ./report-test8 +grep Error output-configure output-make >> ./report-test8 +cp output-configure oc8 +cp output-make om8 rm output-configure output-make #***************************************************************** -# TEST 14 -#***************************************************************** -# - disable overlayfs -#***************************************************************** -print_title "${arr[14]}" -# seccomp -cd firejail -make distclean -./configure --prefix=/usr --disable-overlayfs --enable-fatal-warnings 2>&1 | tee ../output-configure -make -j4 2>&1 | tee ../output-make -cd .. -grep Warning output-configure output-make > ./report-test14 -grep Error output-configure output-make >> ./report-test14 -cp output-configure oc14 -cp output-make om14 -rm output-configure output-make - -#***************************************************************** -# TEST 15 +# TEST 9 #***************************************************************** # - enable apparmor #***************************************************************** -print_title "${arr[15]}" +print_title "${arr[9]}" # seccomp cd firejail make distclean ./configure --prefix=/usr --enable-apparmor --enable-fatal-warnings 2>&1 | tee ../output-configure make -j4 2>&1 | tee ../output-make cd .. -grep Warning output-configure output-make > ./report-test15 -grep Error output-configure output-make >> ./report-test15 -cp output-configure oc15 -cp output-make om15 +grep Warning output-configure output-make > ./report-test9 +grep Error output-configure output-make >> ./report-test9 +cp output-configure oc9 +cp output-make om9 rm output-configure output-make @@ -331,9 +234,3 @@ echo ${arr[6]} echo ${arr[7]} echo ${arr[8]} echo ${arr[9]} -echo ${arr[10]} -echo ${arr[11]} -echo ${arr[12]} -echo ${arr[13]} -echo ${arr[14]} -echo ${arr[15]} -- cgit v1.2.3-54-g00ecf