diff options
author | netblue30 <netblue30@yahoo.com> | 2016-04-30 12:19:53 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2016-04-30 12:19:53 -0400 |
commit | 2bd593cbeb17f109f8f53c811671fa8166411421 (patch) | |
tree | e4e57c8380d95e970cc486fd60fed54dff870da0 | |
parent | added make test-filters (diff) | |
download | firejail-2bd593cbeb17f109f8f53c811671fa8166411421.tar.gz firejail-2bd593cbeb17f109f8f53c811671fa8166411421.tar.zst firejail-2bd593cbeb17f109f8f53c811671fa8166411421.zip |
make test-filters fixes
-rwxr-xr-x | test/filters/filters.sh | 13 | ||||
-rwxr-xr-x | test/filters/seccomp-chmod-profile.exp | 30 | ||||
-rwxr-xr-x | test/filters/seccomp-chmod.exp | 30 |
3 files changed, 37 insertions, 36 deletions
diff --git a/test/filters/filters.sh b/test/filters/filters.sh index 11d90b011..1e64a6373 100755 --- a/test/filters/filters.sh +++ b/test/filters/filters.sh | |||
@@ -27,20 +27,17 @@ echo "TESTING: seccomp errno (test/filters/seccomp-errno.exp)" | |||
27 | echo "TESTING: seccomp su (test/filters/seccomp-su.exp)" | 27 | echo "TESTING: seccomp su (test/filters/seccomp-su.exp)" |
28 | ./seccomp-su.exp | 28 | ./seccomp-su.exp |
29 | 29 | ||
30 | echo "TESTING: seccomp ptrace (seccomp-ptrace.exp)" | 30 | echo "TESTING: seccomp ptrace (test/filters/seccomp-ptrace.exp)" |
31 | ./seccomp-ptrace.exp | 31 | ./seccomp-ptrace.exp |
32 | 32 | ||
33 | # todo: fix pwd | 33 | echo "TESTING: seccomp chmod - seccomp lists (test/filters/seccomp-chmod.exp)" |
34 | #echo "TESTING: seccomp chmod - seccomp lists (test/filters/seccomp-chmod.exp)" | 34 | ./seccomp-chmod.exp |
35 | #./seccomp-chmod.exp | ||
36 | 35 | ||
37 | # todo: fix pwd | 36 | echo "TESTING: seccomp chmod profile - seccomp lists (test/filters/seccomp-chmod-profile.exp)" |
38 | #echo "TESTING: seccomp chmod profile - seccomp lists (test/filters/seccomp-chmod-profile.exp)" | 37 | ./seccomp-chmod-profile.exp |
39 | #./seccomp-chmod-profile.exp | ||
40 | 38 | ||
41 | # todo: fix pwd and add seccomp-chown.exp and seccomp-umount.exp | 39 | # todo: fix pwd and add seccomp-chown.exp and seccomp-umount.exp |
42 | 40 | ||
43 | |||
44 | echo "TESTING: seccomp empty (test/filters/seccomp-empty.exp)" | 41 | echo "TESTING: seccomp empty (test/filters/seccomp-empty.exp)" |
45 | ./seccomp-empty.exp | 42 | ./seccomp-empty.exp |
46 | 43 | ||
diff --git a/test/filters/seccomp-chmod-profile.exp b/test/filters/seccomp-chmod-profile.exp index 9683fad90..e5d16f524 100755 --- a/test/filters/seccomp-chmod-profile.exp +++ b/test/filters/seccomp-chmod-profile.exp | |||
@@ -14,36 +14,38 @@ expect { | |||
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
17 | send -- "touch testfile;pwd\r" | 17 | send -- "cd ~; echo done\r" |
18 | expect { | 18 | expect { |
19 | timeout {puts "TESTING ERROR 1\n";exit} | 19 | timeout {puts "TESTING ERROR 1\n";exit} |
20 | "/root" {puts "running as root"} | 20 | "done" |
21 | "/home" | ||
22 | } | 21 | } |
23 | 22 | ||
24 | send -- "ls -l testfile;pwd\r" | 23 | send -- "touch testfile; echo done\r" |
25 | expect { | 24 | expect { |
26 | timeout {puts "TESTING ERROR 2\n";exit} | 25 | timeout {puts "TESTING ERROR 2\n";exit} |
27 | "testfile" | 26 | "done" |
28 | } | 27 | } |
28 | |||
29 | send -- "ls -l testfile; echo done\r" | ||
29 | expect { | 30 | expect { |
30 | timeout {puts "TESTING ERROR 3\n";exit} | 31 | timeout {puts "TESTING ERROR 3\n";exit} |
31 | "/root" {puts "running as root"} | 32 | "testfile" |
32 | "/home" | 33 | } |
34 | expect { | ||
35 | timeout {puts "TESTING ERROR 4\n";exit} | ||
36 | "done" | ||
33 | } | 37 | } |
34 | 38 | ||
35 | send -- "chmod +x testfile;pwd\r" | 39 | send -- "chmod +x testfile; echo done\r" |
36 | expect { | 40 | expect { |
37 | timeout {puts "TESTING ERROR 2\n";exit} | 41 | timeout {puts "TESTING ERROR 5\n";exit} |
38 | "Bad system call" | 42 | "Bad system call" |
39 | } | 43 | } |
40 | expect { | 44 | expect { |
41 | timeout {puts "TESTING ERROR 3\n";exit} | 45 | timeout {puts "TESTING ERROR 6\n";exit} |
42 | "/root" {puts "running as root"} | 46 | "done" |
43 | "/home" | ||
44 | } | 47 | } |
45 | 48 | ||
46 | |||
47 | send -- "exit\r" | 49 | send -- "exit\r" |
48 | sleep 1 | 50 | sleep 1 |
49 | puts "\n" | 51 | puts "\nall done\n" |
diff --git a/test/filters/seccomp-chmod.exp b/test/filters/seccomp-chmod.exp index 0d52122d3..9ca084e7f 100755 --- a/test/filters/seccomp-chmod.exp +++ b/test/filters/seccomp-chmod.exp | |||
@@ -14,36 +14,38 @@ expect { | |||
14 | } | 14 | } |
15 | sleep 2 | 15 | sleep 2 |
16 | 16 | ||
17 | send -- "touch testfile;pwd\r" | 17 | send -- "cd ~; echo done\r" |
18 | expect { | 18 | expect { |
19 | timeout {puts "TESTING ERROR 1\n";exit} | 19 | timeout {puts "TESTING ERROR 1\n";exit} |
20 | "/root" {puts "running as root"} | 20 | "done" |
21 | "/home" | ||
22 | } | 21 | } |
23 | 22 | ||
24 | send -- "ls -l testfile;pwd\r" | 23 | send -- "touch testfile; echo done\r" |
25 | expect { | 24 | expect { |
26 | timeout {puts "TESTING ERROR 2\n";exit} | 25 | timeout {puts "TESTING ERROR 2\n";exit} |
27 | "testfile" | 26 | "done" |
28 | } | 27 | } |
28 | |||
29 | send -- "ls -l testfile; echo done\r" | ||
29 | expect { | 30 | expect { |
30 | timeout {puts "TESTING ERROR 3\n";exit} | 31 | timeout {puts "TESTING ERROR 3\n";exit} |
31 | "/root" {puts "running as root"} | 32 | "testfile" |
32 | "/home" | 33 | } |
34 | expect { | ||
35 | timeout {puts "TESTING ERROR 4\n";exit} | ||
36 | "done" | ||
33 | } | 37 | } |
34 | 38 | ||
35 | send -- "chmod +x testfile;pwd\r" | 39 | send -- "chmod +x testfile; echo done\r" |
36 | expect { | 40 | expect { |
37 | timeout {puts "TESTING ERROR 2\n";exit} | 41 | timeout {puts "TESTING ERROR 5\n";exit} |
38 | "Bad system call" | 42 | "Bad system call" |
39 | } | 43 | } |
40 | expect { | 44 | expect { |
41 | timeout {puts "TESTING ERROR 3\n";exit} | 45 | timeout {puts "TESTING ERROR 6\n";exit} |
42 | "/root" {puts "running as root"} | 46 | "done" |
43 | "/home" | ||
44 | } | 47 | } |
45 | 48 | ||
46 | |||
47 | send -- "exit\r" | 49 | send -- "exit\r" |
48 | sleep 1 | 50 | sleep 1 |
49 | puts "\n" | 51 | puts "\nall done\n" |