testing

14 files changed, 63 insertions, 17 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9f2072c74..2e6a462f2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -73,10 +73,10 @@ jobs:
       run: SHELL=/bin/bash make lab-setup
     - name: run firecfg tests
       run: SHELL=/bin/bash make test-firecfg
+    - name: run capabilities tests
+      run: SHELL=/bin/bash make test-capabilities
     - name: run apparmor tests
       run: SHELL=/bin/bash make test-apparmor
-    - name: run network tests
-      run: SHELL=/bin/bash make test-network
     - name: run appimage tests
       run: SHELL=/bin/bash make test-appimage
     - name: run chroot tests
@@ -97,3 +97,5 @@ jobs:
       run: SHELL=/bin/bash make test-utils
     - name: run environment tests
       run: SHELL=/bin/bash make test-environment
+    - name: run network tests
+      run: SHELL=/bin/bash make test-network
diff --git a/Makefile b/Makefile
index 3bb128ccc..9a0482848 100644
--- a/Makefile
+++ b/Makefile
@@ -314,7 +314,7 @@ mkman.sh \
 platform \
 src
 
-DISTFILES_TEST = test/Makefile test/apps test/apps-x11 test/apps-x11-xorg test/private-lib test/fnetfilter test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/fs test/sysutils
+DISTFILES_TEST = test/Makefile test/apps test/apps-x11 test/apps-x11-xorg test/capabilities test/private-lib test/fnetfilter test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/fs test/sysutils
 
 .PHONY: dist
 dist: config.mk
@@ -368,7 +368,7 @@ codespell: clean
 # make test
 #
 
-TESTS=profiles apps apps-x11 apps-x11-xorg sysutils utils environment filters fs fcopy fnetfilter private-etc
+TESTS=profiles capabilities apps apps-x11 apps-x11-xorg sysutils utils environment filters fs fcopy fnetfilter private-etc
 TEST_TARGETS=$(patsubst %,test-%,$(TESTS))
 
 $(TEST_TARGETS):
diff --git a/README b/README
index a6474fdb2..3dca59a28 100644
--- a/README
+++ b/README
@@ -720,6 +720,7 @@ Manuel Dipolt (https://github.com/xeniter)
         - stack alignment for the ARM Architecture
 Marek Küthe (https://github.com/marek22k)
         - allow loading plugins in gajim
+        - allow bsfilter in email-common.profile
 Martin Carpenter (https://github.com/mcarpenter)
         - security audit and bug fixes
         - Centos 6.x support
diff --git a/gcov.sh b/gcov.sh
index 0f2808ace..a4f56136c 100755
--- a/gcov.sh
+++ b/gcov.sh
@@ -13,7 +13,7 @@ gcov_generate() {
         USER="$(whoami)"
         find . -exec sudo chown "$USER:$USER" '{}' +
         lcov -q --capture -d src/firejail -d src/lib -d src/firecfg -d src/firemon \
-                -d src/fnet -d src/fnetfilter -d src/fcopy --output-file gcov-file
+                -d src/fnet -d src/fnetfilter -d src/fcopy -d src/fseccomp --output-file gcov-file
         genhtml -q gcov-file --output-directory gcov-dir
 }
 
@@ -23,6 +23,8 @@ gcov_generate
 
 make test-firecfg | grep TESTING
 gcov_generate
+make test-capabilities | grep TESTING
+gcov_generate
 make test-apparmor | grep TESTING
 gcov_generate
 make test-network | grep TESTING
diff --git a/test/capabilities/capabilities.sh b/test/capabilities/capabilities.sh
new file mode 100755
index 000000000..50279cd4f
--- /dev/null
+++ b/test/capabilities/capabilities.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2023 Firejail Authors
+# License GPL v2
+
+export MALLOC_CHECK_=3
+export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
+export LC_ALL=C
+
+
+#if grep -q "^CapBnd:\\s0000003fffffffff" /proc/self/status; then
+        echo "TESTING: capabilities (test/filters/caps.exp)"
+        ./caps.exp
+#else
+#       echo "TESTING SKIP: other capabilities than expected (test/filters/caps.exp)"
+#fi
+
+echo "TESTING: capabilities print (test/filters/caps-print.exp)"
+./caps-print.exp
+
+echo "TESTING: capabilities join (test/filters/caps-join.exp)"
+./caps-join.exp
+
diff --git a/test/filters/caps-join.exp b/test/capabilities/caps-join.exp
index 1830143fb..1830143fb 100755
--- a/test/filters/caps-join.exp
+++ b/test/capabilities/caps-join.exp
diff --git a/test/filters/caps-print.exp b/test/capabilities/caps-print.exp
index b403f9ffe..b403f9ffe 100755
--- a/test/filters/caps-print.exp
+++ b/test/capabilities/caps-print.exp
diff --git a/test/filters/caps.exp b/test/capabilities/caps.exp
index dbd63efda..dbd63efda 100755
--- a/test/filters/caps.exp
+++ b/test/capabilities/caps.exp
diff --git a/test/filters/caps1.profile b/test/capabilities/caps1.profile
index 8b0c3b340..8b0c3b340 100644
--- a/test/filters/caps1.profile
+++ b/test/capabilities/caps1.profile
diff --git a/test/filters/caps2.profile b/test/capabilities/caps2.profile
index ad49719f1..ad49719f1 100644
--- a/test/filters/caps2.profile
+++ b/test/capabilities/caps2.profile
diff --git a/test/filters/caps3.profile b/test/capabilities/caps3.profile
index ad49719f1..ad49719f1 100644
--- a/test/filters/caps3.profile
+++ b/test/capabilities/caps3.profile
diff --git a/test/filters/filters.sh b/test/filters/filters.sh
index 2d115db1b..e19047e6f 100755
--- a/test/filters/filters.sh
+++ b/test/filters/filters.sh
@@ -57,18 +57,18 @@ echo "TESTING: noroot (test/filters/noroot.exp)"
 ./noroot.exp
 
 
-if grep -q "^CapBnd:\\s0000003fffffffff" /proc/self/status; then
-        echo "TESTING: capabilities (test/filters/caps.exp)"
-        ./caps.exp
-else
-        echo "TESTING SKIP: other capabilities than expected (test/filters/caps.exp)"
-fi
-
-echo "TESTING: capabilities print (test/filters/caps-print.exp)"
-./caps-print.exp
-
-echo "TESTING: capabilities join (test/filters/caps-join.exp)"
-./caps-join.exp
+#if grep -q "^CapBnd:\\s0000003fffffffff" /proc/self/status; then
+#       echo "TESTING: capabilities (test/filters/caps.exp)"
+#       ./caps.exp
+#else
+#       echo "TESTING SKIP: other capabilities than expected (test/filters/caps.exp)"
+#fi
+#
+#echo "TESTING: capabilities print (test/filters/caps-print.exp)"
+#./caps-print.exp
+#
+#echo "TESTING: capabilities join (test/filters/caps-join.exp)"
+#./caps-join.exp
 
 rm -f seccomp-test-file
 if [[ $(uname -m) == "x86_64" ]]; then
diff --git a/test/firecfg/firecfg.exp b/test/firecfg/firecfg.exp
index 0249fb7fa..755eea3a1 100755
--- a/test/firecfg/firecfg.exp
+++ b/test/firecfg/firecfg.exp
@@ -12,7 +12,20 @@ expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "ping: symbolic link to /usr/bin/firejail"
 }
+after 100
 
+send --  "file /tmp/ttt/ping\r"
+expect {
+        timeout {puts "TESTING ERROR 0\n";exit}
+        "ping: symbolic link to /usr/bin/firejail"
+}
+after 100
+
+send -- "firecfg --list\r"
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "/usr/local/bin/ping"
+}
 after 100
 
 puts "\nall done\n"
diff --git a/test/firecfg/firecfg.sh b/test/firecfg/firecfg.sh
index 6b03cc841..6f2bb5244 100755
--- a/test/firecfg/firecfg.sh
+++ b/test/firecfg/firecfg.sh
@@ -7,6 +7,11 @@ export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 export LC_ALL=C
 
+sudo mkdir /tmp/ttt
 sudo firecfg
+sudo firecfg --bindir=/tmp/ttt
+
 echo "TESTING: firecfg (test/firecfg/firecfg.exp)"
 ./firecfg.exp
+
+sudo rm -fr /tmp/ttt