Commit
- Loading branch information
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,7 +24,145 @@ | |
| #include <sys/types.h> | ||
| #include <time.h> | ||
| #include <unistd.h> | ||
| #include <glob.h> | ||
|
|
||
| #define ETC_MAX 256 | ||
| static int etc_cnt = 0; | ||
| static char *etc_list[ETC_MAX + 1] = { // plus 1 for ending NULL pointer | ||
| "alternatives", | ||
| "fonts", | ||
| "ld.so.cache", | ||
| "ld.so.conf", | ||
| "ld.so.conf.d", | ||
| "ld.so.preload", | ||
| "locale", | ||
| "locale.alias", | ||
| "locale.conf", | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
netblue30
Author
Owner
|
||
| "locale.gen", | ||
| "localtime", | ||
| "nsswitch.conf", | ||
| "passwd", | ||
| NULL | ||
| }; | ||
|
|
||
| static char*etc_group_network[] = { | ||
| "hostname", | ||
| "hosts", | ||
| "resolv.conf", | ||
| "protocols", | ||
| NULL | ||
| }; | ||
|
|
||
| static char *etc_group_gnome[] = { | ||
| "xdg", | ||
| "drirc", | ||
| "dconf", | ||
| "gtk-2.0", | ||
| "gtk-3.0", | ||
| NULL | ||
| }; | ||
|
|
||
| static char *etc_group_kde[] = { | ||
| "xdg", | ||
| "drirc", | ||
| "kde4rc", | ||
| "kde5rc", | ||
| NULL | ||
| }; | ||
|
|
||
| static char *etc_group_sound[] = { | ||
| "alsa", | ||
| "asound.conf", | ||
| "machine-id", // required by PulseAudio | ||
| "pulse", | ||
| NULL | ||
| }; | ||
|
|
||
| static char *etc_group_tls_ca[] = { | ||
| "ca-certificates", | ||
This comment has been minimized.
Sorry, something went wrong. 
glitsj16
Collaborator
|
||
| "ca-certificates.conf", | ||
| "crypto-policies", | ||
| "pki", | ||
| "ssl", | ||
| NULL | ||
| }; | ||
|
|
||
| static void etc_copy_group(char **pptr) { | ||
| assert(pptr); | ||
|
|
||
| while (*pptr != NULL) { | ||
| etc_list[etc_cnt++] = *pptr; | ||
| etc_list[etc_cnt] = NULL; | ||
| pptr++; | ||
| } | ||
| } | ||
|
|
||
| static void etc_add(const char *file) { | ||
| assert(file); | ||
| if (etc_cnt >= ETC_MAX) { | ||
| fprintf(stderr, "Error: size of private_etc list exceeded (%d maximum)\n", ETC_MAX); | ||
| exit(1); | ||
| } | ||
|
|
||
| // look for file in the current list | ||
| int i; | ||
| for (i = 0; i < etc_cnt; i++) { | ||
| if (strcmp(file, etc_list[i]) == 0) { | ||
| if (arg_debug) | ||
| printf("private-etc arguments: skip %s\n", file); | ||
| return; | ||
| } | ||
| } | ||
|
|
||
| char *ptr = strdup(file); | ||
| if (!ptr) | ||
| errExit("strdup"); | ||
| etc_list[etc_cnt++] = ptr; | ||
| etc_list[etc_cnt] = NULL; | ||
| } | ||
|
|
||
| // str can be NULL | ||
| char *fs_etc_build(char *str) { | ||
| while (etc_list[etc_cnt++]); | ||
| etc_cnt--; | ||
| if (!arg_nonetwork) | ||
| etc_copy_group(&etc_group_network[0]); | ||
| if (!arg_nosound) | ||
| etc_copy_group(&etc_group_sound[0]); | ||
|
|
||
| // parsing | ||
| if (str) { | ||
| char* ptr = strtok(str, ","); | ||
| while (ptr) { | ||
| // look for standard groups | ||
| if (strcmp(ptr, "TLS-CA") == 0) | ||
| etc_copy_group(&etc_group_tls_ca[0]); | ||
| if (strcmp(ptr, "GNOME") == 0) | ||
| etc_copy_group(&etc_group_gnome[0]); | ||
| if (strcmp(ptr, "KDE") == 0) | ||
| etc_copy_group(&etc_group_kde[0]); | ||
| else | ||
| etc_add(ptr); | ||
| ptr = strtok(NULL, ","); | ||
| } | ||
| } | ||
|
|
||
| // manufacture the new string | ||
| int len = 0; | ||
| int i; | ||
| for (i = 0; i < etc_cnt; i++) | ||
| len += strlen(etc_list[i]) + 1; // plus 1 for the trailing ',' | ||
| char *rv = malloc(len + 1); | ||
| if (!rv) | ||
| errExit("malloc"); | ||
| char *ptr = rv; | ||
| for (i = 0; i < etc_cnt; i++) { | ||
| sprintf(ptr, "%s,", etc_list[i]); | ||
| ptr += strlen(etc_list[i]) + 1; | ||
| } | ||
|
|
||
| return rv; | ||
| } | ||
|
|
||
| void fs_resolvconf(void) { | ||
| if (arg_debug) | ||
|
|
@@ -178,19 +316,11 @@ static int check_dir_or_file(const char *fname) { | |
| } | ||
|
|
||
| static void duplicate(const char *fname, const char *private_dir, const char *private_run_dir) { | ||
| char *src; | ||
| if (asprintf(&src, "%s/%s", private_dir, fname) == -1) | ||
| errExit("asprintf"); | ||
|
|
||
| if (check_dir_or_file(src) == 0) { | ||
| free(src); | ||
| return; | ||
| } | ||
|
|
@@ -204,8 +334,9 @@ static void duplicate(const char *fname, const char *private_dir, const char *pr | |
|
|
||
| build_dirs(src, dst, strlen(private_dir), strlen(private_run_dir)); | ||
|
|
||
| // follow links by default, thus making a copy of the file or directory pointed by the symlink | ||
| // this will solve problems such as NixOS #4887 | ||
| // | ||
| // don't follow links to dynamic directories such as /proc | ||
| if (strcmp(src, "/etc/mtab") == 0) | ||
| sbox_run(SBOX_ROOT | SBOX_SECCOMP, 3, PATH_FCOPY, src, dst); | ||
|
|
@@ -214,9 +345,38 @@ static void duplicate(const char *fname, const char *private_dir, const char *pr | |
|
|
||
| free(dst); | ||
| fs_logger2("clone", src); | ||
| } | ||
|
|
||
| static void duplicate_globbing(const char *fname, const char *private_dir, const char *private_run_dir) { | ||
| assert(fname); | ||
|
|
||
| if (*fname == '~' || *fname == '/' || strstr(fname, "..")) { | ||
| fprintf(stderr, "Error: \"%s\" is an invalid filename\n", fname); | ||
| exit(1); | ||
| } | ||
| invalid_filename(fname, 1); // no globbing | ||
|
|
||
| char *pattern; | ||
| if (asprintf(&pattern, "%s/%s", private_dir, fname) == -1) | ||
| errExit("asprintf"); | ||
|
|
||
| glob_t globbuf; | ||
| int globerr = glob(pattern, GLOB_NOCHECK | GLOB_NOSORT | GLOB_PERIOD, NULL, &globbuf); | ||
| if (globerr) { | ||
| fprintf(stderr, "Error: failed to glob pattern %s\n", pattern); | ||
| exit(1); | ||
| } | ||
|
|
||
| size_t i; | ||
| int len = strlen(private_dir); | ||
| for (i = 0; i < globbuf.gl_pathc; i++) { | ||
| char *path = globbuf.gl_pathv[i]; | ||
| duplicate(path + len + 1, private_dir, private_run_dir); | ||
| } | ||
|
|
||
| globfree(&globbuf); | ||
| free(pattern); | ||
| } | ||
|
|
||
| void fs_private_dir_copy(const char *private_dir, const char *private_run_dir, const char *private_list) { | ||
| assert(private_dir); | ||
|
|
@@ -256,10 +416,10 @@ void fs_private_dir_copy(const char *private_dir, const char *private_run_dir, c | |
| fprintf(stderr, "Error: invalid private %s argument\n", private_dir); | ||
| exit(1); | ||
| } | ||
| duplicate_globbing(ptr, private_dir, private_run_dir); | ||
|
|
||
| while ((ptr = strtok(NULL, ",")) != NULL) | ||
| duplicate_globbing(ptr, private_dir, private_run_dir); | ||
| free(dlist); | ||
| fs_logger_print(); | ||
| } | ||
|
|
@@ -297,135 +457,3 @@ void fs_private_dir_list(const char *private_dir, const char *private_run_dir, c | |
| fmessage("Private %s installed in %0.2f ms\n", private_dir, timetrace_end()); | ||
| } | ||
|
|
||
7 comments
on commit d1124df
There was a problem hiding this comment.
I'm not quite sure if this commit is the culprit - but today executing
man firejail
shows the following output:
Error mount: fs_etc.c:196 fs_resolvconf: No such file or directory
Error: proc 274712 cannot sync with peer: unexpected EOF
Peer 274713 unexpectedly exited with status 1
Adding resolv.conf to private-etc fixes it.
There was a problem hiding this comment.
@curiosityseeker Nice find. I did similar work for some profiles in #5609 but I obviously missed man.profile. Please open a PR for it. We need a regex guru to find all potentially affected profiles :-)
There was a problem hiding this comment.
Do I understand correctly and resolv.conf should be added to
There was a problem hiding this comment.
IMO no, resolv.conf is not always required. It only needs to be there when DNS resolving is required. So not when a profile has net none or protocol unix (like man.profile has). In fact, for me, man firejail works fine without resolv.conf in private-etc. Not sure why @curiosityseeker needs it though...
There was a problem hiding this comment.
@glitsj16 : Thanks for this hint! Further digging revealed that the culprit was a
dns 127.0.0.1
in my globals.local file (to make sure that every dns request goes through dnscrypt-proxy). Commenting that entry (or adding ignore dns 127.0.0.1 to man.local) fixed the problem - but I'm not sure why.
There was a problem hiding this comment.
@curiosityseeker Glad to read you've got it working now. Here's my take on why you need to ignore it for the man.profile. If you set a DNS server (or several) for the sandbox, that implies having access to /etc/resolv.conf for DNS resolving to work from inside the sandbox. Because man.profile disables networking (as it should) via net none and protocol unix and hides /etc/resolv.conf by not having it in private-etc, the configured server listening on 127.0.0.1 can't be reached and the sandbox falls apart at this point.
I can see why you'd want to have dns foo in globals.local and IMO it will work fine with most profiles. But there are exceptions so you might have to double-check your profiles/overrides now private-etc is being reworked.
There was a problem hiding this comment.
We have new code for resolv.conf. Currently, it is a war zone, so keep an eye on it!
Currently
locale.genis not used in any of our profiles using private-etc. Is it really needed? Or is more work following that requires it? In other words, I'm just wondering why a file used to generate locales is allowed in private-etc.