diff options
author | netblue30 <netblue30@protonmail.com> | 2023-01-12 13:12:10 -0500 |
---|---|---|
committer | netblue30 <netblue30@protonmail.com> | 2023-01-12 13:12:10 -0500 |
commit | 9f5c42b2e729047f911e928885c8b7b2d0238ceb (patch) | |
tree | 8c5a96252685b07dc2768b9b387831ef18b703c0 | |
parent | rel 0.9.72 testing: disable whitelisting /dev directory (diff) | |
download | firejail-9f5c42b2e729047f911e928885c8b7b2d0238ceb.tar.gz firejail-9f5c42b2e729047f911e928885c8b7b2d0238ceb.tar.zst firejail-9f5c42b2e729047f911e928885c8b7b2d0238ceb.zip |
fix make test-filters
-rwxr-xr-x | test/filters/apparmor.exp | 8 | ||||
-rwxr-xr-x | test/filters/protocol.exp | 73 | ||||
-rwxr-xr-x | test/filters/seccomp-run-files.exp | 4 |
3 files changed, 69 insertions, 16 deletions
diff --git a/test/filters/apparmor.exp b/test/filters/apparmor.exp index 13ce4dd06..0797a1db3 100755 --- a/test/filters/apparmor.exp +++ b/test/filters/apparmor.exp | |||
@@ -30,7 +30,7 @@ expect { | |||
30 | } | 30 | } |
31 | expect { | 31 | expect { |
32 | timeout {puts "TESTING ERROR 3\n";exit} | 32 | timeout {puts "TESTING ERROR 3\n";exit} |
33 | "AppArmor: firejail-default enforce" | 33 | "AppArmor: firejail-default//&unconfined enforce" |
34 | } | 34 | } |
35 | expect { | 35 | expect { |
36 | timeout {puts "TESTING ERROR 4\n";exit} | 36 | timeout {puts "TESTING ERROR 4\n";exit} |
@@ -38,21 +38,21 @@ expect { | |||
38 | } | 38 | } |
39 | expect { | 39 | expect { |
40 | timeout {puts "TESTING ERROR 5\n";exit} | 40 | timeout {puts "TESTING ERROR 5\n";exit} |
41 | "AppArmor: firejail-default enforce" | 41 | "AppArmor: firejail-default//&unconfined enforce" |
42 | } | 42 | } |
43 | after 100 | 43 | after 100 |
44 | 44 | ||
45 | send -- "firejail --apparmor.print=test1\r" | 45 | send -- "firejail --apparmor.print=test1\r" |
46 | expect { | 46 | expect { |
47 | timeout {puts "TESTING ERROR 6\n";exit} | 47 | timeout {puts "TESTING ERROR 6\n";exit} |
48 | "AppArmor: firejail-default enforce" | 48 | "AppArmor: firejail-default//&unconfined enforce" |
49 | } | 49 | } |
50 | after 100 | 50 | after 100 |
51 | 51 | ||
52 | send -- "firejail --apparmor.print=test2\r" | 52 | send -- "firejail --apparmor.print=test2\r" |
53 | expect { | 53 | expect { |
54 | timeout {puts "TESTING ERROR 7\n";exit} | 54 | timeout {puts "TESTING ERROR 7\n";exit} |
55 | "AppArmor: firejail-default enforce" | 55 | "AppArmor: firejail-default//&unconfined enforce" |
56 | } | 56 | } |
57 | after 100 | 57 | after 100 |
58 | 58 | ||
diff --git a/test/filters/protocol.exp b/test/filters/protocol.exp index cbc7fdc1a..96ac8d586 100755 --- a/test/filters/protocol.exp +++ b/test/filters/protocol.exp | |||
@@ -10,35 +10,88 @@ match_max 100000 | |||
10 | send -- "firejail --noprofile --protocol=unix --debug\r" | 10 | send -- "firejail --noprofile --protocol=unix --debug\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 1\n";exit} | 12 | timeout {puts "TESTING ERROR 1\n";exit} |
13 | "0009: 20 00 00 00000000 ld data.syscall-number" | 13 | "0009: 20 00 00 00000000" |
14 | } | 14 | } |
15 | expect { | 15 | expect { |
16 | timeout {puts "TESTING ERROR 2\n";exit} | 16 | timeout {puts "TESTING ERROR 2\n";exit} |
17 | "000a: 15 01 00 00000029 jeq socket 000c (false 000b)" | 17 | "000f: 20 00 00 00000010" |
18 | } | 18 | } |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 3\n";exit} | 20 | timeout {puts "TESTING ERROR 3\n";exit} |
21 | "000b: 06 00 00 7fff0000 ret ALLOW" | 21 | "0010: 15 00 01 00000001" |
22 | } | 22 | } |
23 | expect { | 23 | expect { |
24 | timeout {puts "TESTING ERROR 4\n";exit} | 24 | timeout {puts "TESTING ERROR 4\n";exit} |
25 | "000c: 20 00 00 00000010 ld data.args" | 25 | "0011: 06 00 00 7fff0000" |
26 | } | 26 | } |
27 | expect { | 27 | expect { |
28 | timeout {puts "TESTING ERROR 5\n";exit} | 28 | timeout {puts "TESTING ERROR 5\n";exit} |
29 | "000d: 15 00 01 00000001 jeq 1 000e (false 000f)" | 29 | "0012: 06 00 00 0005005f" |
30 | } | ||
31 | |||
32 | after 100 | ||
33 | send -- "exit\r" | ||
34 | sleep 1 | ||
35 | |||
36 | send -- "firejail --noprofile --protocol=bluetooth --debug\r" | ||
37 | expect { | ||
38 | timeout {puts "TESTING ERROR 11\n";exit} | ||
39 | "0009: 20 00 00 00000000" | ||
40 | } | ||
41 | expect { | ||
42 | timeout {puts "TESTING ERROR 12\n";exit} | ||
43 | "000f: 20 00 00 00000010" | ||
44 | } | ||
45 | expect { | ||
46 | timeout {puts "TESTING ERROR 13\n";exit} | ||
47 | "0010: 15 00 01 0000001f" | ||
48 | } | ||
49 | expect { | ||
50 | timeout {puts "TESTING ERROR 14\n";exit} | ||
51 | "0011: 06 00 00 7fff0000" | ||
52 | } | ||
53 | expect { | ||
54 | timeout {puts "TESTING ERROR1 5\n";exit} | ||
55 | "0012: 06 00 00 0005005f" | ||
56 | } | ||
57 | |||
58 | after 100 | ||
59 | send -- "exit\r" | ||
60 | sleep 1 | ||
61 | |||
62 | send -- "firejail --noprofile --protocol=inet,inet6 --debug\r" | ||
63 | expect { | ||
64 | timeout {puts "TESTING ERROR 31\n";exit} | ||
65 | "0009: 20 00 00 00000000" | ||
66 | } | ||
67 | expect { | ||
68 | timeout {puts "TESTING ERROR 32\n";exit} | ||
69 | "000f: 20 00 00 00000010" | ||
30 | } | 70 | } |
31 | expect { | 71 | expect { |
32 | timeout {puts "TESTING ERROR 6\n";exit} | 72 | timeout {puts "TESTING ERROR 33\n";exit} |
33 | "000e: 06 00 00 7fff0000 ret ALLOW" | 73 | "0010: 15 00 01 00000002" |
34 | "" | ||
35 | } | 74 | } |
36 | expect { | 75 | expect { |
37 | timeout {puts "TESTING ERROR 7\n";exit} | 76 | timeout {puts "TESTING ERROR 34\n";exit} |
38 | "000f: 06 00 00 0005005f ret ERRNO(95)" | 77 | "0011: 06 00 00 7fff0000" |
78 | } | ||
79 | expect { | ||
80 | timeout {puts "TESTING ERROR1 35\n";exit} | ||
81 | "0012: 15 00 01 0000000a" | ||
82 | } | ||
83 | expect { | ||
84 | timeout {puts "TESTING ERROR 36\n";exit} | ||
85 | "0013: 06 00 00 7fff0000" | ||
86 | } | ||
87 | expect { | ||
88 | timeout {puts "TESTING ERROR 37\n";exit} | ||
89 | "0014: 06 00 00 0005005f" | ||
39 | } | 90 | } |
40 | 91 | ||
41 | after 100 | 92 | after 100 |
42 | send -- "exit\r" | 93 | send -- "exit\r" |
94 | |||
95 | |||
43 | after 100 | 96 | after 100 |
44 | puts "\nall done\n" | 97 | puts "\nall done\n" |
diff --git a/test/filters/seccomp-run-files.exp b/test/filters/seccomp-run-files.exp index 59a576c20..95258ad4a 100755 --- a/test/filters/seccomp-run-files.exp +++ b/test/filters/seccomp-run-files.exp | |||
@@ -24,7 +24,7 @@ after 100 | |||
24 | send -- "ls -l /run/firejail/mnt/seccomp | grep -c seccomp\r" | 24 | send -- "ls -l /run/firejail/mnt/seccomp | grep -c seccomp\r" |
25 | expect { | 25 | expect { |
26 | timeout {puts "TESTING ERROR 3\n";exit} | 26 | timeout {puts "TESTING ERROR 3\n";exit} |
27 | "6" | 27 | "8" |
28 | } | 28 | } |
29 | send -- "exit\r" | 29 | send -- "exit\r" |
30 | sleep 1 | 30 | sleep 1 |
@@ -90,7 +90,7 @@ after 100 | |||
90 | send -- "ls -l /run/firejail/mnt/seccomp | grep -c seccomp\r" | 90 | send -- "ls -l /run/firejail/mnt/seccomp | grep -c seccomp\r" |
91 | expect { | 91 | expect { |
92 | timeout {puts "TESTING ERROR 18\n";exit} | 92 | timeout {puts "TESTING ERROR 18\n";exit} |
93 | "8" | 93 | "10" |
94 | } | 94 | } |
95 | send -- "exit\r" | 95 | send -- "exit\r" |
96 | sleep 1 | 96 | sleep 1 |