13 files changed, 10 insertions, 352 deletions

diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index a90ecbeee..98c45b637 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -604,6 +604,10 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                 return 0;
         }
         // seccomp drop list without default list
+        if (strcmp(ptr, "seccomp.drop") == 0) {
+                fprintf(stderr, "Error: line %d in %s is invalid\n", lineno, fname);
+                exit(1);
+        }
         if (strncmp(ptr, "seccomp.drop ", 13) == 0) {
 #ifdef HAVE_SECCOMP
                 if (checkcfg(CFG_SECCOMP)) {
@@ -617,6 +621,10 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
         }
 
         // seccomp keep list
+        if (strcmp(ptr, "seccomp.keep") == 0) {
+                fprintf(stderr, "Error: line %d in %s is invalid\n", lineno, fname);
+                exit(1);
+        }
         if (strncmp(ptr, "seccomp.keep ", 13) == 0) {
 #ifdef HAVE_SECCOMP
                 if (checkcfg(CFG_SECCOMP)) {
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 0bc1c1b5d..98d74bcf8 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -296,9 +296,6 @@ Example:
 .br
 $ firejail \-\-debug-errnos
 .TP
-\fB\-\-debug-private-lib
-Debug messages for --private-lib option.
-.TP
 \fB\-\-debug-protocols
 Print all recognized protocols in the current Firejail software build and exit.
 .br
diff --git a/test/arguments/arguments.sh b/test/arguments/arguments.sh
index d9f2d4697..c3505c188 100755
--- a/test/arguments/arguments.sh
+++ b/test/arguments/arguments.sh
@@ -18,8 +18,3 @@ sleep 1
 echo "TESTING: 3. --join option"
 ./joinrun.exp
 sleep 1
-
-echo "TESTING: 4. --output option"
-./outrun.exp
-rm out
-rm out.*
diff --git a/test/arguments/outrun.sh b/test/arguments/outrun.sh
deleted file mode 100755
index 5bc3b1e37..000000000
--- a/test/arguments/outrun.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-echo "TESTING: 4.1 - simple args"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit arg1 arg2
-
-# simple quotes, testing spaces in file names
-echo "TESTING: 4.2 - args with space and \""
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit "arg1 tail" "arg2 tail"
-
-echo "TESTING: 4.3 - args with space and '"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit 'arg1 tail' 'arg2 tail'
-
-# escaped space in file names
-echo "TESTING: 4.4 - args with space and \\"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit arg1\ tail arg2\ tail
-
-# & char appears in URLs - URLs should be quoted
-echo "TESTING: 4.5 - args with & and \""
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit "arg1&tail" "arg2&tail"
-
-echo "TESTING: 4.6 - args with & and '"
-firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit 'arg1&tail' 'arg2&tail'
diff --git a/test/environment/dash.exp b/test/environment/dash.exp
index cad4422a0..daaa26dab 100755
--- a/test/environment/dash.exp
+++ b/test/environment/dash.exp
@@ -5,7 +5,7 @@ cd /home
 spawn $env(SHELL)
 match_max 100000
 
-send -- "firejail --private --tracelog --shell=/bin/dash\r"
+send -- "firejail --private --shell=/bin/dash\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "Child process initialized"
diff --git a/test/environment/dns.exp b/test/environment/dns.exp
index 6ddc0ccea..4a23cb4d7 100755
--- a/test/environment/dns.exp
+++ b/test/environment/dns.exp
@@ -61,7 +61,7 @@ expect {
 send -- "exit\r"
 sleep 1
 
-send -- "firejail --trace --dns=208.67.222.222 wget -q debian.org\r"
+send -- "firejail --dns=208.67.222.222 wget -q debian.org\r"
 expect {
         timeout {puts "TESTING ERROR 1.2\n";exit}
         "connect"
diff --git a/test/fs/invalid_filename.exp b/test/fs/invalid_filename.exp
index 84abe74cd..085dc9803 100755
--- a/test/fs/invalid_filename.exp
+++ b/test/fs/invalid_filename.exp
@@ -18,28 +18,6 @@ expect {
 }
 after 100
 
-send -- "firejail --noprofile --cgroup=\"bla&&bla\"\r"
-expect {
-        timeout {puts "TESTING ERROR 2.2\n";exit}
-        "Error:"
-}
-expect {
-        timeout {puts "TESTING ERROR 2.3\n";exit}
-        "is an invalid filename"
-}
-after 100
-
-send -- "firejail --noprofile --chroot=\"bla&&bla\"\r"
-expect {
-        timeout {puts "TESTING ERROR 3.2\n";exit}
-        "Error:"
-}
-expect {
-        timeout {puts "TESTING ERROR 3.3\n";exit}
-        "is an invalid filename"
-}
-after 100
-
 send -- "firejail --noprofile --netfilter=\"bla&&bla\"\r"
 expect {
         timeout {puts "TESTING ERROR 4.2\n";exit}
@@ -51,13 +29,6 @@ expect {
 }
 after 100
 
-send -- "firejail --noprofile --output=\"bla&&bla\"\r"
-expect {
-        timeout {puts "TESTING ERROR 5.3\n";exit}
-        "is an invalid filename"
-}
-after 100
-
 send -- "firejail --noprofile --private=\"bla&&bla\"\r"
 expect {
         timeout {puts "TESTING ERROR 6.2\n";exit}
@@ -69,39 +40,6 @@ expect {
 }
 after 100
 
-send -- "firejail --noprofile --private-bin=\"bla&&bla\"\r"
-expect {
-        timeout {puts "TESTING ERROR 7.2\n";exit}
-        "Error:"
-}
-expect {
-        timeout {puts "TESTING ERROR 7.3\n";exit}
-        "is an invalid filename"
-}
-after 100
-
-send -- "firejail --noprofile --private-home=\"bla&&bla\"\r"
-expect {
-        timeout {puts "TESTING ERROR 8.2\n";exit}
-        "Error:"
-}
-expect {
-        timeout {puts "TESTING ERROR 8.3\n";exit}
-        "is an invalid filename"
-}
-after 100
-
-send -- "firejail --noprofile --private-etc=\"bla&&bla\"\r"
-expect {
-        timeout {puts "TESTING ERROR 9.2\n";exit}
-        "Error:"
-}
-expect {
-        timeout {puts "TESTING ERROR 9.3\n";exit}
-        "is an invalid filename"
-}
-after 100
-
 send -- "firejail --profile=\"bla&&bla\"\r"
 expect {
         timeout {puts "TESTING ERROR 10.2\n";exit}
diff --git a/test/ssh/login.exp b/test/ssh/login.exp
deleted file mode 100755
index 479292c91..000000000
--- a/test/ssh/login.exp
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/expect -f
-
-set timeout 10
-spawn $env(SHELL)
-match_max 100000
-
-send -- "ssh firejail-test@0\r"
-expect {
-        timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized" {puts "OK\n"}
-        "an existing sandbox was detected" {puts "OK\n"}
-}
-sleep 1
-
-send -- "ps aux | wc -l\r"
-expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
-        "5"
-}
-after 100
-
-send -- "ls -l /home | grep drw | wc -l\r"
-expect {
-        timeout {puts "TESTING ERROR 2\n";exit}
-        "1"
-}
-after 100
-
-send -- "cat /proc/self/status | grep Seccomp\r"
-expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
-        "2"
-}
-after 100
-
-send -- "cat /proc/self/status | grep CapBnd\r"
-expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
-        "0000000000000000"
-}
-after 100
-
-# preparing scp/sftp tests
-send -- "rm testfile\r"
-
-send -- "exit\r"
-sleep 1
-
-puts "\nall done\n"
diff --git a/test/ssh/scp.exp b/test/ssh/scp.exp
deleted file mode 100755
index 355125751..000000000
--- a/test/ssh/scp.exp
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/expect -f
-
-set timeout 10
-spawn $env(SHELL)
-match_max 100000
-
-send -- "ssh firejail-test@0\r"
-expect {
-        timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized" {puts "OK\n"}
-        "an existing sandbox was detected" {puts "OK\n"}
-}
-sleep 1
-
-send -- "rm -f testfile\r"
-after 100
-send -- "exit\r"
-sleep 1
-
-send -- "echo 12345 > testfile\r"
-after 100
-send -- "scp testfile firejail-test@0:~/testfile\r"
-expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
-        "100%"
-}
-sleep 1
-
-
-send -- "ssh firejail-test@0\r"
-expect {
-        timeout {puts "TESTING ERROR 2\n";exit}
-        "Child process initialized" {puts "OK\n"}
-        "an existing sandbox was detected" {puts "OK\n"}
-}
-sleep 1
-send -- "cat testfile\r"
-expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
-        "12345"
-}
-after 100
-send -- "exit\r"
-sleep 1
-
-send -- "rm testfile\r"
-after 100
-send -- "scp firejail-test@0:~/testfile testfile\r"
-expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
-        "100%"
-}
-sleep 1
-send -- "cat testfile\r"
-expect {
-        timeout {puts "TESTING ERROR 5\n";exit}
-        "12345"
-}
-after 100
-send -- "rm testfile\r"
-sleep 1
-
-puts "\nall done\n"
diff --git a/test/ssh/sftp.exp b/test/ssh/sftp.exp
deleted file mode 100755
index 3b0124ec7..000000000
--- a/test/ssh/sftp.exp
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/expect -f
-
-set timeout 10
-spawn $env(SHELL)
-match_max 100000
-
-send -- "ssh firejail-test@0\r"
-expect {
-        timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized" {puts "OK\n"}
-        "an existing sandbox was detected" {puts "OK\n"}
-}
-sleep 1
-
-send -- "rm -f testfile\r"
-after 100
-send -- "exit\r"
-sleep 1
-
-send -- "echo 12345 > testfile\r"
-after 100
-send -- "sftp firejail-test@0\r"
-expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
-        "Connected to 0"
-}
-expect {
-        timeout {puts "TESTING ERROR 2\n";exit}
-        "sftp>"
-}
-after 100
-send -- "put testfile\r"
-expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
-        "100%"
-}
-after 100
-send -- "exit\r"
-sleep 1
-
-
-send -- "ssh firejail-test@0\r"
-expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
-        "Child process initialized" {puts "OK\n"}
-        "an existing sandbox was detected" {puts "OK\n"}
-}
-sleep 1
-send -- "cat testfile\r"
-expect {
-        timeout {puts "TESTING ERROR 5\n";exit}
-        "12345"
-}
-after 100
-send -- "exit\r"
-sleep 1
-
-send -- "rm testfile\r"
-after 100
-send -- "sftp firejail-test@0\r"
-expect {
-        timeout {puts "TESTING ERROR 6\n";exit}
-        "Connected to 0"
-}
-expect {
-        timeout {puts "TESTING ERROR 7\n";exit}
-        "sftp>"
-}
-after 100
-send -- "get testfile\r"
-expect {
-        timeout {puts "TESTING ERROR 8\n";exit}
-        "100%"
-}
-after 100
-send -- "exit\r"
-sleep 1
-send -- "cat testfile\r"
-expect {
-        timeout {puts "TESTING ERROR 9\n";exit}
-        "12345"
-}
-after 100
-send -- "rm testfile\r"
-sleep 1
-
-puts "\nall done\n"
diff --git a/test/ssh/ssh.sh b/test/ssh/ssh.sh
deleted file mode 100755
index 20a70b1b6..000000000
--- a/test/ssh/ssh.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# This file is part of Firejail project
-# Copyright (C) 2014-2018 Firejail Authors
-# License GPL v2
-
-export MALLOC_CHECK_=3
-export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
-
-echo "TESTING: ssh login (test/ssh/login.exp)"
-./login.exp
-
-echo "TESTING: sftp (test/ssh/sftp.exp)"
-./sftp.exp
-
-echo "TESTING: scp (test/ssh/scp.exp)"
-./scp.exp
diff --git a/test/utils/firemon-cgroup.exp b/test/utils/firemon-cgroup.exp
deleted file mode 100755
index 8282e701a..000000000
--- a/test/utils/firemon-cgroup.exp
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/expect -f
-# This file is part of Firejail project
-# Copyright (C) 2014-2018 Firejail Authors
-# License GPL v2
-
-set timeout 10
-spawn $env(SHELL)
-match_max 100000
-
-send --  "firejail --name=test1\r"
-expect {
-        timeout {puts "TESTING ERROR 0\n";exit}
-        "Child process initialized"
-}
-sleep 1
-
-spawn $env(SHELL)
-send --  "firejail --name=test2\r"
-expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
-        "Child process initialized"
-}
-sleep 1
-
-spawn $env(SHELL)
-send --  "firemon --cgroup\r"
-sleep 4
-expect {
-        timeout {puts "TESTING ERROR 2\n";exit}
-        "need to be root" {puts "TESTING SKIP: /proc mounted as hidepid\n"; exit}
-        "name=test1"
-}
-expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
-        "name=test2"
-}
-
-after 100
-
-puts "\nall done\n"
diff --git a/test/utils/utils.sh b/test/utils/utils.sh
index c4958094e..79184ab99 100755
--- a/test/utils/utils.sh
+++ b/test/utils/utils.sh
@@ -104,9 +104,6 @@ echo "TESTING: firemon caps (test/utils/firemon-caps.exp)"
 echo "TESTING: firemon cpu (test/utils/firemon-cpu.exp)"
 ./firemon-cpu.exp
 
-echo "TESTING: firemon cgroup (test/utils/firemon-cgroup.exp)"
-./firemon-cgroup.exp
-
 echo "TESTING: firemon version (test/utils/firemon-version.exp)"
 ./firemon-version.exp