Allow recursive mkdir (Closes #305)

2 files changed, 36 insertions, 11 deletions

diff --git a/src/firejail/fs_mkdir.c b/src/firejail/fs_mkdir.c
index 50bcc613b..5bc2df2cc 100644
--- a/src/firejail/fs_mkdir.c
+++ b/src/firejail/fs_mkdir.c
@@ -22,8 +22,38 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <grp.h>
- #include <sys/wait.h>
- 
+#include <sys/wait.h>
+#include <string.h>
+
+static void mkdir_recursive(char *path) {
+        char *subdir = NULL;
+        struct stat s;
+
+        if (chdir("/")) {
+                fprintf(stderr, "Error: can't chdir to /");
+                return;
+        }
+
+        subdir = strtok(path, "/");
+        while(subdir) {
+                if (stat(subdir, &s) == -1) {
+                        if (mkdir(subdir, 0700) == -1) {
+                                fprintf(stderr, "Warning: cannot create %s directory\n", subdir);
+                                return;
+                        }
+                } else if (!S_ISDIR(s.st_mode)) {
+                        fprintf(stderr, "Warning: '%s' exists, but is no directory\n", subdir);
+                        return;
+                }
+                if (chdir(subdir)) {
+                        fprintf(stderr, "Error: can't chdir to %s", subdir);
+                        return;
+                }
+
+                subdir = strtok(NULL, "/");
+        }
+}
+
 void fs_mkdir(const char *name) {
         EUID_ASSERT();
         
@@ -50,8 +80,7 @@ void fs_mkdir(const char *name) {
                 drop_privs(0);
 
                 // create directory
-                if (mkdir(expanded, 0700) == -1)
-                        fprintf(stderr, "Warning: cannot create %s directory\n", expanded);
+                mkdir_recursive(expanded);
                 exit(0);
         }
         // wait for the child to finish
@@ -101,4 +130,4 @@ void fs_mkfile(const char *name) {
 
 doexit:
         free(expanded);
-}
\ No newline at end of file
+}
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt
index 504842a9e..7e33a6b45 100644
--- a/src/man/firejail-profile.txt
+++ b/src/man/firejail-profile.txt
@@ -136,7 +136,7 @@ The directory is created if it doesn't already exist.
 .br
 Use this command for whitelisted directories you need to preserve
 when the sandbox is closed. Without it, the application will create the directory, and the directory
-will be deleted when the sandbox is closed. Subdirectories also need to be created using mkdir. Example from
+will be deleted when the sandbox is closed. Subdirectories are recursively created. Example from
 firefox profile:
 .br
 
@@ -145,17 +145,13 @@ mkdir ~/.mozilla
 .br
 whitelist ~/.mozilla
 .br
-mkdir ~/.cache
-.br
-mkdir ~/.cache/mozilla
-.br
 mkdir ~/.cache/mozilla/firefox
 .br
 whitelist ~/.cache/mozilla/firefox
 .TP
 \fBmkfile file
 Similar to mkdir, this command creates a file in user home before the sandbox is started.
-The file is created if it doesn't already exist.
+The file is created if it doesn't already exist, but it's target directory has to exist.
 .TP
 \fBnoexec file_or_directory
 Remount the file or the directory noexec, nodev and nosuid.