aboutsummaryrefslogtreecommitdiffstats
path: root/etc/profile-m-z/steam.profile
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2021-07-18 20:39:14 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2021-07-18 20:39:14 -0300
commitf43382f1e9707b4fd5e63c7bfe881912aa4ee994 (patch)
tree499639bb962c8b071b153dcdad1b42af8286521d /etc/profile-m-z/steam.profile
parentAdd MS Edge Beta profile (diff)
downloadfirejail-f43382f1e9707b4fd5e63c7bfe881912aa4ee994.tar.gz
firejail-f43382f1e9707b4fd5e63c7bfe881912aa4ee994.tar.zst
firejail-f43382f1e9707b4fd5e63c7bfe881912aa4ee994.zip
Revert "move whitelist/blacklist to allow/deny"
This reverts commit fe0f975f447d59977d90c3226cc8c623b31b20b3. Note: This only reverts the changes from etc. The 4 aliases introduced on commit 45f2ba544 are mere, well, aliases. That is, they fail to address the different usability problems discussed on [#3447][3447] and in fact only make things more confusing (as has already been mentioned on [this][4379] and later comments). The main reason is that the aliases do not meaningfully map to the original commands. For example, the commands from each pair below seem like they would do the exact same thing: * `allow` and `nodeny` * `deny` and `noallow` Additionally, if these aliases are not the final commands, but only a test/work-in-progress, then keeping the wide-scale search/replace changes made on commit fe0f975f4 would only serve to cause confusion, as users of firejail-git, contributors and downstream projects might start changing the commands used on their profiles, only to later have to change them again, potentially to completely different commands. The sooner this is undone the better, as (besides the above reasons) the more profile changes there are between the original commit and the revert, the harder it is to e.g.: `git diff` versions of files across the following revision ranges: before the commit, after the commit but before the revert and after the revert. Note: This is still the case even if a commit is [ignored by `git blame`][4390]. So let us revert fe0f975f4 and only reapply similar large-scale changes once we have discussed and settled on better commands. How the revert was applied: Despite using the auto-generated message from `git revert`, to ensure correctness and to avoid conflicts the changes were reverted in different steps: Firstly, revert the files which can be safely reverted directly ("filestorevert"): # Find out which files have been changed on fe0f975f44, but have not # been changed afterwards and list them on "filestorevert" git show --pretty='' --name-only fe0f975f44 -- etc | LC_ALL=C sort >allfiles git diff --name-only fe0f975f44..master -- etc | LC_ALL=C sort >filestoignore comm -2 -3 allfiles filestoignore >filestorevert # Note: There are 3 extra files on filestoignore because they were # added after commit fe0f975f44 wc -l allfiles filestoignore filestorevert | head -n 3 # 797 allfiles # 8 filestoignore # 792 filestorevert # Automatically revert files in "filestorevert" # See https://stackoverflow.com/a/23401018/10095231 tr '\n' '\000' <filestorevert | xargs -0 git show fe0f975f44 -- | git apply --reverse printf 'Total files reverted:\n' git diff --name-only | wc -l # 792 Secondly, do some search/replace on the rest: tr '\n' '\000' <filestoignore | xargs -0 sed -i.bak \ -e 's/allow /whitelist /' -e 's/noallow /nowhitelist /' \ -e 's/deny /blacklist /' -e 's/nodeny /noblacklist /' \ -e 's/deny-nolog /blacklist-nolog /' find etc -name '*.bak' -print0 | xargs -0 rm Thirdly, verify the result. The following command shows the difference between all the changes in etc from before fe0f975f44 and this commit (inclusive): git diff fe0f975f44~1 -- etc From the output, it looks like all alias changes are fully reverted and that the other changes to etc (from after fe0f975f44) remain, so the revert seems to be done correctly. [3447]: https://github.com/netblue30/firejail/issues/3447 [4379]: https://github.com/netblue30/firejail/issues/4379#issuecomment-876460222 [4390]: https://github.com/netblue30/firejail/issues/4390
Diffstat (limited to 'etc/profile-m-z/steam.profile')
-rw-r--r--etc/profile-m-z/steam.profile130
1 files changed, 65 insertions, 65 deletions
diff --git a/etc/profile-m-z/steam.profile b/etc/profile-m-z/steam.profile
index 09e29373d..06d08f3a2 100644
--- a/etc/profile-m-z/steam.profile
+++ b/etc/profile-m-z/steam.profile
@@ -6,40 +6,40 @@ include steam.local
6# Persistent global definitions 6# Persistent global definitions
7include globals.local 7include globals.local
8 8
9nodeny ${HOME}/.config/Epic 9noblacklist ${HOME}/.config/Epic
10nodeny ${HOME}/.config/Loop_Hero 10noblacklist ${HOME}/.config/Loop_Hero
11nodeny ${HOME}/.config/ModTheSpire 11noblacklist ${HOME}/.config/ModTheSpire
12nodeny ${HOME}/.config/RogueLegacy 12noblacklist ${HOME}/.config/RogueLegacy
13nodeny ${HOME}/.config/RogueLegacyStorageContainer 13noblacklist ${HOME}/.config/RogueLegacyStorageContainer
14nodeny ${HOME}/.killingfloor 14noblacklist ${HOME}/.killingfloor
15nodeny ${HOME}/.klei 15noblacklist ${HOME}/.klei
16nodeny ${HOME}/.local/share/3909/PapersPlease 16noblacklist ${HOME}/.local/share/3909/PapersPlease
17nodeny ${HOME}/.local/share/aspyr-media 17noblacklist ${HOME}/.local/share/aspyr-media
18nodeny ${HOME}/.local/share/bohemiainteractive 18noblacklist ${HOME}/.local/share/bohemiainteractive
19nodeny ${HOME}/.local/share/cdprojektred 19noblacklist ${HOME}/.local/share/cdprojektred
20nodeny ${HOME}/.local/share/Dredmor 20noblacklist ${HOME}/.local/share/Dredmor
21nodeny ${HOME}/.local/share/FasterThanLight 21noblacklist ${HOME}/.local/share/FasterThanLight
22nodeny ${HOME}/.local/share/feral-interactive 22noblacklist ${HOME}/.local/share/feral-interactive
23nodeny ${HOME}/.local/share/IntoTheBreach 23noblacklist ${HOME}/.local/share/IntoTheBreach
24nodeny ${HOME}/.local/share/Paradox Interactive 24noblacklist ${HOME}/.local/share/Paradox Interactive
25nodeny ${HOME}/.local/share/PillarsOfEternity 25noblacklist ${HOME}/.local/share/PillarsOfEternity
26nodeny ${HOME}/.local/share/RogueLegacy 26noblacklist ${HOME}/.local/share/RogueLegacy
27nodeny ${HOME}/.local/share/RogueLegacyStorageContainer 27noblacklist ${HOME}/.local/share/RogueLegacyStorageContainer
28nodeny ${HOME}/.local/share/Steam 28noblacklist ${HOME}/.local/share/Steam
29nodeny ${HOME}/.local/share/SteamWorldDig 29noblacklist ${HOME}/.local/share/SteamWorldDig
30nodeny ${HOME}/.local/share/SteamWorld Dig 2 30noblacklist ${HOME}/.local/share/SteamWorld Dig 2
31nodeny ${HOME}/.local/share/SuperHexagon 31noblacklist ${HOME}/.local/share/SuperHexagon
32nodeny ${HOME}/.local/share/Terraria 32noblacklist ${HOME}/.local/share/Terraria
33nodeny ${HOME}/.local/share/vpltd 33noblacklist ${HOME}/.local/share/vpltd
34nodeny ${HOME}/.local/share/vulkan 34noblacklist ${HOME}/.local/share/vulkan
35nodeny ${HOME}/.mbwarband 35noblacklist ${HOME}/.mbwarband
36nodeny ${HOME}/.paradoxinteractive 36noblacklist ${HOME}/.paradoxinteractive
37nodeny ${HOME}/.steam 37noblacklist ${HOME}/.steam
38nodeny ${HOME}/.steampath 38noblacklist ${HOME}/.steampath
39nodeny ${HOME}/.steampid 39noblacklist ${HOME}/.steampid
40# needed for STEAM_RUNTIME_PREFER_HOST_LIBRARIES=1 to work 40# needed for STEAM_RUNTIME_PREFER_HOST_LIBRARIES=1 to work
41nodeny /sbin 41noblacklist /sbin
42nodeny /usr/sbin 42noblacklist /usr/sbin
43 43
44# Allow java (blacklisted by disable-devel.inc) 44# Allow java (blacklisted by disable-devel.inc)
45include allow-java.inc 45include allow-java.inc
@@ -84,38 +84,38 @@ mkdir ${HOME}/.paradoxinteractive
84mkdir ${HOME}/.steam 84mkdir ${HOME}/.steam
85mkfile ${HOME}/.steampath 85mkfile ${HOME}/.steampath
86mkfile ${HOME}/.steampid 86mkfile ${HOME}/.steampid
87allow ${HOME}/.config/Epic 87whitelist ${HOME}/.config/Epic
88allow ${HOME}/.config/Loop_Hero 88whitelist ${HOME}/.config/Loop_Hero
89allow ${HOME}/.config/ModTheSpire 89whitelist ${HOME}/.config/ModTheSpire
90allow ${HOME}/.config/RogueLegacy 90whitelist ${HOME}/.config/RogueLegacy
91allow ${HOME}/.config/RogueLegacyStorageContainer 91whitelist ${HOME}/.config/RogueLegacyStorageContainer
92allow ${HOME}/.config/unity3d 92whitelist ${HOME}/.config/unity3d
93allow ${HOME}/.killingfloor 93whitelist ${HOME}/.killingfloor
94allow ${HOME}/.klei 94whitelist ${HOME}/.klei
95allow ${HOME}/.local/share/3909/PapersPlease 95whitelist ${HOME}/.local/share/3909/PapersPlease
96allow ${HOME}/.local/share/aspyr-media 96whitelist ${HOME}/.local/share/aspyr-media
97allow ${HOME}/.local/share/bohemiainteractive 97whitelist ${HOME}/.local/share/bohemiainteractive
98allow ${HOME}/.local/share/cdprojektred 98whitelist ${HOME}/.local/share/cdprojektred
99allow ${HOME}/.local/share/Dredmor 99whitelist ${HOME}/.local/share/Dredmor
100allow ${HOME}/.local/share/FasterThanLight 100whitelist ${HOME}/.local/share/FasterThanLight
101allow ${HOME}/.local/share/feral-interactive 101whitelist ${HOME}/.local/share/feral-interactive
102allow ${HOME}/.local/share/IntoTheBreach 102whitelist ${HOME}/.local/share/IntoTheBreach
103allow ${HOME}/.local/share/Paradox Interactive 103whitelist ${HOME}/.local/share/Paradox Interactive
104allow ${HOME}/.local/share/PillarsOfEternity 104whitelist ${HOME}/.local/share/PillarsOfEternity
105allow ${HOME}/.local/share/RogueLegacy 105whitelist ${HOME}/.local/share/RogueLegacy
106allow ${HOME}/.local/share/RogueLegacyStorageContainer 106whitelist ${HOME}/.local/share/RogueLegacyStorageContainer
107allow ${HOME}/.local/share/Steam 107whitelist ${HOME}/.local/share/Steam
108allow ${HOME}/.local/share/SteamWorldDig 108whitelist ${HOME}/.local/share/SteamWorldDig
109allow ${HOME}/.local/share/SteamWorld Dig 2 109whitelist ${HOME}/.local/share/SteamWorld Dig 2
110allow ${HOME}/.local/share/SuperHexagon 110whitelist ${HOME}/.local/share/SuperHexagon
111allow ${HOME}/.local/share/Terraria 111whitelist ${HOME}/.local/share/Terraria
112allow ${HOME}/.local/share/vpltd 112whitelist ${HOME}/.local/share/vpltd
113allow ${HOME}/.local/share/vulkan 113whitelist ${HOME}/.local/share/vulkan
114allow ${HOME}/.mbwarband 114whitelist ${HOME}/.mbwarband
115allow ${HOME}/.paradoxinteractive 115whitelist ${HOME}/.paradoxinteractive
116allow ${HOME}/.steam 116whitelist ${HOME}/.steam
117allow ${HOME}/.steampath 117whitelist ${HOME}/.steampath
118allow ${HOME}/.steampid 118whitelist ${HOME}/.steampid
119include whitelist-common.inc 119include whitelist-common.inc
120include whitelist-var-common.inc 120include whitelist-var-common.inc
121 121