github-starred/firejail
2
0
Fork 0
mirror of https://github.com/netblue30/firejail.git synced 2026-05-21 06:45:29 -06:00
Code Issues 531 Projects Packages Wiki Activity Actions 1

Merge pull request #32 from pmillerchip/tilde-support

Browse source 
Support ~ in blacklist and profile includes
This commit is contained in:
netblue30 2015-08-18 12:16:45 -04:00
commit 85273ce7d1
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/firejail/fs.c
View file

@ -297,6 +297,11 @@ void fs_blacklist(const char *homedir) {
errExit("asprintf");
ptr = new_name;
}
else if (strncmp(ptr, "~/", 2) == 0) {
if (asprintf(&new_name, "%s%s", homedir, ptr + 1) == -1)
errExit("asprintf");
ptr = new_name;
}
// expand path macro - look for the file in /bin, /usr/bin, /sbin and /usr/sbin directories
if (strncmp(ptr, "${PATH}", 7) == 0) {

4
src/firejail/profile.c
View file

@ -430,6 +430,10 @@ void profile_read(const char *fname, const char *skip1, const char *skip2) {
if (asprintf(&newprofile2, "%s%s", cfg.homedir, newprofile + 7) == -1)
errExit("asprintf");
}
else if (strncmp(newprofile, "~/", 2) == 0) {
if (asprintf(&newprofile2, "%s%s", cfg.homedir, newprofile + 1) == -1)
errExit("asprintf");
}
// recursivity
profile_read((newprofile2)? newprofile2:newprofile, newskip1, newskip2);

5
todo
View file

@ -1,6 +1,3 @@
1. Deal with .purple directory. It holds the confiig files for pidgin
2. Support ~ in --blacklist filenames, maybe in some other options. Example
$ firejail --blacklist=~/.ssh
3. Support filenames with spaces in blacklist option.
2. Support filenames with spaces in blacklist option.