Merge pull request #3156 from smitsohu/filename

print rejected character in invalid filenames

1 files changed, 38 insertions, 11 deletions

diff --git a/src/firejail/macros.c b/src/firejail/macros.c
index 9621b95ee..6901b7d44 100644
--- a/src/firejail/macros.c
+++ b/src/firejail/macros.c
@@ -258,6 +258,28 @@ 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);
@@ -275,19 +297,24 @@ void invalid_filename(const char *fname, int globbing) {
                         return;
         }
 
-        int len = strlen(ptr);
-
-        if (globbing) {
-                // file globbing ('*?[]') is allowed
-                if (strcspn(ptr, "\\&!\"'<>%^(){};,") != (size_t)len) {
-                        fprintf(stderr, "Error: \"%s\" is an invalid filename\n", ptr);
+        size_t i = 0;
+        while (ptr[i] != '\0') {
+                if (iscntrl((unsigned char) ptr[i])) {
+                        fprintf(stderr, "Error: \"%s\" is an invalid filename: no control characters allowed\n",
+                                fix_control_chars(fname));
                         exit(1);
                 }
+                i++;
         }
-        else {
-                if (strcspn(ptr, "\\&!?\"'<>%^(){};,*[]") != (size_t)len) {
-                        fprintf(stderr, "Error: \"%s\" is an invalid filename\n", ptr);
-                        exit(1);
-                }
+        
+        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);
         }
 }