diff options
author | netblue30 <netblue30@yahoo.com> | 2016-07-16 12:58:09 -0400 |
---|---|---|
committer | netblue30 <netblue30@yahoo.com> | 2016-07-16 12:58:09 -0400 |
commit | 14ad07435d339b290e284995c1d0349f4434a371 (patch) | |
tree | e8e1be18558d9f5bf0a08c138fa42d6689fc0ae0 | |
parent | Merge pull request #634 from Fred-Barclay/pidgin (diff) | |
download | firejail-14ad07435d339b290e284995c1d0349f4434a371.tar.gz firejail-14ad07435d339b290e284995c1d0349f4434a371.tar.zst firejail-14ad07435d339b290e284995c1d0349f4434a371.zip |
testing
-rw-r--r-- | src/faudit/dbus.c | 1 | ||||
-rw-r--r-- | src/firejail/fs.c | 2 | ||||
-rwxr-xr-x | test/features/1.2.exp | 6 | ||||
-rwxr-xr-x | test/features/1.8.exp | 18 | ||||
-rwxr-xr-x | test/features/3.5.exp | 10 | ||||
-rwxr-xr-x | test/private_dir.exp | 2 | ||||
-rwxr-xr-x | test/private_dir_profile.exp | 2 | ||||
-rwxr-xr-x | test/test.sh | 3 |
8 files changed, 12 insertions, 32 deletions
diff --git a/src/faudit/dbus.c b/src/faudit/dbus.c index 979617001..996e013ed 100644 --- a/src/faudit/dbus.c +++ b/src/faudit/dbus.c | |||
@@ -67,6 +67,7 @@ void dbus_test(void) { | |||
67 | sockfile -= 13; | 67 | sockfile -= 13; |
68 | free(sockfile); | 68 | free(sockfile); |
69 | } | 69 | } |
70 | free(bus); | ||
70 | } | 71 | } |
71 | } | 72 | } |
72 | 73 | ||
diff --git a/src/firejail/fs.c b/src/firejail/fs.c index 4b2b91b17..d426636d8 100644 --- a/src/firejail/fs.c +++ b/src/firejail/fs.c | |||
@@ -1093,7 +1093,7 @@ void fs_chroot(const char *rootdir) { | |||
1093 | if (asprintf(&newx11, "%s/tmp/.X11-unix", rootdir) == -1) | 1093 | if (asprintf(&newx11, "%s/tmp/.X11-unix", rootdir) == -1) |
1094 | errExit("asprintf"); | 1094 | errExit("asprintf"); |
1095 | if (arg_debug) | 1095 | if (arg_debug) |
1096 | printf("Mounting /tmp/.X11-unix on %s\n", newdev); | 1096 | printf("Mounting /tmp/.X11-unix on %s\n", newx11); |
1097 | if (mount("/tmp/.X11-unix", newx11, NULL, MS_BIND|MS_REC, NULL) < 0) | 1097 | if (mount("/tmp/.X11-unix", newx11, NULL, MS_BIND|MS_REC, NULL) < 0) |
1098 | errExit("mounting /tmp/.X11-unix"); | 1098 | errExit("mounting /tmp/.X11-unix"); |
1099 | free(newx11); | 1099 | free(newx11); |
diff --git a/test/features/1.2.exp b/test/features/1.2.exp index 6f7cae888..685acf737 100755 --- a/test/features/1.2.exp +++ b/test/features/1.2.exp | |||
@@ -34,7 +34,7 @@ expect { | |||
34 | } | 34 | } |
35 | expect { | 35 | expect { |
36 | timeout {puts "TESTING ERROR 1.4\n";exit} | 36 | timeout {puts "TESTING ERROR 1.4\n";exit} |
37 | "proc /proc/sysrq-trigger proc" | 37 | "/proc/sysrq-trigger" |
38 | } | 38 | } |
39 | #expect { | 39 | #expect { |
40 | # timeout {puts "TESTING ERROR 1.5\n";exit} | 40 | # timeout {puts "TESTING ERROR 1.5\n";exit} |
@@ -42,11 +42,11 @@ expect { | |||
42 | #} | 42 | #} |
43 | expect { | 43 | expect { |
44 | timeout {puts "TESTING ERROR 1.6\n";exit} | 44 | timeout {puts "TESTING ERROR 1.6\n";exit} |
45 | "proc /proc/irq proc" | 45 | "/proc/irq" |
46 | } | 46 | } |
47 | expect { | 47 | expect { |
48 | timeout {puts "TESTING ERROR 1.7\n";exit} | 48 | timeout {puts "TESTING ERROR 1.7\n";exit} |
49 | "proc /proc/bus proc" | 49 | "/proc/bus" |
50 | } | 50 | } |
51 | after 100 | 51 | after 100 |
52 | send -- "exit\r" | 52 | send -- "exit\r" |
diff --git a/test/features/1.8.exp b/test/features/1.8.exp index 493a87328..4c6d3f3dc 100755 --- a/test/features/1.8.exp +++ b/test/features/1.8.exp | |||
@@ -20,12 +20,6 @@ expect { | |||
20 | } | 20 | } |
21 | sleep 1 | 21 | sleep 1 |
22 | 22 | ||
23 | send -- "ls /etc/firejail\r" | ||
24 | expect { | ||
25 | timeout {puts "TESTING ERROR 1\n";exit} | ||
26 | "Permission denied" | ||
27 | } | ||
28 | after 100 | ||
29 | send -- "ls ~/.config/firejail\r" | 23 | send -- "ls ~/.config/firejail\r" |
30 | expect { | 24 | expect { |
31 | timeout {puts "TESTING ERROR 1.1\n";exit} | 25 | timeout {puts "TESTING ERROR 1.1\n";exit} |
@@ -77,12 +71,6 @@ if { $overlay == "overlay" } { | |||
77 | "Child process initialized" {puts "normal system\n"} | 71 | "Child process initialized" {puts "normal system\n"} |
78 | } | 72 | } |
79 | sleep 1 | 73 | sleep 1 |
80 | send -- "ls /etc/firejail\r" | ||
81 | expect { | ||
82 | timeout {puts "TESTING ERROR 3\n";exit} | ||
83 | "Permission denied" | ||
84 | } | ||
85 | after 100 | ||
86 | send -- "ls ~/.config/firejail\r" | 74 | send -- "ls ~/.config/firejail\r" |
87 | expect { | 75 | expect { |
88 | timeout {puts "TESTING ERROR 3.1\n";exit} | 76 | timeout {puts "TESTING ERROR 3.1\n";exit} |
@@ -134,12 +122,6 @@ if { $chroot == "chroot" } { | |||
134 | "Child process initialized" | 122 | "Child process initialized" |
135 | } | 123 | } |
136 | sleep 1 | 124 | sleep 1 |
137 | send -- "ls /etc/firejail\r" | ||
138 | expect { | ||
139 | timeout {puts "TESTING ERROR 5\n";exit} | ||
140 | "Permission denied" | ||
141 | } | ||
142 | after 100 | ||
143 | send -- "ls ~/.config/firejail\r" | 125 | send -- "ls ~/.config/firejail\r" |
144 | expect { | 126 | expect { |
145 | timeout {puts "TESTING ERROR 5.1\n";exit} | 127 | timeout {puts "TESTING ERROR 5.1\n";exit} |
diff --git a/test/features/3.5.exp b/test/features/3.5.exp index aed5fe836..f4b544b3d 100755 --- a/test/features/3.5.exp +++ b/test/features/3.5.exp | |||
@@ -22,8 +22,8 @@ sleep 1 | |||
22 | send -- "ls -l /dev | wc -l\r" | 22 | send -- "ls -l /dev | wc -l\r" |
23 | expect { | 23 | expect { |
24 | timeout {puts "TESTING ERROR 1.1\n";exit} | 24 | timeout {puts "TESTING ERROR 1.1\n";exit} |
25 | "12" { puts "Debian\n"} | 25 | "13" { puts "Debian\n"} |
26 | "11" { puts "Centos\n"} | 26 | "12" { puts "Centos\n"} |
27 | } | 27 | } |
28 | 28 | ||
29 | after 100 | 29 | after 100 |
@@ -45,8 +45,8 @@ if { $overlay == "overlay" } { | |||
45 | send -- "ls -l /dev | wc -l\r" | 45 | send -- "ls -l /dev | wc -l\r" |
46 | expect { | 46 | expect { |
47 | timeout {puts "TESTING ERROR 3.1\n";exit} | 47 | timeout {puts "TESTING ERROR 3.1\n";exit} |
48 | "12" { puts "Debian\n"} | 48 | "13" { puts "Debian\n"} |
49 | "11" { puts "Centos\n"} | 49 | "12" { puts "Centos\n"} |
50 | } | 50 | } |
51 | 51 | ||
52 | after 100 | 52 | after 100 |
@@ -68,7 +68,7 @@ if { $chroot == "chroot" } { | |||
68 | send -- "ls -l /dev | wc -l\r" | 68 | send -- "ls -l /dev | wc -l\r" |
69 | expect { | 69 | expect { |
70 | timeout {puts "TESTING ERROR 5.1\n";exit} | 70 | timeout {puts "TESTING ERROR 5.1\n";exit} |
71 | "11" | 71 | "12" |
72 | } | 72 | } |
73 | 73 | ||
74 | after 100 | 74 | after 100 |
diff --git a/test/private_dir.exp b/test/private_dir.exp index 9dfb2ea9f..a4beeba27 100755 --- a/test/private_dir.exp +++ b/test/private_dir.exp | |||
@@ -42,7 +42,7 @@ expect { | |||
42 | send -- "ls -al | wc -l;pwd\r" | 42 | send -- "ls -al | wc -l;pwd\r" |
43 | expect { | 43 | expect { |
44 | timeout {puts "TESTING ERROR 1\n";exit} | 44 | timeout {puts "TESTING ERROR 1\n";exit} |
45 | "7" {puts "normal system\n";} | 45 | "6" {puts "normal system\n";} |
46 | "5" {puts "OpenSUSE\n";} | 46 | "5" {puts "OpenSUSE\n";} |
47 | } | 47 | } |
48 | expect { | 48 | expect { |
diff --git a/test/private_dir_profile.exp b/test/private_dir_profile.exp index 5b38ad0bb..8d1c74444 100755 --- a/test/private_dir_profile.exp +++ b/test/private_dir_profile.exp | |||
@@ -42,7 +42,7 @@ expect { | |||
42 | send -- "ls -al | wc -l;pwd\r" | 42 | send -- "ls -al | wc -l;pwd\r" |
43 | expect { | 43 | expect { |
44 | timeout {puts "TESTING ERROR 1\n";exit} | 44 | timeout {puts "TESTING ERROR 1\n";exit} |
45 | "7" {puts "normal system\n";} | 45 | "6" {puts "normal system\n";} |
46 | "5" {puts "OpenSUSE\n";} | 46 | "5" {puts "OpenSUSE\n";} |
47 | } | 47 | } |
48 | expect { | 48 | expect { |
diff --git a/test/test.sh b/test/test.sh index 71e2c6720..4b7d5bb6d 100755 --- a/test/test.sh +++ b/test/test.sh | |||
@@ -62,9 +62,6 @@ echo "TESTING: overlayfs (fs_overlay.exp)" | |||
62 | echo "TESTING: login SSH (login_ssh.exp)" | 62 | echo "TESTING: login SSH (login_ssh.exp)" |
63 | ./login_ssh.exp | 63 | ./login_ssh.exp |
64 | 64 | ||
65 | echo "TESTING: DNS (dns.exp)" | ||
66 | ./dns.exp | ||
67 | |||
68 | echo "TESTING: firemon --arp (firemon-arp.exp)" | 65 | echo "TESTING: firemon --arp (firemon-arp.exp)" |
69 | ./firemon-arp.exp | 66 | ./firemon-arp.exp |
70 | 67 | ||