refactor meta character filtering

2 files changed, 4 insertions, 45 deletions

diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c
index 194a980f4..848691a56 100644
--- a/src/firejail/fs_lib.c
+++ b/src/firejail/fs_lib.c
@@ -276,9 +276,9 @@ static void install_list_entry(const char *lib) {
         assert(lib);
 
         // filename check
-        int len = strlen(lib);
-        if (strcspn(lib, "\\&!?\"'<>%^(){}[];,") != (size_t)len ||
-        strstr(lib, "..")) {
+        reject_meta_chars(lib, 1);
+
+        if (strstr(lib, "..")) {
                 fprintf(stderr, "Error: \"%s\" is an invalid library\n", lib);
                 exit(1);
         }
diff --git a/src/firejail/macros.c b/src/firejail/macros.c
index 74d529504..3f9460041 100644
--- a/src/firejail/macros.c
+++ b/src/firejail/macros.c
@@ -265,28 +265,6 @@ char *expand_macros(const char *path) {
         return rv;
 }
 
-// replace control characters with a '?'
-static char *fix_control_chars(const char *fname) {
-        assert(fname);
-
-        size_t len = strlen(fname);
-        char *rv = malloc(len + 1);
-        if (!rv)
-                errExit("malloc");
-
-        size_t i = 0;
-        while (fname[i] != '\0') {
-                if (iscntrl((unsigned char) fname[i]))
-                        rv[i] = '?';
-                else
-                        rv[i] = fname[i];
-                i++;
-        }
-        rv[i] = '\0';
-
-        return rv;
-}
-
 void invalid_filename(const char *fname, int globbing) {
 //      EUID_ASSERT();
         assert(fname);
@@ -304,24 +282,5 @@ void invalid_filename(const char *fname, int globbing) {
                         return;
         }
 
-        size_t i = 0;
-        while (ptr[i] != '\0') {
-                if (iscntrl((unsigned char) ptr[i])) {
-                        char *new = fix_control_chars(fname);
-                        fprintf(stderr, "Error: \"%s\" is an invalid filename: no control characters allowed\n", new);
-                        exit(1);
-                }
-                i++;
-        }
-
-        char *reject;
-        if (globbing)
-                reject = "\\&!\"<>%^{};,"; // file globbing ('*?[]') is allowed
-        else
-                reject = "\\&!?\"<>%^{};,*[]";
-        char *c = strpbrk(ptr, reject);
-        if (c) {
-                fprintf(stderr, "Error: \"%s\" is an invalid filename: rejected character: \"%c\"\n", fname, *c);
-                exit(1);
-        }
+        reject_meta_chars(ptr, globbing);
 }