testing

2 files changed, 83 insertions, 5 deletions

diff --git a/src/firemon/firemon.c b/src/firemon/firemon.c
index f89196f21..1f3fdd578 100644
--- a/src/firemon/firemon.c
+++ b/src/firemon/firemon.c
@@ -52,15 +52,35 @@ static void my_handler(int s){
         exit(0);
 }
 
-// find the first child process for the specified pid
+// find the second child process for the specified pid
 // return -1 if not found
+//
+// Example:
+//14776:netblue:/usr/bin/firejail /usr/bin/transmission-qt 
+//  14777:netblue:/usr/bin/firejail /usr/bin/transmission-qt 
+//    14792:netblue:/usr/bin/transmission-qt 
+// We need 14792, the first real sandboxed process
 int find_child(int id) {
         int i;
+        int first_child = -1;
+
+        // find the first child 
         for (i = 0; i < max_pids; i++) {
-                if (pids[i].level == 2 && pids[i].parent == id)
-                        return i;
+                if (pids[i].level == 2 && pids[i].parent == id) {
+                        first_child = i;
+                        break;
+                }
         }
 
+        if (first_child == -1)
+                return -1;
+        
+        // find the second child
+        for (i = 0; i < max_pids; i++) {
+                if (pids[i].level == 3 && pids[i].parent == first_child)
+                        return i;
+        }
+        
         return -1;
 }
 
diff --git a/test/fs/whitelist-dev.exp b/test/fs/whitelist-dev.exp
index 7575faee0..bc0970091 100755
--- a/test/fs/whitelist-dev.exp
+++ b/test/fs/whitelist-dev.exp
@@ -33,15 +33,73 @@ sleep 1
 send -- "ls -l /dev | wc -l\r"
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
-        "13" {puts "OK\n"}
-        "12" {puts "OK\n"}
+        "18" {puts "OK\n"}
+        "17" {puts "OK\n"}
 }
 after 100
+
+send -- "ls -l /dev\r"
+expect {
+        timeout {puts "TESTING ERROR 4\n";exit}
+        "dvd" {puts "OK\n"}
+}
+after 100
+
+send -- "ls -l /dev\r"
+expect {
+        timeout {puts "TESTING ERROR 5\n";exit}
+        "dri" {puts "OK\n"}
+}
+after 100
+
+send -- "ls -l /dev\r"
+expect {
+        timeout {puts "TESTING ERROR 6\n";exit}
+        "snd" {puts "OK\n"}
+}
+after 100
+
 send -- "exit\r"
 sleep 1
 
+send -- "firejail --private-dev --nosound ls /dev\r"
+expect {
+        timeout {puts "TESTING ERROR 7\n";exit}
+        "Child process initialized"
+}
+expect {
+        timeout {puts "TESTING ERROR 8\n";exit}
+        "snd" {puts "TESTING ERROR 9\n";exit}
+        "Parent is shutting down"
+}
+sleep 1
 
+send -- "firejail --private-dev --nodvd ls /dev\r"
+expect {
+        timeout {puts "TESTING ERROR 10\n";exit}
+        "Child process initialized"
+}
+expect {
+        timeout {puts "TESTING ERROR 11\n";exit}
+        "dvd" {puts "TESTING ERROR 12\n";exit}
+        "cdrom" {puts "TESTING ERROR 13\n";exit}
+        "dvdrom" {puts "TESTING ERROR 14\n";exit}
+        "cdrw" {puts "TESTING ERROR 15\n";exit}
+        "dvdrw" {puts "TESTING ERROR 16\n";exit}
+        "Parent is shutting down"
+}
+sleep 1
 
+send -- "firejail --private-dev --no3d ls /dev\r"
+expect {
+        timeout {puts "TESTING ERROR 17\n";exit}
+        "Child process initialized"
+}
+expect {
+        timeout {puts "TESTING ERROR 18\n";exit}
+        "dri" {puts "TESTING ERROR 19\n";exit}
+        "Parent is shutting down"
+}
 
 after 100
 puts "\nall done\n"