Skip to content

Commit

Permalink
profiles: streamline Firefox URL opening support (#6348)
Browse files Browse the repository at this point in the history
Changes:

* Improve Firefox D-Bus comment
* Add missing/standardize related comments
* Include allow-bin-sh.inc in relevant profiles
* Use Firefox URL open section in relevant profiles
  • Loading branch information
glitsj16 committed May 20, 2024
1 parent 02576d7 commit ea10419
Show file tree
Hide file tree
Showing 13 changed files with 52 additions and 18 deletions.
2 changes: 1 addition & 1 deletion etc/profile-a-l/electron-mail.profile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dbus-user filter
dbus-user.talk org.freedesktop.Notifications
dbus-user.talk org.freedesktop.secrets
dbus-user.talk org.gnome.keyring.SystemPrompter
# allow D-Bus communication with firefox for opening links
# Allow D-Bus communication with Firefox for opening links
dbus-user.talk org.mozilla.*

# Redirect
Expand Down
9 changes: 7 additions & 2 deletions etc/profile-a-l/email-common.profile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ include email-common.local
noblacklist ${HOME}/.bogofilter
noblacklist ${HOME}/.bsfilter
noblacklist ${HOME}/.gnupg
noblacklist ${HOME}/.mozilla
noblacklist ${HOME}/.signature
# when storing mail outside the default ${HOME}/Mail path, 'noblacklist' the custom path in your email-common.local
# and 'blacklist' it in your disable-common.local too so it is kept hidden from other applications
Expand All @@ -31,14 +30,19 @@ include disable-interpreters.inc
include disable-programs.inc
include disable-xdg.inc

# The lines below are needed to find the default Firefox profile name, to allow
# opening links in an existing instance of Firefox (note that it still fails if
# there isn't a Firefox instance running with the default profile; see #5352)
noblacklist ${HOME}/.mozilla
whitelist ${HOME}/.mozilla/firefox/profiles.ini

mkdir ${HOME}/.gnupg
mkfile ${HOME}/.config/mimeapps.list
mkfile ${HOME}/.signature
whitelist ${HOME}/.bogofilter
whitelist ${HOME}/.bsfilter
whitelist ${HOME}/.config/mimeapps.list
whitelist ${HOME}/.gnupg
whitelist ${HOME}/.mozilla/firefox/profiles.ini
whitelist ${HOME}/.signature
whitelist ${DOCUMENTS}
whitelist ${DOWNLOADS}
Expand Down Expand Up @@ -90,6 +94,7 @@ dbus-user.talk org.freedesktop.Notifications
dbus-user.talk org.freedesktop.secrets
dbus-user.talk org.gnome.keyring.*
dbus-user.talk org.gnome.seahorse.*
# Allow D-Bus communication with Firefox for opening links
dbus-user.talk org.mozilla.*
dbus-system none

Expand Down
2 changes: 1 addition & 1 deletion etc/profile-a-l/fluffychat.profile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ private-tmp

dbus-user filter
dbus-user.talk org.freedesktop.secrets
# allow D-Bus communication with firefox for opening links
# Allow D-Bus communication with Firefox for opening links
dbus-user.talk org.mozilla.*
dbus-system filter
dbus-system.talk org.freedesktop.NetworkManager
Expand Down
10 changes: 8 additions & 2 deletions etc/profile-a-l/geary.profile
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ noblacklist ${HOME}/.config/geary
noblacklist ${HOME}/.local/share/evolution
noblacklist ${HOME}/.local/share/geary
noblacklist ${HOME}/.local/share/pki
noblacklist ${HOME}/.mozilla
noblacklist ${HOME}/.pki

# sh is needed to allow Firefox to open links
include allow-bin-sh.inc

include disable-common.inc
Expand All @@ -27,6 +27,12 @@ include disable-programs.inc
include disable-shell.inc
include disable-xdg.inc

# The lines below are needed to find the default Firefox profile name, to allow
# opening links in an existing instance of Firefox (note that it still fails if
# there isn't a Firefox instance running with the default profile; see #5352)
noblacklist ${HOME}/.mozilla
whitelist ${HOME}/.mozilla/firefox/profiles.ini

mkdir ${HOME}/.cache/evolution
mkdir ${HOME}/.cache/folks
mkdir ${HOME}/.cache/geary
Expand All @@ -43,7 +49,6 @@ whitelist ${HOME}/.config/geary
whitelist ${HOME}/.local/share/evolution
whitelist ${HOME}/.local/share/geary
whitelist ${HOME}/.local/share/pki
whitelist ${HOME}/.mozilla/firefox/profiles.ini
whitelist ${HOME}/.pki
whitelist /usr/share/geary
include whitelist-common.inc
Expand Down Expand Up @@ -88,6 +93,7 @@ dbus-user.talk org.gnome.OnlineAccounts
dbus-user.talk org.gnome.evolution.dataserver.AddressBook10
dbus-user.talk org.gnome.evolution.dataserver.Sources5
?ALLOW_TRAY: dbus-user.talk org.kde.StatusNotifierWatcher
# Allow D-Bus communication with Firefox for opening links
dbus-user.talk org.mozilla.*
dbus-system none

Expand Down
2 changes: 1 addition & 1 deletion etc/profile-a-l/gtk-youtube-viewers-common.profile
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ whitelist ${HOME}/.mozilla/firefox/profiles.ini
private-bin firefox,xterm

dbus-user filter
# allow D-Bus communication with firefox for opening links
# Allow D-Bus communication with Firefox for opening links
dbus-user.talk org.mozilla.*
5 changes: 4 additions & 1 deletion etc/profile-a-l/kube.profile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ noblacklist ${HOME}/.gnupg
noblacklist ${HOME}/.local/share/kube
noblacklist ${HOME}/.local/share/sink

# sh is needed to allow Firefox to open links
include allow-bin-sh.inc

include disable-common.inc
include disable-devel.inc
include disable-exec.inc
Expand Down Expand Up @@ -78,7 +81,7 @@ dbus-user filter
dbus-user.talk ca.desrt.dconf
dbus-user.talk org.freedesktop.secrets
dbus-user.talk org.freedesktop.Notifications
# allow D-Bus communication with firefox for opening links
# Allow D-Bus communication with Firefox for opening links
dbus-user.talk org.mozilla.*
dbus-system none

Expand Down
5 changes: 4 additions & 1 deletion etc/profile-a-l/lettura.profile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ noblacklist ${HOME}/.config/com.lettura.dev
noblacklist ${HOME}/.lettura
noblacklist ${HOME}/.local/share/com.lettura.dev

# sh is needed to allow Firefox to open links
include allow-bin-sh.inc

include disable-common.inc
include disable-devel.inc
include disable-exec.inc
Expand Down Expand Up @@ -69,7 +72,7 @@ private-tmp
dbus-user filter
dbus-user.talk org.freedesktop.Notifications
?ALLOW_TRAY: dbus-user.talk org.kde.StatusNotifierWatcher
# allow D-Bus communication with firefox for opening links
# Allow D-Bus communication with Firefox for opening links
dbus-user.talk org.mozilla.*
dbus-system none

Expand Down
10 changes: 8 additions & 2 deletions etc/profile-a-l/linuxqq.profile
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,20 @@ include linuxqq.local
include globals.local

noblacklist ${HOME}/.config/QQ
noblacklist ${HOME}/.mozilla

# sh is needed to allow Firefox to open links
include allow-bin-sh.inc

include disable-shell.inc

# The lines below are needed to find the default Firefox profile name, to allow
# opening links in an existing instance of Firefox (note that it still fails if
# there isn't a Firefox instance running with the default profile; see #5352)
noblacklist ${HOME}/.mozilla
whitelist ${HOME}/.mozilla/firefox/profiles.ini

mkdir ${HOME}/.config/QQ
whitelist ${HOME}/.config/QQ
whitelist ${HOME}/.mozilla/firefox/profiles.ini
whitelist ${DESKTOP}
whitelist /opt/QQ

Expand All @@ -34,6 +39,7 @@ dbus-user.talk org.freedesktop.portal.IBus
dbus-user.talk org.freedesktop.ScreenSaver
dbus-user.talk org.gnome.Mutter.IdleMonitor
?ALLOW_TRAY: dbus-user.talk org.kde.StatusNotifierWatcher
# Allow D-Bus communication with Firefox for opening links
dbus-user.talk org.mozilla.*
ignore dbus-user none

Expand Down
5 changes: 4 additions & 1 deletion etc/profile-m-z/signal-desktop.profile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ include signal-desktop.local
# Persistent global definitions
include globals.local

# sh is needed to allow Firefox to open links
include allow-bin-sh.inc

ignore novideo

ignore noexec /tmp
Expand All @@ -25,7 +28,7 @@ private-etc @tls-ca
dbus-user filter
# allow D-Bus notifications
dbus-user.talk org.freedesktop.Notifications
# allow D-Bus communication with firefox for opening links
# Allow D-Bus communication with Firefox for opening links
dbus-user.talk org.mozilla.*

ignore dbus-user none
Expand Down
2 changes: 1 addition & 1 deletion etc/profile-m-z/thunderbird.profile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dbus-user filter
dbus-user.own org.mozilla.thunderbird.*
dbus-user.talk ca.desrt.dconf
dbus-user.talk org.freedesktop.Notifications
# allow D-Bus communication with firefox for opening links
# Allow D-Bus communication with Firefox for opening links
dbus-user.talk org.mozilla.*
# e2ee email needs writable-run-user
# https://support.mozilla.org/en-US/kb/introduction-to-e2e-encryption
Expand Down
5 changes: 4 additions & 1 deletion etc/profile-m-z/trojita.profile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ noblacklist ${HOME}/.abook
noblacklist ${HOME}/.cache/flaska.net/trojita
noblacklist ${HOME}/.config/flaska.net

# sh is needed to allow Firefox to open links
include allow-bin-sh.inc

include disable-common.inc
include disable-devel.inc
include disable-exec.inc
Expand Down Expand Up @@ -61,7 +64,7 @@ private-tmp

dbus-user filter
dbus-user.talk org.freedesktop.secrets
# allow D-Bus communication with firefox for opening links
# Allow D-Bus communication with Firefox for opening links
dbus-user.talk org.mozilla.*
dbus-system none

Expand Down
2 changes: 1 addition & 1 deletion etc/profile-m-z/tutanota-desktop.profile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ dbus-user filter
dbus-user.talk org.freedesktop.Notifications
dbus-user.talk org.freedesktop.secrets
dbus-user.talk org.gnome.keyring.SystemPrompter
# allow D-Bus communication with firefox for opening links
# Allow D-Bus communication with Firefox for opening links
dbus-user.talk org.mozilla.*

# Redirect
Expand Down
11 changes: 8 additions & 3 deletions etc/profile-m-z/zeal.profile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ noblacklist ${HOME}/.cache/Zeal
noblacklist ${HOME}/.config/Zeal
noblacklist ${HOME}/.local/share/Zeal

# sh is needed to allow Firefox to open links
include allow-bin-sh.inc

include disable-common.inc
include disable-devel.inc
include disable-exec.inc
Expand All @@ -19,8 +22,9 @@ include disable-programs.inc
include disable-shell.inc
include disable-xdg.inc

# Allow zeal to open links in Firefox browsers.
# This also requires dbus-user filtering (see below).
# The lines below are needed to find the default Firefox profile name, to allow
# opening links in an existing instance of Firefox (note that it still fails if
# there isn't a Firefox instance running with the default profile; see #5352)
noblacklist ${HOME}/.mozilla
whitelist ${HOME}/.mozilla/firefox/profiles.ini

Expand Down Expand Up @@ -63,8 +67,9 @@ private-etc @tls-ca,@x11,host.conf,mime.types,rpc,services
private-tmp

dbus-user filter
dbus-user.talk org.mozilla.*
?ALLOW_TRAY: dbus-user.talk org.kde.StatusNotifierWatcher
# Allow D-Bus communication with Firefox for opening links
dbus-user.talk org.mozilla.*
dbus-system none

#memory-deny-write-execute # breaks on Arch
Expand Down

0 comments on commit ea10419

Please sign in to comment.