12 files changed, 226 insertions, 1 deletions

diff --git a/test/environment/dns.exp b/test/environment/dns.exp
index 6ffb124cf..a6a7171eb 100755
--- a/test/environment/dns.exp
+++ b/test/environment/dns.exp
@@ -22,9 +22,33 @@ expect {
         timeout {puts "TESTING ERROR 1.2\n";exit}
         "53"
 }
-
 after 100
 
 send -- "rm index.html\r"
 after 100
+send -- "exit\r"
+sleep 1
+
+send -- "firejail --dns=8.8.4.4 --dns=8.8.8.8 --dns=4.2.2.1\r"
+expect {
+        timeout {puts "TESTING ERROR 2.1\n";exit}
+        "Child process initialized"
+}
+sleep 1
+
+send -- "cat /etc/resolv.conf\r"
+expect {
+        timeout {puts "TESTING ERROR 2.2\n";exit}
+        "nameserver 8.8.4.4"
+}
+expect {
+        timeout {puts "TESTING ERROR 2.3\n";exit}
+        "nameserver 8.8.8.8"
+}
+expect {
+        timeout {puts "TESTING ERROR 2.4\n";exit}
+        "nameserver 4.2.2.1"
+}
+after 100
+
 puts "\nall done\n"
diff --git a/test/environment/environment.sh b/test/environment/environment.sh
index 5c4d49331..2bb5a249e 100755
--- a/test/environment/environment.sh
+++ b/test/environment/environment.sh
@@ -6,6 +6,7 @@
 export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 
+
 echo "TESTING: DNS (test/environment/dns.exp)"
 ./dns.exp
 
@@ -85,3 +86,28 @@ else
         echo "TESTING SKIP: strace not found"
 fi
 
+# to install ibus:
+#       $ sudo apt-get install ibus-table-array30
+#       $ ibus-setup
+
+find ~/.config/ibus/bus | grep unix-0
+if [ "$?" -eq 0 ];
+then
+        echo "TESTING: ibus (test/environment/ibus.exp)"
+        ./ibus.exp
+else
+        echo "TESTING SKIP: ibus not configured"
+fi
+
+echo "TESTING: rlimit (test/rlimit/rlimit.exp)"
+./rlimit.exp
+
+echo "TESTING: rlimit profile (test/rlimit/rlimit-profile.exp)"
+./rlimit-profile.exp
+
+echo "TESTING: rlimit errors (test/rlimit/rlimit-bad.exp)"
+./rlimit-bad.exp
+
+echo "TESTING: rlimit errors profile (test/rlimit/rlimit-bad-profile.exp)"
+./rlimit-bad-profile.exp
+
diff --git a/test/environment/ibus.exp b/test/environment/ibus.exp
new file mode 100755
index 000000000..4344011a6
--- /dev/null
+++ b/test/environment/ibus.exp
@@ -0,0 +1,28 @@
+#!/usr/bin/expect -f
+
+set timeout 10
+cd /home
+spawn $env(SHELL)
+match_max 100000
+
+send -- "firejail\r"
+expect {
+        timeout {puts "TESTING ERROR 0\n";exit}
+        "Child process initialized"
+}
+after 100
+
+send -- "env | grep IBUS\r"
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "IBUS_ADDRESS"
+}
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "IBUS_DAEMON_PID"
+}
+after 100
+
+
+puts "\nall done\n"
+
diff --git a/test/environment/rlimit-bad-profile.exp b/test/environment/rlimit-bad-profile.exp
new file mode 100755
index 000000000..80693a4a0
--- /dev/null
+++ b/test/environment/rlimit-bad-profile.exp
@@ -0,0 +1,35 @@
+#!/usr/bin/expect -f
+
+set timeout 10
+spawn $env(SHELL)
+match_max 100000
+
+
+send -- "firejail --profile=rlimit-bad1.profile\r"
+expect {
+        timeout {puts "TESTING ERROR 4\n";exit}
+        "Invalid rlimit option"
+}
+after 100
+
+send -- "firejail --profile=rlimit-bad2.profile\r"
+expect {
+        timeout {puts "TESTING ERROR 5\n";exit}
+        "Invalid rlimit option"
+}
+after 100
+
+send -- "firejail --profile=rlimit-bad3.profile\r"
+expect {
+        timeout {puts "TESTING ERROR 6\n";exit}
+        "Invalid rlimit option"
+}
+after 100
+send -- "firejail --profile=rlimit-bad4.profile\r"
+expect {
+        timeout {puts "TESTING ERROR 7\n";exit}
+        "Invalid rlimit option"
+}
+after 100
+
+puts "\nall done\n"
diff --git a/test/environment/rlimit-bad.exp b/test/environment/rlimit-bad.exp
new file mode 100755
index 000000000..574e7e174
--- /dev/null
+++ b/test/environment/rlimit-bad.exp
@@ -0,0 +1,34 @@
+#!/usr/bin/expect -f
+
+set timeout 10
+spawn $env(SHELL)
+match_max 100000
+
+send -- "firejail --rlimit-fsize=-1024\r"
+expect {
+        timeout {puts "TESTING ERROR 0\n";exit}
+        "invalid rlimt fsize"
+}
+after 100
+
+send -- "firejail --rlimit-nofile=asdf\r"
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "invalid rlimt nofile"
+}
+after 100
+
+send -- "firejail --rlimit-nproc=100.23\r"
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "invalid rlimt nproc"
+}
+after 100
+send -- "firejail --rlimit-sigpending=2345-78\r"
+expect {
+        timeout {puts "TESTING ERROR 3\n";exit}
+        "invalid rlimt sigpending"
+}
+after 100
+
+puts "\nall done\n"
diff --git a/test/environment/rlimit-bad1.profile b/test/environment/rlimit-bad1.profile
new file mode 100644
index 000000000..b6d3340d8
--- /dev/null
+++ b/test/environment/rlimit-bad1.profile
@@ -0,0 +1 @@
+rlimit-fsize -1024
diff --git a/test/environment/rlimit-bad2.profile b/test/environment/rlimit-bad2.profile
new file mode 100644
index 000000000..ef3f243c6
--- /dev/null
+++ b/test/environment/rlimit-bad2.profile
@@ -0,0 +1 @@
+rlimit-nofile asdf
diff --git a/test/environment/rlimit-bad3.profile b/test/environment/rlimit-bad3.profile
new file mode 100644
index 000000000..af016a29f
--- /dev/null
+++ b/test/environment/rlimit-bad3.profile
@@ -0,0 +1 @@
+rlimit-nproc 100.23
diff --git a/test/environment/rlimit-bad4.profile b/test/environment/rlimit-bad4.profile
new file mode 100644
index 000000000..aabe3d008
--- /dev/null
+++ b/test/environment/rlimit-bad4.profile
@@ -0,0 +1 @@
+rlimit-sigpending 67asd56
\ No newline at end of file
diff --git a/test/environment/rlimit-profile.exp b/test/environment/rlimit-profile.exp
new file mode 100755
index 000000000..a9e54a405
--- /dev/null
+++ b/test/environment/rlimit-profile.exp
@@ -0,0 +1,33 @@
+#!/usr/bin/expect -f
+
+set timeout 10
+#cd /home
+spawn $env(SHELL)
+match_max 100000
+
+send -- "firejail --profile=rlimit.profile\r"
+expect {
+        timeout {puts "TESTING ERROR 0\n";exit}
+        "Child process initialized"
+}
+sleep 1
+
+send -- "cat /proc/self/limits\r"
+expect {
+        timeout {puts "TESTING ERROR 1.1\n";exit}
+        "Max file size             1024                 1024"
+}
+expect {
+        timeout {puts "TESTING ERROR 1.2\n";exit}
+        "Max processes             1000                 1000"
+}
+expect {
+        timeout {puts "TESTING ERROR 1.3\n";exit}
+        "Max open files            500                  500"
+}
+expect {
+        timeout {puts "TESTING ERROR 1.4\n";exit}
+        "Max pending signals       200                  200"
+}
+after 100
+puts "\nall done\n"
diff --git a/test/environment/rlimit.exp b/test/environment/rlimit.exp
new file mode 100755
index 000000000..611f69821
--- /dev/null
+++ b/test/environment/rlimit.exp
@@ -0,0 +1,37 @@
+#!/usr/bin/expect -f
+
+set timeout 10
+cd /home
+spawn $env(SHELL)
+match_max 100000
+
+send -- "firejail --rlimit-fsize=1024 --rlimit-nproc=1000 --rlimit-nofile=500 --rlimit-sigpending=200\r"
+expect {
+        timeout {puts "TESTING ERROR 0\n";exit}
+        "Child process initialized"
+}
+sleep 1
+
+send -- "cat /proc/self/limits; pwd\r"
+expect {
+        timeout {puts "TESTING ERROR 1.1\n";exit}
+        "Max file size             1024                 1024"
+}
+expect {
+        timeout {puts "TESTING ERROR 1.2\n";exit}
+        "Max processes             1000                 1000"
+}
+expect {
+        timeout {puts "TESTING ERROR 1.3\n";exit}
+        "Max open files            500                  500"
+}
+expect {
+        timeout {puts "TESTING ERROR 1.4\n";exit}
+        "Max pending signals       200                  200"
+}
+expect {
+        timeout {puts "TESTING ERROR 1.5\n";exit}
+        "home"
+}
+after 100
+puts "\n"
diff --git a/test/environment/rlimit.profile b/test/environment/rlimit.profile
new file mode 100644
index 000000000..271891c03
--- /dev/null
+++ b/test/environment/rlimit.profile
@@ -0,0 +1,4 @@
+  rlimit-fsize 1024
+rlimit-nproc 1000
+        rlimit-nofile   500
+rlimit-sigpending       200
\ No newline at end of file