6 files changed, 37 insertions, 89 deletions

diff --git a/src/firejail/main.c b/src/firejail/main.c
index 640605a6c..1554209b9 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -157,6 +157,7 @@ int arg_dbus_log_user = 0;
 int arg_dbus_log_system = 0;
 int arg_tab = 0;
 int login_shell = 0;
+int just_run_the_shell = 0;
 
 int parent_to_child_fds[2];
 int child_to_parent_fds[2];
@@ -795,15 +796,10 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                 if (checkcfg(CFG_JOIN) || getuid() == 0) {
                         logargs(argc, argv);
 
-                        if (arg_shell_none) {
-                                if (argc <= (i+1)) {
-                                        fprintf(stderr, "Error: --shell=none set, but no command specified\n");
-                                        exit(1);
-                                }
-                                cfg.original_program_index = i + 1;
-                        }
-
-                        if (!cfg.shell && !arg_shell_none)
+                        if (argc <= (i+1))
+                                just_run_the_shell = 1;
+                        cfg.original_program_index = i + 1;
+                        if (!cfg.shell)
                                 cfg.shell = cfg.usershell;
 
                         // join sandbox by pid or by name
@@ -821,19 +817,17 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                 if (checkcfg(CFG_JOIN) || getuid() == 0) {
                         logargs(argc, argv);
 
-                        if (arg_shell_none) {
-                                if (argc <= (i+1)) {
-                                        fprintf(stderr, "Error: --shell=none set, but no command specified\n");
-                                        exit(1);
-                                }
-                                cfg.original_program_index = i + 1;
-                        }
+                        if (argc <= (i+1))
+                                just_run_the_shell = 1;
+                        cfg.original_program_index = i + 1;
+
+                        if (!cfg.shell)
+                                cfg.shell = cfg.usershell;
 
+printf("***** %d\n", just_run_the_shell);
                         // try to join by name only
                         pid_t pid;
                         if (!read_pid(argv[i] + 16, &pid)) {
-                                if (!cfg.shell && !arg_shell_none)
-                                        cfg.shell = cfg.usershell;
 
                                 join(pid, argc, argv, i + 1);
                                 exit(0);
@@ -853,7 +847,7 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                                 exit(1);
                         }
 
-                        if (!cfg.shell && !arg_shell_none)
+                        if (!cfg.shell)
                                 cfg.shell = cfg.usershell;
 
                         // join sandbox by pid or by name
@@ -873,7 +867,7 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                         exit(1);
                 }
 
-                if (!cfg.shell && !arg_shell_none)
+                if (!cfg.shell)
                         cfg.shell = cfg.usershell;
 
                 // join sandbox by pid or by name
@@ -2822,8 +2816,9 @@ int main(int argc, char **argv, char **envp) {
 
         // prog_index could still be -1 if no program was specified
         if (prog_index == -1 && arg_shell_none) {
-                fprintf(stderr, "Error: shell=none configured, but no program specified\n");
-                exit(1);
+                just_run_the_shell = 1;
+                if (!cfg.shell)
+                        cfg.shell = cfg.usershell;
         }
 
         // check trace configuration
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 4ad9eb678..7f74635ec 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -51,6 +51,7 @@
 #endif
 
 static int force_nonewprivs = 0;
+extern int just_run_the_shell;
 
 static int monitored_pid = 0;
 static void sandbox_handler(int sig){
@@ -506,10 +507,28 @@ void start_application(int no_sandbox, int fd, char *set_sandbox_status) {
                 printf("LD_PRELOAD=%s\n", getenv("LD_PRELOAD"));
         }
 
+        if (just_run_the_shell) {
+                char *arg[2];
+                arg[0] = cfg.usershell;
+                arg[1] = NULL;
+
+                if (!arg_command && !arg_quiet)
+                        print_time();
+
+                __gcov_dump();
+
+                seccomp_install_filters();
+
+                if (set_sandbox_status)
+                        *set_sandbox_status = SANDBOX_DONE;
+                execvp(arg[0], arg);
+
+
+        }
         //****************************************
         // start the program without using a shell
         //****************************************
-        if (arg_shell_none) {
+        else if (arg_shell_none) {
                 if (arg_debug) {
                         int i;
                         for (i = cfg.original_program_index; i < cfg.original_argc; i++) {
diff --git a/test/environment/environment.sh b/test/environment/environment.sh
index 2b77973ac..9e58fdf95 100755
--- a/test/environment/environment.sh
+++ b/test/environment/environment.sh
@@ -36,9 +36,6 @@ echo "TESTING: extract command (extract_command.exp)"
 echo "TESTING: environment variables (test/environment/env.exp)"
 ./env.exp
 
-echo "TESTING: shell none(test/environment/shell-none.exp)"
-./shell-none.exp
-
 which dash 2>/dev/null
 if [ "$?" -eq 0 ];
 then
diff --git a/test/environment/shell-none.exp b/test/environment/shell-none.exp
deleted file mode 100755
index 512e2efc2..000000000
--- a/test/environment/shell-none.exp
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/expect -f
-# This file is part of Firejail project
-# Copyright (C) 2014-2022 Firejail Authors
-# License GPL v2
-
-set timeout 10
-spawn $env(SHELL)
-match_max 100000
-
-send -- "firejail  --shell=none\r"
-expect {
-        timeout {puts "TESTING ERROR 0\n";exit}
-        "shell=none configured, but no program specified"
-}
-sleep 1
-
-send -- "firejail  --profile=shell-none.profile\r"
-expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
-        "shell=none configured, but no program specified"
-}
-after 100
-
-send -- "firejail  --shell=none ls\r"
-expect {
-        timeout {puts "TESTING ERROR 2\n";exit}
-        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
-}
-expect {
-        timeout {puts "TESTING ERROR 3\n";exit}
-        "environment.sh"
-}
-after 100
-
-send -- "firejail  --profile=shell-none.profile ls\r"
-expect {
-        timeout {puts "TESTING ERROR 4\n";exit}
-        -re "Child process initialized in \[0-9\]+.\[0-9\]+ ms"
-}
-expect {
-        timeout {puts "TESTING ERROR 5\n";exit}
-        "environment.sh"
-}
-after 100
-
-
-puts "\nall done\n"
diff --git a/test/fs/invalid_filename.exp b/test/fs/invalid_filename.exp
index 0c37b780d..3d4904d8f 100755
--- a/test/fs/invalid_filename.exp
+++ b/test/fs/invalid_filename.exp
@@ -102,18 +102,6 @@ expect {
 }
 after 100
 
-send -- "firejail --shell=\"bla&&bla\"\r"
-expect {
-        timeout {puts "TESTING ERROR 12.2\n";exit}
-        "Error:"
-}
-expect {
-        timeout {puts "TESTING ERROR 12.3\n";exit}
-        "is an invalid filename"
-}
-after 100
-
-
 send -- "firejail --whitelist=\"bla&&bla\"\r"
 expect {
         timeout {puts "TESTING ERROR 14.2\n";exit}
diff --git a/test/profiles/profile_appname.exp b/test/profiles/profile_appname.exp
index fce278b4c..c178e8e00 100755
--- a/test/profiles/profile_appname.exp
+++ b/test/profiles/profile_appname.exp
@@ -16,10 +16,6 @@ expect {
         timeout {puts "TESTING ERROR 1\n";exit}
         "Reading profile /etc/firejail/firefox-common.profile"
 }
-expect {
-        timeout {puts "TESTING ERROR 2\n";exit}
-        "shell=none configured, but no program specified"
-}
 
 after 100
 puts "\nall done\n"