--timeout testing and fixes (#1614)

5 files changed, 45 insertions, 7 deletions

diff --git a/RELNOTES b/RELNOTES
index b69e1dd33..eb27a5d1d 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -4,7 +4,7 @@ firejail (0.9.51) baseline; urgency=low
     read-only, read-write, tmpfs and noexec are allowed in
     private home directories
   * modif: remount-proc-sys deprecated from firejail.config
-  * modif: --profile-path deprecated
+  * modif: --profile-path was deprecated
   * enhancement: support Firejail user config directory in firecfg
   * enhancement: disable DBus activation in firecfg
   * enhancement; enumerate root directories in apparmor profile
diff --git a/src/firejail/fs_hostname.c b/src/firejail/fs_hostname.c
index 0cf715fe2..15c8f5e36 100644
--- a/src/firejail/fs_hostname.c
+++ b/src/firejail/fs_hostname.c
@@ -94,7 +94,7 @@ void fs_resolvconf(void) {
 
         struct stat s;
 
-        // create a new /etc/hostname
+        // create a new /etc/resolv.conf
         if (stat("/etc/resolv.conf", &s) == 0) {
                 if (arg_debug)
                         printf("Creating a new /etc/resolv.conf file\n");
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index d797cee61..b413407bd 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -227,11 +227,15 @@ static int monitor_application(pid_t app_pid) {
                                 break;
 
                         // handle --timeout
-                        if (options && --timeout == 0)  {
-                                kill(-1, SIGTERM);
-                                flush_stdin();
-                                sleep(1);
-                                _exit(1);
+                        if (options) {
+                                if (--timeout == 0)  {
+                                        kill(-1, SIGTERM);
+                                        flush_stdin();
+                                        sleep(1);
+                                        _exit(1);
+                                }
+                                else
+                                        sleep(1);
                         }
                 }
                 while(rv != monitored_pid);
diff --git a/test/environment/environment.sh b/test/environment/environment.sh
index 308d99871..844e90cb8 100755
--- a/test/environment/environment.sh
+++ b/test/environment/environment.sh
@@ -7,6 +7,9 @@ export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 
 
+echo "TESTING: timeout (test/environment/timeout.exp)"
+./timeout.exp
+
 echo "TESTING: DNS (test/environment/dns.exp)"
 ./dns.exp
 
diff --git a/test/environment/timeout.exp b/test/environment/timeout.exp
new file mode 100755
index 000000000..ac29c57ba
--- /dev/null
+++ b/test/environment/timeout.exp
@@ -0,0 +1,31 @@
+#!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2017 Firejail Authors
+# License GPL v2
+
+set timeout 10
+spawn $env(SHELL)
+match_max 100000
+
+send -- "time firejail --timeout=00:00:05\r"
+expect {
+        timeout {puts "TESTING ERROR 0\n";exit}
+        "Child process initialized"
+}
+sleep 1
+
+sleep 3
+send -- "env\r"
+expect {
+        timeout {puts "TESTING ERROR 1\n";exit}
+        "container=firejail"
+}
+
+expect {
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "m5."  {puts "5 seconds"}
+        "m6."  {puts "6 seconds"}
+        "m7." {puts "7 seconds"}
+}
+
+puts "\nall done\n"