add support for sandbox name in profile files

3 files changed, 35 insertions, 2 deletions

diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 4a1990382..356807acf 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -276,9 +276,9 @@ int sandbox(void* sandbox_arg) {
         //****************************
         // log sandbox data
         //****************************
-        fs_logger2int("sandbox pid:", (int) sandbox_pid);
         if (cfg.name)
                 fs_logger2("sandbox name:", cfg.name);
+        fs_logger2int("sandbox pid:", (int) sandbox_pid);
         if (cfg.chrootdir)
                 fs_logger("sandbox filesystem: chroot");
         else if (arg_overlay)   
diff --git a/src/lib/common.c b/src/lib/common.c
index 7d2ee5362..90cee3e10 100644
--- a/src/lib/common.c
+++ b/src/lib/common.c
@@ -31,6 +31,7 @@
 #include <dirent.h>
 #include <string.h>
 #include "../include/common.h"
+#define BUFLEN 4096
 
 int join_namespace(pid_t pid, char *type) {
         char *path;
@@ -100,6 +101,32 @@ int name2pid(const char *name, pid_t *pid) {
                         char *start = ptr;
                         if (!ptr) {
                                 free(cmd);
+                                
+                                // extract name for /run/mnt/firejail/fslogger file
+                                char *fname;
+                                if (asprintf(&fname, "/proc/%d/root/run/firejail/mnt/fslogger", newpid) == -1)
+                                        errExit("asprintf");
+
+                                struct stat s;
+                                if (stat(fname, &s) == 0) {
+                                        FILE *fp = fopen(fname, "r");
+                                        if (fp) {
+                                                char buf[BUFLEN];
+                                                if (fgets(buf, BUFLEN, fp)) {
+                                                        if (strncmp(buf, "sandbox name: ", 14) == 0) {
+                                                                char *ptr2 = buf + 14;
+                                                                if (strncmp(name, ptr2, strlen(name)) == 0) {
+                                                                        fclose(fp);
+                                                                        *pid = newpid;
+                                                                        closedir(dir);
+                                                                        return 0;
+                                                                }
+                                                        }
+                                                }
+                                                fclose(fp);
+                                        }
+                                }       
+                                
                                 continue;
                         }
                         while (*ptr != ' ' && *ptr != '\t' && *ptr != '\0')
@@ -119,7 +146,6 @@ int name2pid(const char *name, pid_t *pid) {
         return 1;
 }
 
-#define BUFLEN 4096
 char *pid_proc_comm(const pid_t pid) {
         // open /proc/pid/cmdline file
         char *fname;
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt
index e9cb1aa49..59d4a81ae 100644
--- a/src/man/firejail-profile.txt
+++ b/src/man/firejail-profile.txt
@@ -233,6 +233,13 @@ cgroup /sys/fs/cgroup/g1/tasks
 The sandbox is placed in g1 control group.
 
 .SH User Environment
+.TP
+\fBname sandboxname
+Set sandbox name. Example:
+.br
+
+.br
+name browser
 
 .TP
 \fBenv name=value