Support ~ in blacklist and profile includes

2 files changed, 9 insertions, 0 deletions

diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index 4b4e63288..38946c8d9 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -297,6 +297,11 @@ void fs_blacklist(const char *homedir) {
                                 errExit("asprintf");
                         ptr = new_name;
                 }
+                else if (strncmp(ptr, "~/", 2) == 0) {
+                        if (asprintf(&new_name, "%s%s", homedir, ptr + 1) == -1)
+                                errExit("asprintf");
+                        ptr = new_name;
+                }
 
                 // expand path macro - look for the file in /bin, /usr/bin, /sbin and  /usr/sbin directories
                 if (strncmp(ptr, "${PATH}", 7) == 0) {
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index a73582499..4aac2bdb4 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -430,6 +430,10 @@ void profile_read(const char *fname, const char *skip1, const char *skip2) {
                                 if (asprintf(&newprofile2, "%s%s", cfg.homedir, newprofile + 7) == -1)
                                         errExit("asprintf");
                         }                               
+                        else if (strncmp(newprofile, "~/", 2) == 0) {
+                                if (asprintf(&newprofile2, "%s%s", cfg.homedir, newprofile + 1) == -1)
+                                        errExit("asprintf");
+                        }                               
                         
                         // recursivity
                         profile_read((newprofile2)? newprofile2:newprofile, newskip1, newskip2);