10 files changed, 178 insertions, 99 deletions

diff --git a/.github/workflows/check-c.yml b/.github/workflows/check-c.yml
index 496efb76c..3324906f7 100644
--- a/.github/workflows/check-c.yml
+++ b/.github/workflows/check-c.yml
@@ -150,7 +150,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@66b90a5db151a8042fa97405c6cf843bbe433f7b
+      uses: github/codeql-action/init@407ffafae6a767df3e0230c3df91b6443ae8df75
       with:
         languages: cpp
 
@@ -161,4 +161,4 @@ jobs:
       run: make -j "$(nproc)"
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@66b90a5db151a8042fa97405c6cf843bbe433f7b
+      uses: github/codeql-action/analyze@407ffafae6a767df3e0230c3df91b6443ae8df75
diff --git a/.github/workflows/check-python.yml b/.github/workflows/check-python.yml
index 535b9234b..4425af2b7 100644
--- a/.github/workflows/check-python.yml
+++ b/.github/workflows/check-python.yml
@@ -50,9 +50,9 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@66b90a5db151a8042fa97405c6cf843bbe433f7b
+      uses: github/codeql-action/init@407ffafae6a767df3e0230c3df91b6443ae8df75
       with:
         languages: python
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@66b90a5db151a8042fa97405c6cf843bbe433f7b
+      uses: github/codeql-action/analyze@407ffafae6a767df3e0230c3df91b6443ae8df75
diff --git a/Makefile b/Makefile
index d5ec11ea6..5b9335127 100644
--- a/Makefile
+++ b/Makefile
@@ -235,6 +235,7 @@ endif
         install -m 0644 -t $(DESTDIR)$(docdir) COPYING README RELNOTES etc/templates/*
         # profiles and settings
         install -m 0755 -d $(DESTDIR)$(sysconfdir)/firejail
+        install -m 0755 -d $(DESTDIR)$(sysconfdir)/firejail/firecfg.d
         install -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail src/firecfg/firecfg.config
         install -m 0644 -t $(DESTDIR)$(sysconfdir)/firejail etc/profile-a-l/*.profile etc/profile-m-z/*.profile etc/inc/*.inc etc/net/*.net etc/firejail.config
         sh -c "if [ ! -f $(DESTDIR)/$(sysconfdir)/firejail/login.users ]; then install -c -m 0644 etc/login.users $(DESTDIR)/$(sysconfdir)/firejail/.; fi;"
diff --git a/RELNOTES b/RELNOTES
index b81ae74c4..02d9259a9 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -22,12 +22,15 @@ firejail (0.9.73) baseline; urgency=low
   * modif: improve errExit error messages (#5871)
   * modif: drop deprecated 'shell' option references (#5894)
   * modif: keep pipewire group unless nosound is used (#5992 #5993)
+  * modif: Lookup xauth in PATH (#6006 #6087)
   * bugfix: qutebrowser: links will not open in the existing instance (#5601
     #5618)
   * bugfix: fix --hostname and --hosts-file commands
   * bugfix: arp.c: ensure positive timeout on select(2) (#5806)
   * bugfix: Wrong syscall names for s390_pci_mmio_read and s390_pci_mmio_write
     (#5965 #5976)
+  * bugfix: firejail --ls reports wrong file sizes for large files (#5982
+    #6086)
   * build: auto-generate syntax files (#5627)
   * build: mark all phony targets as such (#5637)
   * build: mkdeb.sh: pass all arguments to ./configure (#5654)
@@ -46,6 +49,7 @@ firejail (0.9.73) baseline; urgency=low
   * build: firecfg.config sorting improvements (#5942)
   * build: codespell improvements (#5955)
   * build: add missing makefile dep & syntax improvements (#5956)
+  * build: sort.py: use case-sensitive sorting (#6070)
   * ci: always update the package db before installing packages (#5742)
   * ci: fix codeql unable to download its own bundle (#5783)
   * ci: split configure/build/install commands on gitlab (#5784)
@@ -57,6 +61,8 @@ firejail (0.9.73) baseline; urgency=low
   * ci: whitelist paths, reorganize workflows & speed-up tests (#5960)
   * ci: fix dependabot duplicated workflow runs (#5984)
   * ci: allow running workflows manually (#6026)
+  * contrib/syntax: remove 'text/plain' from firejail-profile.lang.in (#6057
+    #6059)
   * contrib/vim: match profile files more broadly (#5850)
   * test: split individual test groups in github workflows
   * test: add chroot, appimage and network tests in github workflows
diff --git a/etc/profile-a-l/lutris.profile b/etc/profile-a-l/lutris.profile
index 226bc8dde..0462cb503 100644
--- a/etc/profile-a-l/lutris.profile
+++ b/etc/profile-a-l/lutris.profile
@@ -11,6 +11,7 @@ noblacklist ${HOME}/Games
 noblacklist ${HOME}/.cache/lutris
 noblacklist ${HOME}/.cache/wine
 noblacklist ${HOME}/.cache/winetricks
+noblacklist ${HOME}/.config/MangoHud
 noblacklist ${HOME}/.config/lutris
 noblacklist ${HOME}/.local/share/lutris
 #noblacklist ${HOME}/.wine
@@ -45,6 +46,7 @@ whitelist ${HOME}/Games
 whitelist ${HOME}/.cache/lutris
 whitelist ${HOME}/.cache/wine
 whitelist ${HOME}/.cache/winetricks
+whitelist ${HOME}/.config/MangoHud
 whitelist ${HOME}/.config/lutris
 whitelist ${HOME}/.local/share/lutris
 #whitelist ${HOME}/.wine
diff --git a/src/firecfg/firecfg.h b/src/firecfg/firecfg.h
index 8f74a1198..11e3ebc67 100644
--- a/src/firecfg/firecfg.h
+++ b/src/firecfg/firecfg.h
@@ -37,6 +37,16 @@
 #include "../include/common.h"
 #define MAX_BUF 4096
 
+// config files
+#define FIRECFG_CFGFILE SYSCONFDIR "/firecfg.config"
+#define FIRECFG_CONF_GLOB SYSCONFDIR "/firecfg.d/*.conf"
+
+// programs
+#define FIREJAIL_EXEC PREFIX "/bin/firejail"
+#define FIREJAIL_WELCOME_SH LIBDIR "/firejail/firejail-welcome.sh"
+#define FZENITY_EXEC        LIBDIR "/firejail/fzenity"
+#define ZENITY_EXEC "/usr/bin/zenity"
+#define SUDO_EXEC "sudo"
 
 // main.c
 extern int arg_debug;
diff --git a/src/firecfg/main.c b/src/firecfg/main.c
index 4ec81c5b3..604b12633 100644
--- a/src/firecfg/main.c
+++ b/src/firecfg/main.c
@@ -20,6 +20,8 @@
 
 #include "firecfg.h"
 #include "../include/firejail_user.h"
+#include <glob.h>
+
 int arg_debug = 0;
 char *arg_bindir = "/usr/local/bin";
 int arg_guide = 0;
@@ -76,10 +78,6 @@ static void list(void) {
                 exit(1);
         }
 
-        char *firejail_exec;
-        if (asprintf(&firejail_exec, "%s/bin/firejail", PREFIX) == -1)
-                errExit("asprintf");
-
         struct dirent *entry;
         while ((entry = readdir(dir)) != NULL) {
                 if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
@@ -92,7 +90,7 @@ static void list(void) {
                 if (is_link(fullname)) {
                         char* fname = realpath(fullname, NULL);
                         if (fname) {
-                                if (strcmp(fname, firejail_exec) == 0)
+                                if (strcmp(fname, FIREJAIL_EXEC) == 0)
                                         printf("%s\n", fullname);
                                 free(fname);
                         }
@@ -101,7 +99,6 @@ static void list(void) {
         }
 
         closedir(dir);
-        free(firejail_exec);
 }
 
 static void clean(void) {
@@ -114,10 +111,6 @@ static void clean(void) {
                 exit(1);
         }
 
-        char *firejail_exec;
-        if (asprintf(&firejail_exec, "%s/bin/firejail", PREFIX) == -1)
-                errExit("asprintf");
-
         struct dirent *entry;
         while ((entry = readdir(dir)) != NULL) {
                 if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
@@ -130,7 +123,7 @@ static void clean(void) {
                 if (is_link(fullname)) {
                         char* fname = realpath(fullname, NULL);
                         if (fname) {
-                                if (strcmp(fname, firejail_exec) == 0) {
+                                if (strcmp(fname, FIREJAIL_EXEC) == 0) {
                                         char *ptr = strrchr(fullname, '/');
                                         assert(ptr);
                                         ptr++;
@@ -147,10 +140,43 @@ static void clean(void) {
         }
 
         closedir(dir);
-        free(firejail_exec);
         printf("\n");
 }
 
+#define ignorelist_maxlen 2048
+static const char *ignorelist[ignorelist_maxlen];
+static int ignorelist_len = 0;
+
+static int append_ignorelist(const char *const str) {
+        assert(str);
+        if (ignorelist_len >= ignorelist_maxlen) {
+                fprintf(stderr, "Warning: Ignore list is full (%d/%d), skipping %s\n",
+                        ignorelist_len, ignorelist_maxlen, str);
+                return 0;
+        }
+
+        printf("   ignoring '%s'\n", str);
+        const char *const dup = strdup(str);
+        if (!dup)
+                errExit("strdup");
+
+        ignorelist[ignorelist_len] = dup;
+        ignorelist_len++;
+
+        return 1;
+}
+
+static int in_ignorelist(const char *const str) {
+        assert(str);
+        int i;
+        for (i = 0; i < ignorelist_len; i++) {
+                if (strcmp(str, ignorelist[i]) == 0)
+                        return 1;
+        }
+
+        return 0;
+}
+
 static void set_file(const char *name, const char *firejail_exec) {
         if (which(name) == 0)
                 return;
@@ -165,35 +191,26 @@ static void set_file(const char *name, const char *firejail_exec) {
                 if (rv) {
                         fprintf(stderr, "Error: cannot create %s symbolic link\n", fname);
                         perror("symlink");
-                }
-                else
+                } else {
                         printf("   %s created\n", name);
-        }
-        else {
-          fprintf(stderr, "Warning: cannot create %s - already exists! Skipping...\n", fname);
+                }
+        } else {
+                fprintf(stderr, "Warning: cannot create %s - already exists! Skipping...\n", fname);
         }
 
         free(fname);
 }
 
-// parse /etc/firejail/firecfg.config file
-static void set_links_firecfg(void) {
-        char *cfgfile;
-        if (asprintf(&cfgfile, "%s/firecfg.config", SYSCONFDIR) == -1)
-                errExit("asprintf");
-
-        char *firejail_exec;
-        if (asprintf(&firejail_exec, "%s/bin/firejail", PREFIX) == -1)
-                errExit("asprintf");
+// parse a single config file
+static void set_links_firecfg(const char *cfgfile) {
+        printf("Configuring symlinks in %s based on %s\n", arg_bindir, cfgfile);
 
-        // parse /etc/firejail/firecfg.config file
         FILE *fp = fopen(cfgfile, "r");
         if (!fp) {
                 perror("fopen");
                 fprintf(stderr, "Error: cannot open %s\n", cfgfile);
                 exit(1);
         }
-        printf("Configuring symlinks in %s based on firecfg.config\n", arg_bindir);
 
         char buf[MAX_BUF];
         int lineno = 0;
@@ -223,13 +240,43 @@ static void set_links_firecfg(void) {
                 if (*start == '\0')
                         continue;
 
+                // handle ignore command
+                if (*start == '!') {
+                        append_ignorelist(start + 1);
+                        continue;
+                }
+
                 // set link
-                set_file(start, firejail_exec);
+                if (!in_ignorelist(start))
+                        set_file(start, FIREJAIL_EXEC);
+                else
+                        printf("   %s ignored\n", start);
         }
 
         fclose(fp);
-        free(cfgfile);
-        free(firejail_exec);
+        printf("\n");
+}
+
+// parse all config files matching pattern
+static void set_links_firecfg_glob(const char *pattern) {
+        printf("Looking for config files in %s\n", pattern);
+
+        glob_t globbuf;
+        int globerr = glob(pattern, 0, NULL, &globbuf);
+        if (globerr == GLOB_NOMATCH) {
+                fprintf(stderr, "No matches for glob pattern %s\n", pattern);
+                goto out;
+        } else if (globerr != 0) {
+                fprintf(stderr, "Warning: Failed to match glob pattern %s: %s\n",
+                        pattern, strerror(errno));
+                goto out;
+        }
+
+        size_t i;
+        for (i = 0; i < globbuf.gl_pathc; i++)
+                set_links_firecfg(globbuf.gl_pathv[i]);
+out:
+        globfree(&globbuf);
 }
 
 // parse ~/.config/firejail/ directory
@@ -246,10 +293,6 @@ static void set_links_homedir(const char *homedir) {
                 return;
         }
 
-        char *firejail_exec;
-        if (asprintf(&firejail_exec, "%s/bin/firejail", PREFIX) == -1)
-                errExit("asprintf");
-
         // parse ~/.config/firejail/ directory
         printf("\nConfiguring symlinks in %s based on local firejail config directory\n", arg_bindir);
 
@@ -260,6 +303,7 @@ static void set_links_homedir(const char *homedir) {
                 free(dirname);
                 return;
         }
+        free(dirname);
 
         struct dirent *entry;
         while ((entry = readdir(dir))) {
@@ -280,12 +324,10 @@ static void set_links_homedir(const char *homedir) {
                 }
 
                 *ptr = '\0';
-                set_file(exec, firejail_exec);
+                set_file(exec, FIREJAIL_EXEC);
                 free(exec);
         }
         closedir(dir);
-
-        free(firejail_exec);
 }
 
 static const char *get_sudo_user(void) {
@@ -449,18 +491,20 @@ int main(int argc, char **argv) {
         }
 
         if (arg_guide) {
+                const char *zenity_exec;
+                if (arg_debug)
+                        zenity_exec = FZENITY_EXEC;
+                else
+                        zenity_exec = ZENITY_EXEC;
+
                 char *cmd;
-if (arg_debug) {
-                if (asprintf(&cmd, "sudo %s/firejail/firejail-welcome.sh /usr/lib/firejail/fzenity %s %s", LIBDIR, SYSCONFDIR, user) == -1)
+                if (asprintf(&cmd, "%s %s %s %s %s",
+                             SUDO_EXEC, FIREJAIL_WELCOME_SH, zenity_exec, SYSCONFDIR, user) == -1)
                         errExit("asprintf");
-}
-else {
-                if (asprintf(&cmd, "sudo %s/firejail/firejail-welcome.sh /usr/bin/zenity %s %s", LIBDIR, SYSCONFDIR, user) == -1)
-                        errExit("asprintf");
-}
+
                 int status = system(cmd);
                 if (status == -1) {
-                        fprintf(stderr, "Error: cannot run firejail-welcome.sh\n");
+                        fprintf(stderr, "Error: cannot run %s\n", FIREJAIL_WELCOME_SH);
                         exit(1);
                 }
                 free(cmd);
@@ -474,12 +518,15 @@ else {
         // clear all symlinks
         clean();
 
-        // set new symlinks based on /etc/firejail/firecfg.config
-        set_links_firecfg();
+        // set new symlinks based on .conf files
+        set_links_firecfg_glob(FIRECFG_CONF_GLOB);
+
+        // set new symlinks based on firecfg.config
+        set_links_firecfg(FIRECFG_CFGFILE);
 
         if (getuid() == 0) {
                 // add user to firejail access database - only for root
-                printf("\nAdding user %s to Firejail access database in %s/firejail.users\n", user, SYSCONFDIR);
+                printf("Adding user %s to Firejail access database in %s/firejail.users\n", user, SYSCONFDIR);
                 // temporarily set the umask, access database must be world-readable
                 mode_t orig_umask = umask(022);
                 firejail_user_add(user);
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 0c9c80137..0327f8bda 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -1572,7 +1572,7 @@ int main(int argc, char **argv, char **envp) {
                         arg_trace = 1;
                 else if (strncmp(argv[i], "--trace=", 8) == 0) {
                         arg_trace = 1;
-                        arg_tracefile = argv[i] + 8;
+                        arg_tracefile = expand_macros(argv[i] + 8);
                         if (*arg_tracefile == '\0') {
                                 fprintf(stderr, "Error: invalid trace option\n");
                                 exit(1);
@@ -1582,13 +1582,6 @@ int main(int argc, char **argv, char **envp) {
                                 fprintf(stderr, "Error: invalid file name %s\n", arg_tracefile);
                                 exit(1);
                         }
-                        // if the filename starts with ~, expand the home directory
-                        if (*arg_tracefile == '~') {
-                                char *tmp;
-                                if (asprintf(&tmp, "%s%s", cfg.homedir, arg_tracefile + 1) == -1)
-                                        errExit("asprintf");
-                                arg_tracefile = tmp;
-                        }
                 }
                 else if (strcmp(argv[i], "--tracelog") == 0) {
                         if (checkcfg(CFG_TRACELOG))
@@ -1953,20 +1946,13 @@ int main(int argc, char **argv, char **envp) {
                                 }
 
                                 // extract chroot dirname
-                                cfg.chrootdir = argv[i] + 9;
+                                cfg.chrootdir = expand_macros(argv[i] + 9);
                                 if (*cfg.chrootdir == '\0') {
                                         fprintf(stderr, "Error: invalid chroot option\n");
                                         exit(1);
                                 }
                                 invalid_filename(cfg.chrootdir, 0); // no globbing
 
-                                // if the directory starts with ~, expand the home directory
-                                if (*cfg.chrootdir == '~') {
-                                        char *tmp;
-                                        if (asprintf(&tmp, "%s%s", cfg.homedir, cfg.chrootdir + 1) == -1)
-                                                errExit("asprintf");
-                                        cfg.chrootdir = tmp;
-                                }
                                 // check chroot directory
                                 fs_check_chroot_dir();
                         }
@@ -2748,16 +2734,7 @@ int main(int argc, char **argv, char **envp) {
                 else if (strncmp(argv[i], "--netfilter=", 12) == 0) {
                         if (checkcfg(CFG_NETWORK)) {
                                 arg_netfilter = 1;
-                                arg_netfilter_file = argv[i] + 12;
-
-                                // expand tilde
-                                if (*arg_netfilter_file == '~') {
-                                        char *tmp;
-                                        if (asprintf(&tmp, "%s%s", cfg.homedir, arg_netfilter_file + 1) == -1)
-                                                errExit("asprintf");
-                                        arg_netfilter_file = tmp;
-                                }
-
+                                arg_netfilter_file = expand_macros(argv[i] + 12);
                                 check_netfilter_file(arg_netfilter_file);
                         }
                         else
@@ -2767,16 +2744,7 @@ int main(int argc, char **argv, char **envp) {
                 else if (strncmp(argv[i], "--netfilter6=", 13) == 0) {
                         if (checkcfg(CFG_NETWORK)) {
                                 arg_netfilter6 = 1;
-                                arg_netfilter6_file = argv[i] + 13;
-
-                                // expand tilde
-                                if (*arg_netfilter6_file == '~') {
-                                        char *tmp;
-                                        if (asprintf(&tmp, "%s%s", cfg.homedir, arg_netfilter6_file + 1) == -1)
-                                                errExit("asprintf");
-                                        arg_netfilter6_file = tmp;
-                                }
-
+                                arg_netfilter6_file = expand_macros(argv[i] + 13);
                                 check_netfilter_file(arg_netfilter6_file);
                         }
                         else
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 8cc5c1166..0f60e9b7d 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -635,9 +635,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
 #ifdef HAVE_NETWORK
                 if (checkcfg(CFG_NETWORK)) {
                         arg_netfilter = 1;
-                        arg_netfilter_file = strdup(ptr + 10);
-                        if (!arg_netfilter_file)
-                                errExit("strdup");
+                        arg_netfilter_file = expand_macros(ptr + 10);
                         check_netfilter_file(arg_netfilter_file);
                 }
                 else
@@ -649,9 +647,7 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
 #ifdef HAVE_NETWORK
                 if (checkcfg(CFG_NETWORK)) {
                         arg_netfilter6 = 1;
-                        arg_netfilter6_file = strdup(ptr + 11);
-                        if (!arg_netfilter6_file)
-                                errExit("strdup");
+                        arg_netfilter6_file = expand_macros(ptr + 11);
                         check_netfilter_file(arg_netfilter6_file);
                 }
                 else
diff --git a/src/man/firecfg.1.in b/src/man/firecfg.1.in
index a85fbc5da..e43a573de 100644
--- a/src/man/firecfg.1.in
+++ b/src/man/firecfg.1.in
@@ -29,9 +29,13 @@ Note: The examples use \fBsudo\fR, but \fBdoas\fR is also supported.
 To set it up, run "sudo firecfg" after installing Firejail software.
 The same command should also be run after
 installing new programs. If the program is supported by Firejail, the symbolic link in /usr/local/bin
-will be created. For a full list of programs supported by default run "cat /etc/firejail/firecfg.config".
-
-For user-driven manual integration, see \fBDESKTOP INTEGRATION\fR section in \fBman 1 firejail\fR.
+will be created.
+.PP
+To configure the list of programs used by firecfg when creating symlinks, see
+\fBFILES\fR and \fBSYNTAX\fR.
+.PP
+For user-driven manual integration, see \fBDESKTOP INTEGRATION\fR section in
+\fBman 1 firejail\fR.
 .SH DEFAULT ACTIONS
 The following actions are implemented by default by running sudo firecfg:
 
@@ -135,8 +139,53 @@ $ sudo firecfg --clean
 /usr/local/bin/vlc removed
 .br
 [...]
+.SH FILES
+.PP
+Configuration files are searched for and parsed in the following paths:
+.PP
+.RS
+1. /etc/firejail/firecfg.d/*.conf (in alphabetical order)
+.br
+2. /etc/firejail/firecfg.config
+.RE
+.PP
+The programs that are supported by default are listed in
+/etc/firejail/firecfg.config.
+It is recommended to leave it as is and put all customizations inside
+/etc/firejail/firecfg.d/.
+.PP
+Profile files are also searched in the user configuration directory:
+.PP
+.RS
+3. ~/.config/firejail/*.profile
+.RE
+.PP
+For every \fBPROGRAM.profile\fR file found, firecfg attempts to create a
+symlink for "PROGRAM", as if "PROGRAM" was listed in a configuration file.
+.SH SYNTAX
+Configuration file syntax:
+.PP
+A line that starts with \fB#\fR is considered a comment.
+.br
+A line that starts with \fB!PROGRAM\fR means to ignore "PROGRAM" when creating
+symlinks.
+.br
+A line that starts with anything else is considered to be the name of an
+executable and firecfg will attempt to create a symlink for it.
+.PP
+For example, to prevent firecfg from creating symlinks for "firefox" and
+"patch" while attempting to create a symlink for "myprog", the following lines
+could be added to /etc/firejail/firecfg.d/10-my.conf:
+.PP
+.RS
+!firefox
+.br
+!patch
+.br
 
-
+.br
+myprog
+.RE
 .SH LICENSE
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
 .PP