diff options
author | netblue30 <netblue30@yahoo.com> | 2019-06-04 13:45:20 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2019-06-04 13:45:20 -0400 |
commit | fee37dc216299af20f59452a2b3f8aba35d012b7 (patch) | |
tree | 9677c21578e5764bc2ef95446dd1c105e83229a5 | |
parent | merge: shutdown option: give sandbox time to terminate;shutdown option: paran... (diff) | |
download | firejail-fee37dc216299af20f59452a2b3f8aba35d012b7.tar.gz firejail-fee37dc216299af20f59452a2b3f8aba35d012b7.tar.zst firejail-fee37dc216299af20f59452a2b3f8aba35d012b7.zip |
merge: seccomp fixes
-rw-r--r-- | src/libpostexecseccomp/libpostexecseccomp.h | 2 | ||||
-rwxr-xr-x | test/filters/seccomp-debug.exp | 48 | ||||
-rwxr-xr-x | test/filters/seccomp-join.exp | 46 | ||||
-rwxr-xr-x | test/filters/seccomp-run-files.exp | 40 |
4 files changed, 68 insertions, 68 deletions
diff --git a/src/libpostexecseccomp/libpostexecseccomp.h b/src/libpostexecseccomp/libpostexecseccomp.h index 52d3128c9..f32040135 100644 --- a/src/libpostexecseccomp/libpostexecseccomp.h +++ b/src/libpostexecseccomp/libpostexecseccomp.h | |||
@@ -20,6 +20,6 @@ | |||
20 | #ifndef LIBPOSTEXECSECCOMP_H | 20 | #ifndef LIBPOSTEXECSECCOMP_H |
21 | #define LIBPOSTEXECSECCOMP_H | 21 | #define LIBPOSTEXECSECCOMP_H |
22 | 22 | ||
23 | #define RUN_SECCOMP_POSTEXEC "/run/firejail/mnt/seccomp.postexec" | 23 | #define RUN_SECCOMP_POSTEXEC "/run/firejail/mnt/seccomp/seccomp.postexec" |
24 | 24 | ||
25 | #endif | 25 | #endif |
diff --git a/test/filters/seccomp-debug.exp b/test/filters/seccomp-debug.exp index cceeb7041..dc4bf34f2 100755 --- a/test/filters/seccomp-debug.exp +++ b/test/filters/seccomp-debug.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
@@ -13,7 +13,7 @@ after 100 | |||
13 | send -- "firejail --debug sleep 1; echo done\r" | 13 | send -- "firejail --debug sleep 1; echo done\r" |
14 | expect { | 14 | expect { |
15 | timeout {puts "TESTING ERROR 0\n";exit} | 15 | timeout {puts "TESTING ERROR 0\n";exit} |
16 | "seccomp entries in /run/firejail/mnt/seccomp" | 16 | "seccomp entries in /run/firejail/mnt/seccomp/seccomp" |
17 | } | 17 | } |
18 | expect { | 18 | expect { |
19 | timeout {puts "TESTING ERROR 2\n";exit} | 19 | timeout {puts "TESTING ERROR 2\n";exit} |
@@ -38,15 +38,15 @@ expect { | |||
38 | } | 38 | } |
39 | expect { | 39 | expect { |
40 | timeout {puts "TESTING ERROR 6\n";exit} | 40 | timeout {puts "TESTING ERROR 6\n";exit} |
41 | "Installing /run/firejail/mnt/seccomp seccomp filter" | 41 | "Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" |
42 | } | 42 | } |
43 | expect { | 43 | expect { |
44 | timeout {puts "TESTING ERROR 7\n";exit} | 44 | timeout {puts "TESTING ERROR 7\n";exit} |
45 | "Installing /run/firejail/mnt/seccomp.32 seccomp filter" | 45 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" |
46 | } | 46 | } |
47 | expect { | 47 | expect { |
48 | timeout {puts "TESTING ERROR 8\n";exit} | 48 | timeout {puts "TESTING ERROR 8\n";exit} |
49 | "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" | 49 | "Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" |
50 | } | 50 | } |
51 | expect { | 51 | expect { |
52 | timeout {puts "TESTING ERROR 9\n";exit} | 52 | timeout {puts "TESTING ERROR 9\n";exit} |
@@ -58,15 +58,15 @@ after 100 | |||
58 | send -- "firejail --debug --ignore=seccomp sleep 1; echo done\r" | 58 | send -- "firejail --debug --ignore=seccomp sleep 1; echo done\r" |
59 | expect { | 59 | expect { |
60 | timeout {puts "TESTING ERROR 10\n";exit} | 60 | timeout {puts "TESTING ERROR 10\n";exit} |
61 | "Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 11\n";exit} | 61 | "Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" {puts "TESTING ERROR 11\n";exit} |
62 | "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 12\n";exit} | 62 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 12\n";exit} |
63 | "Child process initialized" | 63 | "Child process initialized" |
64 | } | 64 | } |
65 | expect { | 65 | expect { |
66 | timeout {puts "TESTING ERROR 13\n";exit} | 66 | timeout {puts "TESTING ERROR 13\n";exit} |
67 | "Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 14\n";exit} | 67 | "Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" {puts "TESTING ERROR 14\n";exit} |
68 | "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 15\n";exit} | 68 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 15\n";exit} |
69 | "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" | 69 | "Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" |
70 | } | 70 | } |
71 | expect { | 71 | expect { |
72 | timeout {puts "TESTING ERROR 16\n";exit} | 72 | timeout {puts "TESTING ERROR 16\n";exit} |
@@ -78,18 +78,18 @@ after 100 | |||
78 | send -- "firejail --debug --ignore=protocol sleep 1; echo done\r" | 78 | send -- "firejail --debug --ignore=protocol sleep 1; echo done\r" |
79 | expect { | 79 | expect { |
80 | timeout {puts "TESTING ERROR 17\n";exit} | 80 | timeout {puts "TESTING ERROR 17\n";exit} |
81 | "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" {puts "TESTING ERROR 18\n";exit} | 81 | "Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" {puts "TESTING ERROR 18\n";exit} |
82 | "Child process initialized" | 82 | "Child process initialized" |
83 | } | 83 | } |
84 | expect { | 84 | expect { |
85 | timeout {puts "TESTING ERROR 19\n";exit} | 85 | timeout {puts "TESTING ERROR 19\n";exit} |
86 | "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" {puts "TESTING ERROR 20\n";exit} | 86 | "Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" {puts "TESTING ERROR 20\n";exit} |
87 | "Installing /run/firejail/mnt/seccomp seccomp filter" | 87 | "Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" |
88 | } | 88 | } |
89 | expect { | 89 | expect { |
90 | timeout {puts "TESTING ERROR 21\n";exit} | 90 | timeout {puts "TESTING ERROR 21\n";exit} |
91 | "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" {puts "TESTING ERROR 22\n";exit} | 91 | "Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" {puts "TESTING ERROR 22\n";exit} |
92 | "Installing /run/firejail/mnt/seccomp.32 seccomp filter" | 92 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" |
93 | } | 93 | } |
94 | expect { | 94 | expect { |
95 | timeout {puts "TESTING ERROR 23\n";exit} | 95 | timeout {puts "TESTING ERROR 23\n";exit} |
@@ -105,7 +105,7 @@ expect { | |||
105 | } | 105 | } |
106 | expect { | 106 | expect { |
107 | timeout {puts "TESTING ERROR 25\n";exit} | 107 | timeout {puts "TESTING ERROR 25\n";exit} |
108 | "Installing /run/firejail/mnt/seccomp.mdwx seccomp filter" | 108 | "Installing /run/firejail/mnt/seccomp/seccomp.mdwx seccomp filter" |
109 | } | 109 | } |
110 | expect { | 110 | expect { |
111 | timeout {puts "TESTING ERROR 26\n";exit} | 111 | timeout {puts "TESTING ERROR 26\n";exit} |
@@ -117,18 +117,18 @@ expect { | |||
117 | send -- "firejail --debug --seccomp.block-secondary sleep 1; echo done\r" | 117 | send -- "firejail --debug --seccomp.block-secondary sleep 1; echo done\r" |
118 | expect { | 118 | expect { |
119 | timeout {puts "TESTING ERROR 27\n";exit} | 119 | timeout {puts "TESTING ERROR 27\n";exit} |
120 | "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 28\n";exit} | 120 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 28\n";exit} |
121 | "Child process initialized" | 121 | "Child process initialized" |
122 | } | 122 | } |
123 | expect { | 123 | expect { |
124 | timeout {puts "TESTING ERROR 29\n";exit} | 124 | timeout {puts "TESTING ERROR 29\n";exit} |
125 | "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 30\n";exit} | 125 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 30\n";exit} |
126 | "Installing /run/firejail/mnt/seccomp seccomp filter" | 126 | "Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" |
127 | } | 127 | } |
128 | expect { | 128 | expect { |
129 | timeout {puts "TESTING ERROR 31\n";exit} | 129 | timeout {puts "TESTING ERROR 31\n";exit} |
130 | "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 32\n";exit} | 130 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 32\n";exit} |
131 | "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" | 131 | "Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" |
132 | } | 132 | } |
133 | expect { | 133 | expect { |
134 | timeout {puts "TESTING ERROR 33\n";exit} | 134 | timeout {puts "TESTING ERROR 33\n";exit} |
@@ -140,13 +140,13 @@ after 100 | |||
140 | send -- "firejail --debug --profile=block-secondary.profile sleep 1; echo done\r" | 140 | send -- "firejail --debug --profile=block-secondary.profile sleep 1; echo done\r" |
141 | expect { | 141 | expect { |
142 | timeout {puts "TESTING ERROR 33\n";exit} | 142 | timeout {puts "TESTING ERROR 33\n";exit} |
143 | "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 34\n";exit} | 143 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 34\n";exit} |
144 | "Child process initialized" | 144 | "Child process initialized" |
145 | } | 145 | } |
146 | expect { | 146 | expect { |
147 | timeout {puts "TESTING ERROR 35\n";exit} | 147 | timeout {puts "TESTING ERROR 35\n";exit} |
148 | "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 35\n";exit} | 148 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 35\n";exit} |
149 | "Installing /run/firejail/mnt/seccomp seccomp filter" | 149 | "Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" |
150 | } | 150 | } |
151 | expect { | 151 | expect { |
152 | timeout {puts "TESTING ERROR 37\n";exit} | 152 | timeout {puts "TESTING ERROR 37\n";exit} |
diff --git a/test/filters/seccomp-join.exp b/test/filters/seccomp-join.exp index 7a869b85f..f1d57238b 100755 --- a/test/filters/seccomp-join.exp +++ b/test/filters/seccomp-join.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
@@ -20,15 +20,15 @@ set spawn_id $id1 | |||
20 | send -- "firejail --name=jointesting --debug\r" | 20 | send -- "firejail --name=jointesting --debug\r" |
21 | expect { | 21 | expect { |
22 | timeout {puts "TESTING ERROR 0\n";exit} | 22 | timeout {puts "TESTING ERROR 0\n";exit} |
23 | "Installing /run/firejail/mnt/seccomp seccomp filter" | 23 | "Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" |
24 | } | 24 | } |
25 | expect { | 25 | expect { |
26 | timeout {puts "TESTING ERROR 1\n";exit} | 26 | timeout {puts "TESTING ERROR 1\n";exit} |
27 | "Installing /run/firejail/mnt/seccomp.32 seccomp filter" | 27 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" |
28 | } | 28 | } |
29 | expect { | 29 | expect { |
30 | timeout {puts "TESTING ERROR 2\n";exit} | 30 | timeout {puts "TESTING ERROR 2\n";exit} |
31 | "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" | 31 | "Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" |
32 | } | 32 | } |
33 | sleep 1 | 33 | sleep 1 |
34 | 34 | ||
@@ -37,15 +37,15 @@ set spawn_id $id2 | |||
37 | send -- "firejail --debug --join=jointesting\r" | 37 | send -- "firejail --debug --join=jointesting\r" |
38 | expect { | 38 | expect { |
39 | timeout {puts "TESTING ERROR 3\n";exit} | 39 | timeout {puts "TESTING ERROR 3\n";exit} |
40 | "Installing /run/firejail/mnt/seccomp seccomp filter" | 40 | "Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" |
41 | } | 41 | } |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 4\n";exit} | 43 | timeout {puts "TESTING ERROR 4\n";exit} |
44 | "Installing /run/firejail/mnt/seccomp.32 seccomp filter" | 44 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" |
45 | } | 45 | } |
46 | expect { | 46 | expect { |
47 | timeout {puts "TESTING ERROR 5\n";exit} | 47 | timeout {puts "TESTING ERROR 5\n";exit} |
48 | "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" | 48 | "Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" |
49 | } | 49 | } |
50 | sleep 1 | 50 | sleep 1 |
51 | 51 | ||
@@ -64,16 +64,16 @@ set spawn_id $id1 | |||
64 | send -- "firejail --name=jointesting --seccomp.block-secondary --debug\r" | 64 | send -- "firejail --name=jointesting --seccomp.block-secondary --debug\r" |
65 | expect { | 65 | expect { |
66 | timeout {puts "TESTING ERROR 10\n";exit} | 66 | timeout {puts "TESTING ERROR 10\n";exit} |
67 | "Installing /run/firejail/mnt/seccomp seccomp filter" | 67 | "Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" |
68 | } | 68 | } |
69 | expect { | 69 | expect { |
70 | timeout {puts "TESTING ERROR 11\n";exit} | 70 | timeout {puts "TESTING ERROR 11\n";exit} |
71 | "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 12\n";exit} | 71 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 12\n";exit} |
72 | "Installing /run/firejail/mnt/seccomp.block_secondary seccomp filter" | 72 | "Installing /run/firejail/mnt/seccomp/seccomp.block_secondary seccomp filter" |
73 | } | 73 | } |
74 | expect { | 74 | expect { |
75 | timeout {puts "TESTING ERROR 13\n";exit} | 75 | timeout {puts "TESTING ERROR 13\n";exit} |
76 | "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" | 76 | "Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" |
77 | } | 77 | } |
78 | sleep 1 | 78 | sleep 1 |
79 | 79 | ||
@@ -81,15 +81,15 @@ set spawn_id $id2 | |||
81 | send -- "firejail --debug --join=jointesting\r" | 81 | send -- "firejail --debug --join=jointesting\r" |
82 | expect { | 82 | expect { |
83 | timeout {puts "TESTING ERROR 14\n";exit} | 83 | timeout {puts "TESTING ERROR 14\n";exit} |
84 | "Installing /run/firejail/mnt/seccomp seccomp filter" | 84 | "Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" |
85 | } | 85 | } |
86 | expect { | 86 | expect { |
87 | timeout {puts "TESTING ERROR 15\n";exit} | 87 | timeout {puts "TESTING ERROR 15\n";exit} |
88 | "Installing /run/firejail/mnt/seccomp.block_secondary seccomp filter" | 88 | "Installing /run/firejail/mnt/seccomp/seccomp.block_secondary seccomp filter" |
89 | } | 89 | } |
90 | expect { | 90 | expect { |
91 | timeout {puts "TESTING ERROR 16\n";exit} | 91 | timeout {puts "TESTING ERROR 16\n";exit} |
92 | "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" | 92 | "Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" |
93 | } | 93 | } |
94 | sleep 1 | 94 | sleep 1 |
95 | 95 | ||
@@ -106,7 +106,7 @@ set spawn_id $id1 | |||
106 | send -- "firejail --name=jointesting --noprofile --protocol=inet --debug\r" | 106 | send -- "firejail --name=jointesting --noprofile --protocol=inet --debug\r" |
107 | expect { | 107 | expect { |
108 | timeout {puts "TESTING ERROR 22\n";exit} | 108 | timeout {puts "TESTING ERROR 22\n";exit} |
109 | "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" | 109 | "Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" |
110 | } | 110 | } |
111 | sleep 1 | 111 | sleep 1 |
112 | 112 | ||
@@ -115,9 +115,9 @@ set spawn_id $id2 | |||
115 | send -- "firejail --debug --join=jointesting\r" | 115 | send -- "firejail --debug --join=jointesting\r" |
116 | expect { | 116 | expect { |
117 | timeout {puts "TESTING ERROR 23\n";exit} | 117 | timeout {puts "TESTING ERROR 23\n";exit} |
118 | "Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 24\n";exit} | 118 | "Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" {puts "TESTING ERROR 24\n";exit} |
119 | "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 25\n";exit} | 119 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 25\n";exit} |
120 | "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" | 120 | "Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" |
121 | } | 121 | } |
122 | sleep 1 | 122 | sleep 1 |
123 | 123 | ||
@@ -134,7 +134,7 @@ set spawn_id $id1 | |||
134 | send -- "firejail --name=jointesting --noprofile --memory-deny-write-execute --debug\r" | 134 | send -- "firejail --name=jointesting --noprofile --memory-deny-write-execute --debug\r" |
135 | expect { | 135 | expect { |
136 | timeout {puts "TESTING ERROR 32\n";exit} | 136 | timeout {puts "TESTING ERROR 32\n";exit} |
137 | "Installing /run/firejail/mnt/seccomp.mdwx seccomp filter" | 137 | "Installing /run/firejail/mnt/seccomp/seccomp.mdwx seccomp filter" |
138 | } | 138 | } |
139 | sleep 1 | 139 | sleep 1 |
140 | 140 | ||
@@ -143,10 +143,10 @@ set spawn_id $id2 | |||
143 | send -- "firejail --debug --join=jointesting\r" | 143 | send -- "firejail --debug --join=jointesting\r" |
144 | expect { | 144 | expect { |
145 | timeout {puts "TESTING ERROR 33\n";exit} | 145 | timeout {puts "TESTING ERROR 33\n";exit} |
146 | "Installing /run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 34\n";exit} | 146 | "Installing /run/firejail/mnt/seccomp/seccomp seccomp filter" {puts "TESTING ERROR 34\n";exit} |
147 | "Installing /run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 35\n";exit} | 147 | "Installing /run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 35\n";exit} |
148 | "Installing /run/firejail/mnt/seccomp.protocol seccomp filter" {puts "TESTING ERROR 36\n";exit} | 148 | "Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" {puts "TESTING ERROR 36\n";exit} |
149 | "Installing /run/firejail/mnt/seccomp.mdwx seccomp filter" | 149 | "Installing /run/firejail/mnt/seccomp/seccomp.mdwx seccomp filter" |
150 | } | 150 | } |
151 | sleep 1 | 151 | sleep 1 |
152 | 152 | ||
diff --git a/test/filters/seccomp-run-files.exp b/test/filters/seccomp-run-files.exp index 7a1345902..3f4e506af 100755 --- a/test/filters/seccomp-run-files.exp +++ b/test/filters/seccomp-run-files.exp | |||
@@ -1,6 +1,6 @@ | |||
1 | #!/usr/bin/expect -f | 1 | #!/usr/bin/expect -f |
2 | # This file is part of Firejail project | 2 | # This file is part of Firejail project |
3 | # Copyright (C) 2014-2018 Firejail Authors | 3 | # Copyright (C) 2014-2019 Firejail Authors |
4 | # License GPL v2 | 4 | # License GPL v2 |
5 | 5 | ||
6 | set timeout 10 | 6 | set timeout 10 |
@@ -10,18 +10,18 @@ match_max 100000 | |||
10 | send -- "firejail --debug\r" | 10 | send -- "firejail --debug\r" |
11 | expect { | 11 | expect { |
12 | timeout {puts "TESTING ERROR 0\n";exit} | 12 | timeout {puts "TESTING ERROR 0\n";exit} |
13 | "/run/firejail/mnt/seccomp seccomp filter" | 13 | "/run/firejail/mnt/seccomp/seccomp seccomp filter" |
14 | } | 14 | } |
15 | expect { | 15 | expect { |
16 | timeout {puts "TESTING ERROR 1\n";exit} | 16 | timeout {puts "TESTING ERROR 1\n";exit} |
17 | "/run/firejail/mnt/seccomp.32 seccomp filter" | 17 | "/run/firejail/mnt/seccomp/seccomp.32 seccomp filter" |
18 | } | 18 | } |
19 | expect { | 19 | expect { |
20 | timeout {puts "TESTING ERROR 2\n";exit} | 20 | timeout {puts "TESTING ERROR 2\n";exit} |
21 | "/run/firejail/mnt/seccomp.protocol seccomp filter" | 21 | "/run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" |
22 | } | 22 | } |
23 | after 100 | 23 | after 100 |
24 | send -- "ls -l /run/firejail/mnt | 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 | "5" | 27 | "5" |
@@ -32,16 +32,16 @@ sleep 1 | |||
32 | send -- "firejail --ignore=seccomp --debug\r" | 32 | send -- "firejail --ignore=seccomp --debug\r" |
33 | expect { | 33 | expect { |
34 | timeout {puts "TESTING ERROR 4\n";exit} | 34 | timeout {puts "TESTING ERROR 4\n";exit} |
35 | "/run/firejail/mnt/seccomp seccomp filter" {puts "TESTING ERROR 5\n";exit} | 35 | "/run/firejail/mnt/seccomp/seccomp seccomp filter" {puts "TESTING ERROR 5\n";exit} |
36 | "/run/firejail/mnt/seccomp.32 seccomp filter" {puts "TESTING ERROR 6\n";exit} | 36 | "/run/firejail/mnt/seccomp/seccomp.32 seccomp filter" {puts "TESTING ERROR 6\n";exit} |
37 | "/run/firejail/mnt/seccomp.64 seccomp filter" {puts "TESTING ERROR 7\n";exit} | 37 | "/run/firejail/mnt/seccomp/seccomp.64 seccomp filter" {puts "TESTING ERROR 7\n";exit} |
38 | "/run/firejail/mnt/seccomp.protocol seccomp filter" | 38 | "Installing /run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" |
39 | } | 39 | } |
40 | after 100 | 40 | after 100 |
41 | send -- "ls -l /run/firejail/mnt | grep -c seccomp\r" | 41 | send -- "ls -l /run/firejail/mnt/seccomp | grep -c seccomp\r" |
42 | expect { | 42 | expect { |
43 | timeout {puts "TESTING ERROR 8\n";exit} | 43 | timeout {puts "TESTING ERROR 8\n";exit} |
44 | "2" | 44 | "3" |
45 | } | 45 | } |
46 | send -- "exit\r" | 46 | send -- "exit\r" |
47 | sleep 1 | 47 | sleep 1 |
@@ -49,22 +49,22 @@ sleep 1 | |||
49 | send -- "firejail --ignore=protocol --debug\r" | 49 | send -- "firejail --ignore=protocol --debug\r" |
50 | expect { | 50 | expect { |
51 | timeout {puts "TESTING ERROR 9\n";exit} | 51 | timeout {puts "TESTING ERROR 9\n";exit} |
52 | "/run/firejail/mnt/seccomp seccomp filter" | 52 | "/run/firejail/mnt/seccomp/seccomp seccomp filter" |
53 | } | 53 | } |
54 | expect { | 54 | expect { |
55 | timeout {puts "TESTING ERROR 10\n";exit} | 55 | timeout {puts "TESTING ERROR 10\n";exit} |
56 | "/run/firejail/mnt/seccomp.32 seccomp filter" | 56 | "/run/firejail/mnt/seccomp/seccomp.32 seccomp filter" |
57 | } | 57 | } |
58 | expect { | 58 | expect { |
59 | timeout {puts "TESTING ERROR 11\n";exit} | 59 | timeout {puts "TESTING ERROR 11\n";exit} |
60 | "/run/firejail/mnt/seccomp.protocol seccomp filter" {puts "TESTING ERROR 12\n";exit} | 60 | "/run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" {puts "TESTING ERROR 12\n";exit} |
61 | "monitoring" | 61 | "monitoring" |
62 | } | 62 | } |
63 | after 100 | 63 | after 100 |
64 | send -- "ls -l /run/firejail/mnt | grep -c seccomp\r" | 64 | send -- "ls -l /run/firejail/mnt | grep -c seccomp\r" |
65 | expect { | 65 | expect { |
66 | timeout {puts "TESTING ERROR 13\n";exit} | 66 | timeout {puts "TESTING ERROR 13\n";exit} |
67 | "3" | 67 | "4" |
68 | } | 68 | } |
69 | send -- "exit\r" | 69 | send -- "exit\r" |
70 | sleep 1 | 70 | sleep 1 |
@@ -72,22 +72,22 @@ sleep 1 | |||
72 | send -- "firejail --memory-deny-write-execute --debug\r" | 72 | send -- "firejail --memory-deny-write-execute --debug\r" |
73 | expect { | 73 | expect { |
74 | timeout {puts "TESTING ERROR 14\n";exit} | 74 | timeout {puts "TESTING ERROR 14\n";exit} |
75 | "/run/firejail/mnt/seccomp.mdwx seccomp filter" | 75 | "/run/firejail/mnt/seccomp/seccomp.mdwx seccomp filter" |
76 | } | 76 | } |
77 | expect { | 77 | expect { |
78 | timeout {puts "TESTING ERROR 15\n";exit} | 78 | timeout {puts "TESTING ERROR 15\n";exit} |
79 | "/run/firejail/mnt/seccomp seccomp filter" | 79 | "/run/firejail/mnt/seccomp/seccomp seccomp filter" |
80 | } | 80 | } |
81 | expect { | 81 | expect { |
82 | timeout {puts "TESTING ERROR 16\n";exit} | 82 | timeout {puts "TESTING ERROR 16\n";exit} |
83 | "/run/firejail/mnt/seccomp.32 seccomp filter" | 83 | "/run/firejail/mnt/seccomp/seccomp.32 seccomp filter" |
84 | } | 84 | } |
85 | expect { | 85 | expect { |
86 | timeout {puts "TESTING ERROR 17\n";exit} | 86 | timeout {puts "TESTING ERROR 17\n";exit} |
87 | "/run/firejail/mnt/seccomp.protocol seccomp filter" | 87 | "/run/firejail/mnt/seccomp/seccomp.protocol seccomp filter" |
88 | } | 88 | } |
89 | after 100 | 89 | after 100 |
90 | send -- "ls -l /run/firejail/mnt | 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 | "6" | 93 | "6" |