mirror of
https://github.com/netblue30/firejail.git
synced 2026-05-21 06:45:29 -06:00
f43382f1e9
This reverts commitfe0f975f44. Note: This only reverts the changes from etc. The 4 aliases introduced on commit45f2ba544are 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 commitfe0f975f4would 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 revertfe0f975f4and 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 onfe0f975f44, but have not # been changed afterwards and list them on "filestorevert" git show --pretty='' --name-onlyfe0f975f44-- 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 commitfe0f975f44wc -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 showfe0f975f44-- | 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 beforefe0f975f44and 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 afterfe0f975f44) 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
77 lines
2.4 KiB
Text
77 lines
2.4 KiB
Text
# Firejail profile for gnome-maps
|
|
# Description: Map application for GNOME
|
|
# This file is overwritten after every install/update
|
|
# Persistent local customizations
|
|
include gnome-maps.local
|
|
# Persistent global definitions
|
|
include globals.local
|
|
|
|
# Some distributions use gapplications to start gnome-maps over D-Bus. As firecfg cannot handle that, you need to run the following command.
|
|
# sed -e "s/Exec=gapplication launch org.gnome.Maps %U/Exec=gnome-maps %U/" -e "s/DBusActivatable=true/DBusActivatable=false/" "/usr/share/applications/org.gnome.Maps.desktop" > "~/.local/share/applications/org.gnome.Maps.desktop"
|
|
|
|
# when gjs apps are started via gnome-shell, firejail is not applied because systemd will start them
|
|
|
|
noblacklist ${HOME}/.cache/champlain
|
|
noblacklist ${HOME}/.cache/org.gnome.Maps
|
|
noblacklist ${HOME}/.local/share/maps-places.json
|
|
|
|
# Allow gjs (blacklisted by disable-interpreters.inc)
|
|
include allow-gjs.inc
|
|
|
|
blacklist /usr/libexec
|
|
|
|
include disable-common.inc
|
|
include disable-devel.inc
|
|
include disable-exec.inc
|
|
include disable-interpreters.inc
|
|
include disable-passwdmgr.inc
|
|
include disable-programs.inc
|
|
include disable-shell.inc
|
|
include disable-xdg.inc
|
|
|
|
mkdir ${HOME}/.cache/champlain
|
|
mkfile ${HOME}/.local/share/maps-places.json
|
|
whitelist ${HOME}/.cache/champlain
|
|
whitelist ${HOME}/.local/share/maps-places.json
|
|
whitelist ${DOWNLOADS}
|
|
whitelist ${PICTURES}
|
|
whitelist /usr/share/gnome-maps
|
|
whitelist /usr/share/libgweather
|
|
include whitelist-common.inc
|
|
include whitelist-runuser-common.inc
|
|
include whitelist-usr-share-common.inc
|
|
include whitelist-var-common.inc
|
|
|
|
apparmor
|
|
caps.drop all
|
|
machine-id
|
|
netfilter
|
|
nodvd
|
|
nogroups
|
|
noinput
|
|
nonewprivs
|
|
noroot
|
|
nosound
|
|
notv
|
|
nou2f
|
|
novideo
|
|
protocol unix,inet,inet6
|
|
seccomp
|
|
seccomp.block-secondary
|
|
shell none
|
|
tracelog
|
|
|
|
disable-mnt
|
|
private-bin gjs,gnome-maps
|
|
# private-cache -- gnome-maps cache all maps/satelite-images
|
|
private-dev
|
|
private-etc alternatives,ca-certificates,clutter-1.0,crypto-policies,dconf,drirc,fonts,gconf,gcrypt,gtk-3.0,host.conf,hostname,hosts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,locale,locale.alias,locale.conf,localtime,mime.types,nsswitch.conf,pango,pkcs11,pki,protocols,resolv.conf,rpc,services,ssl,X11,xdg
|
|
private-tmp
|
|
|
|
dbus-user filter
|
|
dbus-user.own org.gnome.Maps
|
|
#dbus-user.talk org.freedesktop.secrets
|
|
#dbus-user.talk org.gnome.OnlineAccounts
|
|
dbus-system filter
|
|
#dbus-system.talk org.freedesktop.NetworkManager
|
|
dbus-system.talk org.freedesktop.GeoClue2
|