aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2019-06-04 13:45:20 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2019-06-04 13:45:20 -0400
commitfee37dc216299af20f59452a2b3f8aba35d012b7 (patch)
tree9677c21578e5764bc2ef95446dd1c105e83229a5
parentmerge: shutdown option: give sandbox time to terminate;shutdown option: paran... (diff)
downloadfirejail-fee37dc216299af20f59452a2b3f8aba35d012b7.tar.gz
firejail-fee37dc216299af20f59452a2b3f8aba35d012b7.tar.zst
firejail-fee37dc216299af20f59452a2b3f8aba35d012b7.zip
merge: seccomp fixes
-rw-r--r--src/libpostexecseccomp/libpostexecseccomp.h2
-rwxr-xr-xtest/filters/seccomp-debug.exp48
-rwxr-xr-xtest/filters/seccomp-join.exp46
-rwxr-xr-xtest/filters/seccomp-run-files.exp40
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
6set timeout 10 6set timeout 10
@@ -13,7 +13,7 @@ after 100
13send -- "firejail --debug sleep 1; echo done\r" 13send -- "firejail --debug sleep 1; echo done\r"
14expect { 14expect {
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}
18expect { 18expect {
19 timeout {puts "TESTING ERROR 2\n";exit} 19 timeout {puts "TESTING ERROR 2\n";exit}
@@ -38,15 +38,15 @@ expect {
38} 38}
39expect { 39expect {
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}
43expect { 43expect {
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}
47expect { 47expect {
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}
51expect { 51expect {
52 timeout {puts "TESTING ERROR 9\n";exit} 52 timeout {puts "TESTING ERROR 9\n";exit}
@@ -58,15 +58,15 @@ after 100
58send -- "firejail --debug --ignore=seccomp sleep 1; echo done\r" 58send -- "firejail --debug --ignore=seccomp sleep 1; echo done\r"
59expect { 59expect {
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}
65expect { 65expect {
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}
71expect { 71expect {
72 timeout {puts "TESTING ERROR 16\n";exit} 72 timeout {puts "TESTING ERROR 16\n";exit}
@@ -78,18 +78,18 @@ after 100
78send -- "firejail --debug --ignore=protocol sleep 1; echo done\r" 78send -- "firejail --debug --ignore=protocol sleep 1; echo done\r"
79expect { 79expect {
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}
84expect { 84expect {
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}
89expect { 89expect {
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}
94expect { 94expect {
95 timeout {puts "TESTING ERROR 23\n";exit} 95 timeout {puts "TESTING ERROR 23\n";exit}
@@ -105,7 +105,7 @@ expect {
105} 105}
106expect { 106expect {
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}
110expect { 110expect {
111 timeout {puts "TESTING ERROR 26\n";exit} 111 timeout {puts "TESTING ERROR 26\n";exit}
@@ -117,18 +117,18 @@ expect {
117send -- "firejail --debug --seccomp.block-secondary sleep 1; echo done\r" 117send -- "firejail --debug --seccomp.block-secondary sleep 1; echo done\r"
118expect { 118expect {
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}
123expect { 123expect {
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}
128expect { 128expect {
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}
133expect { 133expect {
134 timeout {puts "TESTING ERROR 33\n";exit} 134 timeout {puts "TESTING ERROR 33\n";exit}
@@ -140,13 +140,13 @@ after 100
140send -- "firejail --debug --profile=block-secondary.profile sleep 1; echo done\r" 140send -- "firejail --debug --profile=block-secondary.profile sleep 1; echo done\r"
141expect { 141expect {
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}
146expect { 146expect {
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}
151expect { 151expect {
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
6set timeout 10 6set timeout 10
@@ -20,15 +20,15 @@ set spawn_id $id1
20send -- "firejail --name=jointesting --debug\r" 20send -- "firejail --name=jointesting --debug\r"
21expect { 21expect {
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}
25expect { 25expect {
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}
29expect { 29expect {
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}
33sleep 1 33sleep 1
34 34
@@ -37,15 +37,15 @@ set spawn_id $id2
37send -- "firejail --debug --join=jointesting\r" 37send -- "firejail --debug --join=jointesting\r"
38expect { 38expect {
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}
42expect { 42expect {
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}
46expect { 46expect {
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}
50sleep 1 50sleep 1
51 51
@@ -64,16 +64,16 @@ set spawn_id $id1
64send -- "firejail --name=jointesting --seccomp.block-secondary --debug\r" 64send -- "firejail --name=jointesting --seccomp.block-secondary --debug\r"
65expect { 65expect {
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}
69expect { 69expect {
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}
74expect { 74expect {
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}
78sleep 1 78sleep 1
79 79
@@ -81,15 +81,15 @@ set spawn_id $id2
81send -- "firejail --debug --join=jointesting\r" 81send -- "firejail --debug --join=jointesting\r"
82expect { 82expect {
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}
86expect { 86expect {
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}
90expect { 90expect {
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}
94sleep 1 94sleep 1
95 95
@@ -106,7 +106,7 @@ set spawn_id $id1
106send -- "firejail --name=jointesting --noprofile --protocol=inet --debug\r" 106send -- "firejail --name=jointesting --noprofile --protocol=inet --debug\r"
107expect { 107expect {
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}
111sleep 1 111sleep 1
112 112
@@ -115,9 +115,9 @@ set spawn_id $id2
115send -- "firejail --debug --join=jointesting\r" 115send -- "firejail --debug --join=jointesting\r"
116expect { 116expect {
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}
122sleep 1 122sleep 1
123 123
@@ -134,7 +134,7 @@ set spawn_id $id1
134send -- "firejail --name=jointesting --noprofile --memory-deny-write-execute --debug\r" 134send -- "firejail --name=jointesting --noprofile --memory-deny-write-execute --debug\r"
135expect { 135expect {
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}
139sleep 1 139sleep 1
140 140
@@ -143,10 +143,10 @@ set spawn_id $id2
143send -- "firejail --debug --join=jointesting\r" 143send -- "firejail --debug --join=jointesting\r"
144expect { 144expect {
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}
151sleep 1 151sleep 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
6set timeout 10 6set timeout 10
@@ -10,18 +10,18 @@ match_max 100000
10send -- "firejail --debug\r" 10send -- "firejail --debug\r"
11expect { 11expect {
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}
15expect { 15expect {
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}
19expect { 19expect {
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}
23after 100 23after 100
24send -- "ls -l /run/firejail/mnt | grep -c seccomp\r" 24send -- "ls -l /run/firejail/mnt/seccomp | grep -c seccomp\r"
25expect { 25expect {
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
32send -- "firejail --ignore=seccomp --debug\r" 32send -- "firejail --ignore=seccomp --debug\r"
33expect { 33expect {
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}
40after 100 40after 100
41send -- "ls -l /run/firejail/mnt | grep -c seccomp\r" 41send -- "ls -l /run/firejail/mnt/seccomp | grep -c seccomp\r"
42expect { 42expect {
43 timeout {puts "TESTING ERROR 8\n";exit} 43 timeout {puts "TESTING ERROR 8\n";exit}
44 "2" 44 "3"
45} 45}
46send -- "exit\r" 46send -- "exit\r"
47sleep 1 47sleep 1
@@ -49,22 +49,22 @@ sleep 1
49send -- "firejail --ignore=protocol --debug\r" 49send -- "firejail --ignore=protocol --debug\r"
50expect { 50expect {
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}
54expect { 54expect {
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}
58expect { 58expect {
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}
63after 100 63after 100
64send -- "ls -l /run/firejail/mnt | grep -c seccomp\r" 64send -- "ls -l /run/firejail/mnt | grep -c seccomp\r"
65expect { 65expect {
66 timeout {puts "TESTING ERROR 13\n";exit} 66 timeout {puts "TESTING ERROR 13\n";exit}
67 "3" 67 "4"
68} 68}
69send -- "exit\r" 69send -- "exit\r"
70sleep 1 70sleep 1
@@ -72,22 +72,22 @@ sleep 1
72send -- "firejail --memory-deny-write-execute --debug\r" 72send -- "firejail --memory-deny-write-execute --debug\r"
73expect { 73expect {
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}
77expect { 77expect {
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}
81expect { 81expect {
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}
85expect { 85expect {
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}
89after 100 89after 100
90send -- "ls -l /run/firejail/mnt | grep -c seccomp\r" 90send -- "ls -l /run/firejail/mnt/seccomp | grep -c seccomp\r"
91expect { 91expect {
92 timeout {puts "TESTING ERROR 18\n";exit} 92 timeout {puts "TESTING ERROR 18\n";exit}
93 "6" 93 "6"