aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Tad <tad@spotco.us>2018-05-21 18:08:21 -0400
committerLibravatar Tad <tad@spotco.us>2018-05-21 18:08:21 -0400
commit1e3939289f53fd84c92f57bd3144a0eec2dcf1e3 (patch)
tree065dd015885179a4468febabf787c2d6c7fd193c
parentprivate-lib cleanup (diff)
downloadfirejail-1e3939289f53fd84c92f57bd3144a0eec2dcf1e3.tar.gz
firejail-1e3939289f53fd84c92f57bd3144a0eec2dcf1e3.tar.zst
firejail-1e3939289f53fd84c92f57bd3144a0eec2dcf1e3.zip
Fixup Discord profiles
Packagers seem to be all using different names
-rw-r--r--etc/Discord.profile17
-rw-r--r--etc/DiscordCanary.profile18
-rw-r--r--etc/disable-programs.inc2
-rw-r--r--etc/discord-canary.profile21
-rw-r--r--etc/discord-common.profile32
-rw-r--r--etc/discord.profile28
-rw-r--r--src/firecfg/firecfg.config3
7 files changed, 86 insertions, 35 deletions
diff --git a/etc/Discord.profile b/etc/Discord.profile
new file mode 100644
index 000000000..d485518a8
--- /dev/null
+++ b/etc/Discord.profile
@@ -0,0 +1,17 @@
1# Firejail profile for Discord
2# This file is overwritten after every install/update
3# Persistent local customizations
4include /etc/firejail/Discord.local
5# Persistent global definitions
6include /etc/firejail/globals.local
7
8
9noblacklist ${HOME}/.config/discord
10
11mkdir ${HOME}/.config/discord
12whitelist ${HOME}/.config/discord
13
14private-bin Discord
15private-opt Discord
16
17include /etc/firejail/discord-common.profile
diff --git a/etc/DiscordCanary.profile b/etc/DiscordCanary.profile
new file mode 100644
index 000000000..f7b0e2c56
--- /dev/null
+++ b/etc/DiscordCanary.profile
@@ -0,0 +1,18 @@
1# Firejail profile for DiscordCanary
2# This file is overwritten after every install/update
3# Persistent local customizations
4include /etc/firejail/DiscordCanary.local
5# Persistent global definitions
6include /etc/firejail/globals.local
7
8
9noblacklist ${HOME}/.config/discordcanary
10
11mkdir ${HOME}/.config/discordcanary
12whitelist ${HOME}/.config/discordcanary
13
14private-bin DiscordCanary
15private-opt DiscordCanary
16
17#Redirect
18include /etc/firejail/discord-common.profile
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index c7605d660..f1107d4a2 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -110,6 +110,8 @@ blacklist ${HOME}/.config/deadbeef
110blacklist ${HOME}/.config/deluge 110blacklist ${HOME}/.config/deluge
111blacklist ${HOME}/.config/digikam 111blacklist ${HOME}/.config/digikam
112blacklist ${HOME}/.config/digikamrc 112blacklist ${HOME}/.config/digikamrc
113blacklist ${HOME}/.config/discord
114blacklist ${HOME}/.config/discordcanary
113blacklist ${HOME}/.config/dolphinrc 115blacklist ${HOME}/.config/dolphinrc
114blacklist ${HOME}/.config/dragonplayerrc 116blacklist ${HOME}/.config/dragonplayerrc
115blacklist ${HOME}/.config/emaildefaults 117blacklist ${HOME}/.config/emaildefaults
diff --git a/etc/discord-canary.profile b/etc/discord-canary.profile
index 391af668e..b6958cbd3 100644
--- a/etc/discord-canary.profile
+++ b/etc/discord-canary.profile
@@ -5,19 +5,14 @@ include /etc/firejail/discord-canary.local
5# Persistent global definitions 5# Persistent global definitions
6include /etc/firejail/globals.local 6include /etc/firejail/globals.local
7 7
8include /etc/firejail/disable-common.inc
9include /etc/firejail/disable-passwdmgr.inc
10include /etc/firejail/disable-programs.inc
11 8
12whitelist ${DOWNLOADS} 9noblacklist ${HOME}/.config/discordcanary
10
11mkdir ${HOME}/.config/discordcanary
13whitelist ${HOME}/.config/discordcanary 12whitelist ${HOME}/.config/discordcanary
14 13
15caps.drop all 14private-bin discord-canary
16netfilter 15private-opt discord-canary
17nodvd 16
18nogroups 17#Redirect
19nonewprivs 18include /etc/firejail/discord-common.profile
20noroot
21notv
22protocol unix,inet,inet6,netlink
23seccomp
diff --git a/etc/discord-common.profile b/etc/discord-common.profile
new file mode 100644
index 000000000..5cd8d6bb6
--- /dev/null
+++ b/etc/discord-common.profile
@@ -0,0 +1,32 @@
1# Firejail profile for discord
2# This file is overwritten after every install/update
3# Persistent local customizations
4include /etc/firejail/discord-common.local
5# Persistent global definitions
6include /etc/firejail/globals.local
7
8include /etc/firejail/disable-common.inc
9include /etc/firejail/disable-devel.inc
10include /etc/firejail/disable-passwdmgr.inc
11include /etc/firejail/disable-programs.inc
12
13whitelist ${DOWNLOADS}
14
15caps.drop all
16netfilter
17nodvd
18nogroups
19nonewprivs
20noroot
21notv
22novideo
23protocol unix,inet,inet6,netlink
24seccomp
25
26private-bin sh,xdg-mime,tr,sed,echo,head,cut,xdg-open,grep,egrep
27private-dev
28private-etc fonts,machine-id
29private-tmp
30
31noexec ${HOME}
32noexec /tmp
diff --git a/etc/discord.profile b/etc/discord.profile
index 40deae2fc..21d46193e 100644
--- a/etc/discord.profile
+++ b/etc/discord.profile
@@ -1,33 +1,17 @@
1# Firejail profile for Discord 1# Firejail profile for discord
2# This file is overwritten after every install/update 2# This file is overwritten after every install/update
3# Persistent local customizations 3# Persistent local customizations
4include /etc/firejail/discord.local 4include /etc/firejail/discord.local
5# Persistent global definitions 5# Persistent global definitions
6include /etc/firejail/globals.local 6include /etc/firejail/globals.local
7 7
8include /etc/firejail/disable-common.inc 8
9include /etc/firejail/disable-devel.inc 9noblacklist ${HOME}/.config/discord
10include /etc/firejail/disable-passwdmgr.inc
11include /etc/firejail/disable-programs.inc
12 10
13mkdir ${HOME}/.config/discord 11mkdir ${HOME}/.config/discord
14whitelist ${HOME}/.config/discord 12whitelist ${HOME}/.config/discord
15 13
16caps.drop all 14private-bin discord
17netfilter 15private-opt discord
18nodvd
19nogroups
20nonewprivs
21noroot
22notv
23novideo
24protocol unix,inet,inet6,netlink
25seccomp
26
27private-bin discord,sh,xdg-mime,tr,sed,echo,head,cut,xdg-open,grep,egrep
28private-dev
29private-etc fonts,machine-id
30private-tmp
31 16
32noexec ${HOME} 17include /etc/firejail/discord-common.profile
33noexec /tmp
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 1bfc9e66e..bcda4f26b 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -6,6 +6,8 @@
60ad 60ad
72048-qt 72048-qt
8Cyberfox 8Cyberfox
9Discord
10DiscordCanary
9FossaMail 11FossaMail
10Fritzing 12Fritzing
11Mathematica 13Mathematica
@@ -94,6 +96,7 @@ dia
94digikam 96digikam
95dillo 97dillo
96dino 98dino
99discord
97discord-canary 100discord-canary
98display 101display
99dnox 102dnox