diff options
author | 2021-05-31 20:44:46 +0200 | |
---|---|---|
committer | 2021-05-31 18:44:46 +0000 | |
commit | c3c52ef0a64cc04676a551d8bbb4d80a8ac61954 (patch) | |
tree | 64dba1165997a3858e9e2ed69f442fbc837d846d | |
parent | --debug takes precedence over --quiet (#2743) (diff) | |
download | firejail-c3c52ef0a64cc04676a551d8bbb4d80a8ac61954.tar.gz firejail-c3c52ef0a64cc04676a551d8bbb4d80a8ac61954.tar.zst firejail-c3c52ef0a64cc04676a551d8bbb4d80a8ac61954.zip |
reorganizing links browsers (#4320)
* Create links-common.profile
* Update links.profile
* Create links2.profile
* Update links.profile
* Update links2.profile
* Update elinks.profile
* Update elinks.profile
* links2
* Update firecfg.config
* Update xlinks.profile
* .xlinks
* add dbus and whitelist-usr-share-common
* .xlinks doesn't exist
* revert
* Create xlinks2
* xlinks2
* Update xlinks2
* Update xlinks.profile
* no wayland
* no wayland
* doesn't use /tmp/.X11-unix
* doesn't use /tmp/.X11-unix
* noblacklist /tmp/.X11-unix
* noblacklist /tmp/.X11-unix
-rw-r--r-- | etc/inc/disable-programs.inc | 1 | ||||
-rw-r--r-- | etc/profile-a-l/elinks.profile | 38 | ||||
-rw-r--r-- | etc/profile-a-l/links-common.profile | 63 | ||||
-rw-r--r-- | etc/profile-a-l/links.profile | 54 | ||||
-rw-r--r-- | etc/profile-a-l/links2.profile | 18 | ||||
-rw-r--r-- | etc/profile-m-z/xlinks.profile | 1 | ||||
-rw-r--r-- | etc/profile-m-z/xlinks2 | 20 | ||||
-rw-r--r-- | src/firecfg/firecfg.config | 2 |
8 files changed, 113 insertions, 84 deletions
diff --git a/etc/inc/disable-programs.inc b/etc/inc/disable-programs.inc index 518587957..18d1978fc 100644 --- a/etc/inc/disable-programs.inc +++ b/etc/inc/disable-programs.inc | |||
@@ -589,6 +589,7 @@ blacklist ${HOME}/.kodi | |||
589 | blacklist ${HOME}/.librewolf | 589 | blacklist ${HOME}/.librewolf |
590 | blacklist ${HOME}/.lincity-ng | 590 | blacklist ${HOME}/.lincity-ng |
591 | blacklist ${HOME}/.links | 591 | blacklist ${HOME}/.links |
592 | blacklist ${HOME}/.links2 | ||
592 | blacklist ${HOME}/.linphone-history.db | 593 | blacklist ${HOME}/.linphone-history.db |
593 | blacklist ${HOME}/.linphonerc | 594 | blacklist ${HOME}/.linphonerc |
594 | blacklist ${HOME}/.lmmsrc.xml | 595 | blacklist ${HOME}/.lmmsrc.xml |
diff --git a/etc/profile-a-l/elinks.profile b/etc/profile-a-l/elinks.profile index 8120725d2..5a29eb24b 100644 --- a/etc/profile-a-l/elinks.profile +++ b/etc/profile-a-l/elinks.profile | |||
@@ -1,6 +1,7 @@ | |||
1 | # Firejail profile for elinks | 1 | # Firejail profile for elinks |
2 | # Description: Advanced text-mode WWW browser | 2 | # Description: Advanced text-mode WWW browser |
3 | # This file is overwritten after every install/update | 3 | # This file is overwritten after every install/update |
4 | quiet | ||
4 | # Persistent local customizations | 5 | # Persistent local customizations |
5 | include elinks.local | 6 | include elinks.local |
6 | # Persistent global definitions | 7 | # Persistent global definitions |
@@ -8,37 +9,10 @@ include globals.local | |||
8 | 9 | ||
9 | noblacklist ${HOME}/.elinks | 10 | noblacklist ${HOME}/.elinks |
10 | 11 | ||
11 | blacklist /tmp/.X11-unix | 12 | mkdir ${HOME}/.elinks |
12 | blacklist ${RUNUSER}/wayland-* | 13 | whitelist ${HOME}/.elinks |
13 | 14 | ||
14 | include disable-common.inc | 15 | private-bin elinks |
15 | include disable-devel.inc | ||
16 | include disable-interpreters.inc | ||
17 | include disable-passwdmgr.inc | ||
18 | include disable-programs.inc | ||
19 | include disable-xdg.inc | ||
20 | 16 | ||
21 | include whitelist-runuser-common.inc | 17 | # Redirect |
22 | 18 | include links-common.profile | |
23 | caps.drop all | ||
24 | netfilter | ||
25 | no3d | ||
26 | nodvd | ||
27 | nogroups | ||
28 | noinput | ||
29 | nonewprivs | ||
30 | noroot | ||
31 | nosound | ||
32 | notv | ||
33 | nou2f | ||
34 | novideo | ||
35 | protocol unix,inet,inet6 | ||
36 | seccomp | ||
37 | shell none | ||
38 | tracelog | ||
39 | |||
40 | # private-bin elinks | ||
41 | private-cache | ||
42 | private-dev | ||
43 | # private-etc alternatives,ca-certificates,crypto-policies,pki,ssl | ||
44 | private-tmp | ||
diff --git a/etc/profile-a-l/links-common.profile b/etc/profile-a-l/links-common.profile new file mode 100644 index 000000000..cd885b1d4 --- /dev/null +++ b/etc/profile-a-l/links-common.profile | |||
@@ -0,0 +1,63 @@ | |||
1 | # This file is overwritten during software install. | ||
2 | # Persistent customizations should go in a .local file. | ||
3 | include links-common.local | ||
4 | |||
5 | # common profile for links browsers | ||
6 | |||
7 | blacklist /tmp/.X11-unix | ||
8 | blacklist ${RUNUSER}/wayland-* | ||
9 | |||
10 | include disable-common.inc | ||
11 | include disable-devel.inc | ||
12 | include disable-exec.inc | ||
13 | include disable-interpreters.inc | ||
14 | include disable-passwdmgr.inc | ||
15 | # Additional noblacklist files/directories (blacklisted in disable-programs.inc) | ||
16 | # used as associated programs can be added in your links-common.local. | ||
17 | include disable-programs.inc | ||
18 | include disable-xdg.inc | ||
19 | |||
20 | whitelist ${DOWNLOADS} | ||
21 | include whitelist-runuser-common.inc | ||
22 | include whitelist-usr-share-common.inc | ||
23 | include whitelist-var-common.inc | ||
24 | |||
25 | caps.drop all | ||
26 | ipc-namespace | ||
27 | # Add 'ignore machine-id' to your links-common.local if you want to restrict access to | ||
28 | # the user-configured associated media player. | ||
29 | machine-id | ||
30 | netfilter | ||
31 | # Add 'ignore no3d' to your links-common.local if you want to restrict access to | ||
32 | # the user-configured associated media player. | ||
33 | no3d | ||
34 | nodvd | ||
35 | nogroups | ||
36 | noinput | ||
37 | nonewprivs | ||
38 | noroot | ||
39 | # Add 'ignore nosound' to your links-common.local if you want to restrict access to | ||
40 | # the user-configured associated media player. | ||
41 | nosound | ||
42 | notv | ||
43 | nou2f | ||
44 | novideo | ||
45 | protocol unix,inet,inet6 | ||
46 | seccomp | ||
47 | shell none | ||
48 | tracelog | ||
49 | |||
50 | disable-mnt | ||
51 | # Add 'private-bin PROGRAM1,PROGRAM2' to your links-common.local if you want to use user-configured programs. | ||
52 | private-bin sh | ||
53 | private-cache | ||
54 | private-dev | ||
55 | private-etc alternatives,ca-certificates,crypto-policies,nsswitch.conf,pki,resolv.conf,ssl | ||
56 | # Add the next line to your links-common.local to allow external media players. | ||
57 | # private-etc alsa,asound.conf,machine-id,openal,pulse | ||
58 | private-tmp | ||
59 | |||
60 | dbus-user none | ||
61 | dbus-system none | ||
62 | |||
63 | memory-deny-write-execute | ||
diff --git a/etc/profile-a-l/links.profile b/etc/profile-a-l/links.profile index a1eeda14a..8ce39cc7f 100644 --- a/etc/profile-a-l/links.profile +++ b/etc/profile-a-l/links.profile | |||
@@ -9,58 +9,10 @@ include globals.local | |||
9 | 9 | ||
10 | noblacklist ${HOME}/.links | 10 | noblacklist ${HOME}/.links |
11 | 11 | ||
12 | blacklist /tmp/.X11-unix | ||
13 | blacklist ${RUNUSER}/wayland-* | ||
14 | |||
15 | include disable-common.inc | ||
16 | include disable-devel.inc | ||
17 | include disable-exec.inc | ||
18 | include disable-interpreters.inc | ||
19 | include disable-passwdmgr.inc | ||
20 | # Additional noblacklist files/directories (blacklisted in disable-programs.inc) | ||
21 | # used as associated programs can be added in your links.local. | ||
22 | include disable-programs.inc | ||
23 | include disable-xdg.inc | ||
24 | |||
25 | mkdir ${HOME}/.links | 12 | mkdir ${HOME}/.links |
26 | whitelist ${HOME}/.links | 13 | whitelist ${HOME}/.links |
27 | whitelist ${DOWNLOADS} | ||
28 | include whitelist-runuser-common.inc | ||
29 | include whitelist-var-common.inc | ||
30 | |||
31 | caps.drop all | ||
32 | ipc-namespace | ||
33 | # Add 'ignore machine-id' to your links.local if you want to restrict access to | ||
34 | # the user-configured associated media player. | ||
35 | machine-id | ||
36 | netfilter | ||
37 | # Add 'ignore no3d' to your links.local if you want to restrict access to | ||
38 | # the user-configured associated media player. | ||
39 | no3d | ||
40 | nodvd | ||
41 | nogroups | ||
42 | noinput | ||
43 | nonewprivs | ||
44 | noroot | ||
45 | # Add 'ignore nosound' to your links.local if you want to restrict access to | ||
46 | # the user-configured associated media player. | ||
47 | nosound | ||
48 | notv | ||
49 | nou2f | ||
50 | novideo | ||
51 | protocol unix,inet,inet6 | ||
52 | seccomp | ||
53 | shell none | ||
54 | tracelog | ||
55 | 14 | ||
56 | disable-mnt | 15 | private-bin links |
57 | # Add 'private-bin PROGRAM1,PROGRAM2' to your links.local if you want to use user-configured programs. | ||
58 | private-bin links,sh | ||
59 | private-cache | ||
60 | private-dev | ||
61 | private-etc alternatives,ca-certificates,crypto-policies,nsswitch.conf,pki,resolv.conf,ssl | ||
62 | # Add the next line to your links.local to allow external media players. | ||
63 | # private-etc alsa,asound.conf,machine-id,openal,pulse | ||
64 | private-tmp | ||
65 | 16 | ||
66 | memory-deny-write-execute | 17 | # Redirect |
18 | include links-common.profile | ||
diff --git a/etc/profile-a-l/links2.profile b/etc/profile-a-l/links2.profile new file mode 100644 index 000000000..5f91dfcd2 --- /dev/null +++ b/etc/profile-a-l/links2.profile | |||
@@ -0,0 +1,18 @@ | |||
1 | # Firejail profile for links2 | ||
2 | # Description: Text WWW browser with a graphic version | ||
3 | # This file is overwritten after every install/update | ||
4 | quiet | ||
5 | # Persistent local customizations | ||
6 | include links2.local | ||
7 | # Persistent global definitions | ||
8 | include globals.local | ||
9 | |||
10 | noblacklist ${HOME}/.links2 | ||
11 | |||
12 | mkdir ${HOME}/.links2 | ||
13 | whitelist ${HOME}/.links2 | ||
14 | |||
15 | private-bin links2 | ||
16 | |||
17 | # Redirect | ||
18 | include links-common.profile | ||
diff --git a/etc/profile-m-z/xlinks.profile b/etc/profile-m-z/xlinks.profile index 7987af280..d5e25cfe7 100644 --- a/etc/profile-m-z/xlinks.profile +++ b/etc/profile-m-z/xlinks.profile | |||
@@ -8,7 +8,6 @@ include xlinks.local | |||
8 | #include globals.local | 8 | #include globals.local |
9 | 9 | ||
10 | noblacklist /tmp/.X11-unix | 10 | noblacklist /tmp/.X11-unix |
11 | noblacklist ${HOME}/.links | ||
12 | 11 | ||
13 | include whitelist-common.inc | 12 | include whitelist-common.inc |
14 | 13 | ||
diff --git a/etc/profile-m-z/xlinks2 b/etc/profile-m-z/xlinks2 new file mode 100644 index 000000000..1ae6a60ca --- /dev/null +++ b/etc/profile-m-z/xlinks2 | |||
@@ -0,0 +1,20 @@ | |||
1 | # Firejail profile for xlinks2 | ||
2 | # Description: Text WWW browser (X11) | ||
3 | # This file is overwritten after every install/update | ||
4 | # Persistent local customizations | ||
5 | include xlinks2.local | ||
6 | # Persistent global definitions | ||
7 | # added by included profile | ||
8 | #include globals.local | ||
9 | |||
10 | noblacklist /tmp/.X11-unix | ||
11 | |||
12 | include whitelist-common.inc | ||
13 | |||
14 | # if you want to use user-configured programs add 'private-bin PROGRAM1,PROGRAM2' | ||
15 | # to your xlinks.local or append 'PROGRAM1,PROGRAM2' to this private-bin line | ||
16 | private-bin xlinks2 | ||
17 | private-etc fonts | ||
18 | |||
19 | # Redirect | ||
20 | include links2.profile | ||
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config index f0e3a887f..245e6a4a0 100644 --- a/src/firecfg/firecfg.config +++ b/src/firecfg/firecfg.config | |||
@@ -452,6 +452,7 @@ liferea | |||
452 | lightsoff | 452 | lightsoff |
453 | lincity-ng | 453 | lincity-ng |
454 | links | 454 | links |
455 | links2 | ||
455 | linphone | 456 | linphone |
456 | lmms | 457 | lmms |
457 | lobase | 458 | lobase |
@@ -871,6 +872,7 @@ xfce4-notes | |||
871 | xfce4-screenshooter | 872 | xfce4-screenshooter |
872 | xiphos | 873 | xiphos |
873 | xlinks | 874 | xlinks |
875 | xlinks2 | ||
874 | xmms | 876 | xmms |
875 | xmr-stak | 877 | xmr-stak |
876 | xonotic | 878 | xonotic |