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
57 lines
2.1 KiB
Text
57 lines
2.1 KiB
Text
# Firejail profile for Librewolf
|
|
# Description: Firefox fork based on privacy
|
|
# This file is overwritten after every install/update
|
|
# Persistent local customizations
|
|
include librewolf.local
|
|
# Persistent global definitions
|
|
include globals.local
|
|
|
|
noblacklist ${HOME}/.cache/librewolf
|
|
noblacklist ${HOME}/.librewolf
|
|
|
|
mkdir ${HOME}/.cache/librewolf
|
|
mkdir ${HOME}/.librewolf
|
|
whitelist ${HOME}/.cache/librewolf
|
|
whitelist ${HOME}/.librewolf
|
|
|
|
# Add the next lines to your librewolf.local if you want to use the migration wizard.
|
|
#noblacklist ${HOME}/.mozilla
|
|
#whitelist ${HOME}/.mozilla
|
|
|
|
# To enable KeePassXC Plugin add one of the following lines to your librewolf.local.
|
|
# NOTE: start KeePassXC before Librewolf and keep it open to allow communication between them.
|
|
#whitelist ${RUNUSER}/kpxc_server
|
|
#whitelist ${RUNUSER}/org.keepassxc.KeePassXC.BrowserServer
|
|
|
|
whitelist /usr/share/doc
|
|
whitelist /usr/share/gtk-doc/html
|
|
whitelist /usr/share/mozilla
|
|
whitelist /usr/share/webext
|
|
include whitelist-usr-share-common.inc
|
|
|
|
# Add the next line to your librewolf.local to enable private-bin (Arch Linux).
|
|
#private-bin dbus-launch,dbus-send,librewolf,sh
|
|
# Add the next line to your librewolf.local to enable private-etc.
|
|
# NOTE: private-etc must first be enabled in firefox-common.local.
|
|
#private-etc librewolf
|
|
|
|
dbus-user filter
|
|
# Add the next line to your librewolf.local to enable native notifications.
|
|
#dbus-user.talk org.freedesktop.Notifications
|
|
# Add the next line to your librewolf.local to allow inhibiting screensavers.
|
|
#dbus-user.talk org.freedesktop.ScreenSaver
|
|
# Add the next lines to your librewolf.local for plasma browser integration.
|
|
#dbus-user.own org.mpris.MediaPlayer2.plasma-browser-integration
|
|
#dbus-user.talk org.kde.JobViewServer
|
|
#dbus-user.talk org.kde.kuiserver
|
|
# Add the next three lines to your librewolf.local to allow screensharing under Wayland.
|
|
#whitelist ${RUNUSER}/pipewire-0
|
|
#whitelist /usr/share/pipewire/client.conf
|
|
#dbus-user.talk org.freedesktop.portal.*
|
|
# Also add the next line to your librewolf.local if screensharing does not work with
|
|
# the above lines (depends on the portal implementation).
|
|
#ignore noroot
|
|
ignore dbus-user none
|
|
|
|
# Redirect
|
|
include firefox-common.profile
|