diff options
-rw-r--r-- | src/firecfg/firecfg.h | 2 | ||||
-rw-r--r-- | src/firecfg/main.c | 43 |
2 files changed, 32 insertions, 13 deletions
diff --git a/src/firecfg/firecfg.h b/src/firecfg/firecfg.h index 11e3ebc67..d42c937cf 100644 --- a/src/firecfg/firecfg.h +++ b/src/firecfg/firecfg.h | |||
@@ -50,6 +50,8 @@ | |||
50 | 50 | ||
51 | // main.c | 51 | // main.c |
52 | extern int arg_debug; | 52 | extern int arg_debug; |
53 | int in_ignorelist(const char *const str); | ||
54 | void parse_config_all(int do_symlink); | ||
53 | 55 | ||
54 | // util.c | 56 | // util.c |
55 | int which(const char *program); | 57 | int which(const char *program); |
diff --git a/src/firecfg/main.c b/src/firecfg/main.c index 40493159e..f641c1ace 100644 --- a/src/firecfg/main.c +++ b/src/firecfg/main.c | |||
@@ -25,6 +25,7 @@ | |||
25 | int arg_debug = 0; | 25 | int arg_debug = 0; |
26 | char *arg_bindir = "/usr/local/bin"; | 26 | char *arg_bindir = "/usr/local/bin"; |
27 | int arg_guide = 0; | 27 | int arg_guide = 0; |
28 | int done_config = 0; | ||
28 | 29 | ||
29 | static const char *const usage_str = | 30 | static const char *const usage_str = |
30 | "Firecfg is the desktop configuration utility for Firejail software. The utility\n" | 31 | "Firecfg is the desktop configuration utility for Firejail software. The utility\n" |
@@ -166,7 +167,7 @@ static int append_ignorelist(const char *const str) { | |||
166 | return 1; | 167 | return 1; |
167 | } | 168 | } |
168 | 169 | ||
169 | static int in_ignorelist(const char *const str) { | 170 | int in_ignorelist(const char *const str) { |
170 | assert(str); | 171 | assert(str); |
171 | int i; | 172 | int i; |
172 | for (i = 0; i < ignorelist_len; i++) { | 173 | for (i = 0; i < ignorelist_len; i++) { |
@@ -202,8 +203,11 @@ static void set_file(const char *name, const char *firejail_exec) { | |||
202 | } | 203 | } |
203 | 204 | ||
204 | // parse a single config file | 205 | // parse a single config file |
205 | static void set_links_firecfg(const char *cfgfile) { | 206 | static void parse_config_file(const char *cfgfile, int do_symlink) { |
206 | printf("Configuring symlinks in %s based on %s\n", arg_bindir, cfgfile); | 207 | if (do_symlink) |
208 | printf("Configuring symlinks in %s\n", arg_bindir); | ||
209 | |||
210 | printf("Parsing %s\n", cfgfile); | ||
207 | 211 | ||
208 | FILE *fp = fopen(cfgfile, "r"); | 212 | FILE *fp = fopen(cfgfile, "r"); |
209 | if (!fp) { | 213 | if (!fp) { |
@@ -246,11 +250,15 @@ static void set_links_firecfg(const char *cfgfile) { | |||
246 | continue; | 250 | continue; |
247 | } | 251 | } |
248 | 252 | ||
253 | // skip ignored programs | ||
254 | if (in_ignorelist(start)) { | ||
255 | printf(" %s ignored\n", start); | ||
256 | continue; | ||
257 | } | ||
258 | |||
249 | // set link | 259 | // set link |
250 | if (!in_ignorelist(start)) | 260 | if (do_symlink) |
251 | set_file(start, FIREJAIL_EXEC); | 261 | set_file(start, FIREJAIL_EXEC); |
252 | else | ||
253 | printf(" %s ignored\n", start); | ||
254 | } | 262 | } |
255 | 263 | ||
256 | fclose(fp); | 264 | fclose(fp); |
@@ -258,7 +266,7 @@ static void set_links_firecfg(const char *cfgfile) { | |||
258 | } | 266 | } |
259 | 267 | ||
260 | // parse all config files matching pattern | 268 | // parse all config files matching pattern |
261 | static void set_links_firecfg_glob(const char *pattern) { | 269 | static void parse_config_glob(const char *pattern, int do_symlink) { |
262 | printf("Looking for config files in %s\n", pattern); | 270 | printf("Looking for config files in %s\n", pattern); |
263 | 271 | ||
264 | glob_t globbuf; | 272 | glob_t globbuf; |
@@ -274,11 +282,23 @@ static void set_links_firecfg_glob(const char *pattern) { | |||
274 | 282 | ||
275 | size_t i; | 283 | size_t i; |
276 | for (i = 0; i < globbuf.gl_pathc; i++) | 284 | for (i = 0; i < globbuf.gl_pathc; i++) |
277 | set_links_firecfg(globbuf.gl_pathv[i]); | 285 | parse_config_file(globbuf.gl_pathv[i], do_symlink); |
278 | out: | 286 | out: |
279 | globfree(&globbuf); | 287 | globfree(&globbuf); |
280 | } | 288 | } |
281 | 289 | ||
290 | // parse all config files | ||
291 | // do_symlink 0 just builds the ignorelist, 1 creates the symlinks | ||
292 | void parse_config_all(int do_symlink) { | ||
293 | if (done_config) | ||
294 | return; | ||
295 | |||
296 | parse_config_glob(FIRECFG_CONF_GLOB, do_symlink); | ||
297 | parse_config_file(FIRECFG_CFGFILE, do_symlink); | ||
298 | |||
299 | done_config = 1; | ||
300 | } | ||
301 | |||
282 | // parse ~/.config/firejail/ directory | 302 | // parse ~/.config/firejail/ directory |
283 | static void set_links_homedir(const char *homedir) { | 303 | static void set_links_homedir(const char *homedir) { |
284 | assert(homedir); | 304 | assert(homedir); |
@@ -520,11 +540,8 @@ int main(int argc, char **argv) { | |||
520 | // clear all symlinks | 540 | // clear all symlinks |
521 | clean(); | 541 | clean(); |
522 | 542 | ||
523 | // set new symlinks based on .conf files | 543 | // set new symlinks based on config files |
524 | set_links_firecfg_glob(FIRECFG_CONF_GLOB); | 544 | parse_config_all(1); |
525 | |||
526 | // set new symlinks based on firecfg.config | ||
527 | set_links_firecfg(FIRECFG_CFGFILE); | ||
528 | 545 | ||
529 | if (getuid() == 0) { | 546 | if (getuid() == 0) { |
530 | // add user to firejail access database - only for root | 547 | // add user to firejail access database - only for root |