0.9.38 testing

5 files changed, 167 insertions, 31 deletions

diff --git a/test/features/3.1.exp b/test/features/3.1.exp
index 52a929651..a66fbdae1 100755
--- a/test/features/3.1.exp
+++ b/test/features/3.1.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 #
-# tmpfs
+# private
 #
 
 set timeout 10
diff --git a/test/features/3.5.exp b/test/features/3.5.exp
new file mode 100755
index 000000000..d190ef36f
--- /dev/null
+++ b/test/features/3.5.exp
@@ -0,0 +1,77 @@
+#!/usr/bin/expect -f
+#
+# private-dev
+#
+
+set timeout 10
+spawn $env(SHELL)
+match_max 100000
+set overlay [lindex $argv 0]
+set chroot [lindex $argv 1]
+
+#
+# N
+#
+send -- "firejail --noprofile --private-dev\r"
+expect {
+        timeout {puts "TESTING ERROR 0\n";exit}
+        "Child process initialized"
+}
+sleep 1
+
+send -- "ls -al /dev | wc -l\r"
+expect {
+        timeout {puts "TESTING ERROR 1.1\n";exit}
+        "14"
+}
+
+after 100
+send -- "exit\r"
+sleep 1
+
+#
+# O
+#
+if { $overlay == "overlay" } {
+        send -- "firejail --noprofile --overlay --private-dev\r"
+        expect {
+                timeout {puts "TESTING ERROR 2\n";exit}
+                "Child process initialized"
+        }
+        sleep 1
+        
+        send -- "ls -al /dev | wc -l\r"
+        expect {
+                timeout {puts "TESTING ERROR 3.1\n";exit}
+                "13"
+        }
+        
+        after 100
+        send -- "exit\r"
+        sleep 1
+}
+
+#
+# C
+#
+if { $chroot == "chroot" } {
+        send -- "firejail --noprofile --chroot=/tmp/chroot --private-dev\r"
+        expect {
+                timeout {puts "TESTING ERROR 4\n";exit}
+                "Child process initialized"
+        }
+        sleep 1
+        
+        send -- "ls -al /dev | wc -l\r"
+        expect {
+                timeout {puts "TESTING ERROR 5.1\n";exit}
+                "13"
+        }
+        
+        after 100
+        send -- "exit\r"
+        sleep 1
+}
+
+
+puts "\nall done\n"
diff --git a/test/features/3.6.exp b/test/features/3.6.exp
new file mode 100755
index 000000000..6117485da
--- /dev/null
+++ b/test/features/3.6.exp
@@ -0,0 +1,77 @@
+#!/usr/bin/expect -f
+#
+# private-etc
+#
+
+set timeout 10
+spawn $env(SHELL)
+match_max 100000
+set overlay [lindex $argv 0]
+set chroot [lindex $argv 1]
+
+#
+# N
+#
+send -- "firejail --noprofile --private-etc=group,hostname,hosts,nsswitch.conf,passwd,resolv.conf,skel\r"
+expect {
+        timeout {puts "TESTING ERROR 0\n";exit}
+        "Child process initialized"
+}
+sleep 1
+
+send -- "ls -al /etc | wc -l\r"
+expect {
+        timeout {puts "TESTING ERROR 1.1\n";exit}
+        "10"
+}
+
+after 100
+send -- "exit\r"
+sleep 1
+
+#
+# O
+#
+if { $overlay == "overlay" } {
+        send -- "firejail --noprofile --overlay --private-etc=group,hostname,hosts,nsswitch.conf,passwd,resolv.conf,skel\r"
+        expect {
+                timeout {puts "TESTING ERROR 2\n";exit}
+                "Child process initialized"
+        }
+        sleep 1
+        
+        send -- "ls -al /etc | wc -l\r"
+        expect {
+                timeout {puts "TESTING ERROR 3.1\n";exit}
+                "10"
+        }
+        
+        after 100
+        send -- "exit\r"
+        sleep 1
+}
+
+#
+# C
+#
+if { $chroot == "chroot" } {
+        send -- "firejail --noprofile --chroot=/tmp/chroot --private-etc=group,hostname,hosts,nsswitch.conf,passwd,resolv.conf,skel\r"
+        expect {
+                timeout {puts "TESTING ERROR 4\n";exit}
+                "Child process initialized"
+        }
+        sleep 1
+        
+        send -- "ls -al /etc | wc -l\r"
+        expect {
+                timeout {puts "TESTING ERROR 5.1\n";exit}
+                "10"
+        }
+        
+        after 100
+        send -- "exit\r"
+        sleep 1
+}
+
+
+puts "\nall done\n"
diff --git a/test/features/features.txt b/test/features/features.txt
index 1dedff357..0c41090aa 100644
--- a/test/features/features.txt
+++ b/test/features/features.txt
@@ -9,11 +9,7 @@ C - chroot filesystem
 1. Default features (tesing with --noprofile)
 
 1.1 disable /boot
-        - N, O, C
-
 1.2 new /proc
-        - N, O, C
-
 1.3 new /sys
         - N, O fails remount, C fails remount
 
@@ -23,49 +19,23 @@ C - chroot filesystem
         - /etc/group: N, O, C to test
 
 1.5 PID namespace
-        - N, O, C
-
 1.6 new /var/log
-        - N, O, C
-
 1.7 new /var/tmp
-        -N, O, C
-
 1.8 disable /etc/firejail and ~/.config/firejail
-        -N, O, C
-
 1.9 mount namespace
-
 1.10 disable /selinux
-        - N, O, C
-
-
 
 2. Networking features
 
 2.1 Hostname (use --hostname=newhostname, do a ping and cat /etc/hostname)
-        - N, O, C
         - ping disabled for C by default seccomp filter, use "getent hosts bingo"
 
 2.2 DNS (use --dns=4.2.2.1, use "dig google.com")
-        - N, O, C
-
 2.3 mac-vlan (use --net=eth0 and --noprofile; run ifconfig and dig google.com)
-        - N, O, C
-        - test --ip: N, O, C
-
 2.4 bridge (use --net=br0 and --noprofile; run ifconfig, netstat -rn, ping default gw)
-        - N, O, C
         - ping disabled for C by default seccomp filter - transfer test not implemented for C
-        - test --ip: N, O, C
-
 2.5 interface
-        - N, O, C
-
 2.6 Default gw (--noprofile --net=eth0 --defaultgw=192.168.1.10, run netstat -rn)
-        - N, O, C
-
-
 
 3. Filesystem features (use --noprofile)
 
@@ -73,3 +43,9 @@ C - chroot filesystem
 3.2 read-only
 3.3 blacklist
 3.4 whitelist home
+3.5 private-dev
+        - O, C - somehow /dev/log is missing
+3.6 private-etc
+        - O not working
+
+        
\ No newline at end of file
diff --git a/test/features/test.sh b/test/features/test.sh
index 56b6289b4..a162fc9ca 100755
--- a/test/features/test.sh
+++ b/test/features/test.sh
@@ -95,3 +95,9 @@ echo "TESTING: 3.3 blacklist"
 echo "TESTING: 3.4 whitelist"
 ./3.4.exp $OVERLAY $CHROOT
 
+echo "TESTING: 3.5 private-dev"
+./3.5.exp $OVERLAY $CHROOT
+
+echo "TESTING: 3.6 private-etc"
+./3.6.exp notworking-todo $CHROOT
+