refractor(dbus): use the new bus-{systemd,session} abstractions.

2023-12-06 21:56:59 +00:00 · 2023-12-06 21:56:59 +00:00 · 1cf268b770
commit 1cf268b770
parent 9861f005d4
187 changed files with 288 additions and 287 deletions
--- a/apparmor.d/groups/freedesktop/accounts-daemon
+++ b/apparmor.d/groups/freedesktop/accounts-daemon
@ -10,8 +10,8 @@ include <tunables/global>
@{exec_path} = @{lib}/{,accountsservice/}accounts-daemon
 profile accounts-daemon @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.PolicyKit1>
-  include <abstractions/dbus-strict>
  include <abstractions/nameservice-strict>
  include <abstractions/wutmp>

--- a/apparmor.d/groups/freedesktop/at-spi2-registryd
+++ b/apparmor.d/groups/freedesktop/at-spi2-registryd
@ -10,10 +10,10 @@ include <tunables/global>
@{exec_path} = @{lib}/{,at-spi2{,-core}/}at-spi2-registryd
 profile at-spi2-registryd @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
+  include <abstractions/bus-accessibility>
+  include <abstractions/bus-session>
  include <abstractions/bus/org.a11y>
  include <abstractions/bus/org.gnome.SessionManager>
-  include <abstractions/dbus-accessibility-strict>
-  include <abstractions/dbus-session-strict>
  include <abstractions/nameservice-strict>
  include <abstractions/X-strict>

--- a/apparmor.d/groups/freedesktop/colord
+++ b/apparmor.d/groups/freedesktop/colord
@ -10,8 +10,8 @@ include <tunables/global>
@{exec_path} = @{lib}/{,colord/}colord
 profile colord @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.PolicyKit1>
-  include <abstractions/dbus-strict>
  include <abstractions/devices-usb>
  include <abstractions/nameservice-strict>

--- a/apparmor.d/groups/freedesktop/colord-sane
+++ b/apparmor.d/groups/freedesktop/colord-sane
@ -10,8 +10,8 @@ include <tunables/global>
@{exec_path} = @{lib}/{,colord/}colord-sane
 profile colord-sane @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.Avahi>
-  include <abstractions/dbus-strict>
  include <abstractions/devices-usb>
  include <abstractions/openssl>

--- a/apparmor.d/groups/freedesktop/dconf-service
+++ b/apparmor.d/groups/freedesktop/dconf-service
@ -9,7 +9,7 @@ include <tunables/global>
@{exec_path} = @{lib}/{,dconf/}dconf-service
 profile dconf-service @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
-  include <abstractions/dbus-session-strict>
+  include <abstractions/bus-session>
  include <abstractions/dconf-write>

  signal (receive) set=(term kill hup) peer=dbus-daemon,
--- a/apparmor.d/groups/freedesktop/geoclue
+++ b/apparmor.d/groups/freedesktop/geoclue
@ -9,11 +9,11 @@ include <tunables/global>
@{exec_path} = @{lib}/geoclue @{lib}/geoclue-2.0/demos/agent
 profile geoclue @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/bus/fi.w1.wpa_supplicant1>
  include <abstractions/bus/org.freedesktop.Avahi>
  include <abstractions/bus/org.freedesktop.ModemManager1>
  include <abstractions/bus/org.freedesktop.NetworkManager>
-  include <abstractions/dbus-strict>
  include <abstractions/nameservice-strict>
  include <abstractions/p11-kit>
  include <abstractions/ssl_certs>
--- a/apparmor.d/groups/freedesktop/pipewire
+++ b/apparmor.d/groups/freedesktop/pipewire
@ -11,9 +11,9 @@ include <tunables/global>
 profile pipewire @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
  include <abstractions/audio>
+  include <abstractions/bus-session>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.RealtimeKit1>
-  include <abstractions/dbus-session-strict>
-  include <abstractions/dbus-strict>
  include <abstractions/nameservice-strict>
  include <abstractions/video>

--- a/apparmor.d/groups/freedesktop/pipewire-media-session
+++ b/apparmor.d/groups/freedesktop/pipewire-media-session
@ -11,9 +11,9 @@ include <tunables/global>
 profile pipewire-media-session @{exec_path} {
  include <abstractions/base>
  include <abstractions/audio>
+  include <abstractions/bus-session>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.RealtimeKit1>
-  include <abstractions/dbus-session-strict>
-  include <abstractions/dbus-strict>
  include <abstractions/devices-usb>
  include <abstractions/nameservice-strict>
  include <abstractions/video>
--- a/apparmor.d/groups/freedesktop/polkit-agent-helper
+++ b/apparmor.d/groups/freedesktop/polkit-agent-helper
@ -12,8 +12,8 @@ include <tunables/global>
 profile polkit-agent-helper @{exec_path} {
  include <abstractions/base>
  include <abstractions/authentication>
+  include <abstractions/bus-system>
  include <abstractions/consoles>
-  include <abstractions/dbus-strict>
  include <abstractions/nameservice-strict>

  capability audit_write,
--- a/apparmor.d/groups/freedesktop/polkitd
+++ b/apparmor.d/groups/freedesktop/polkitd
@ -10,7 +10,7 @@ include <tunables/global>
@{exec_path} = @{lib}/{,polkit-1/}polkitd
 profile polkitd @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
-  include <abstractions/dbus-strict>
+  include <abstractions/bus-system>
  include <abstractions/nameservice-strict>

  capability setgid,
--- a/apparmor.d/groups/freedesktop/pulseaudio
+++ b/apparmor.d/groups/freedesktop/pulseaudio
@ -12,13 +12,13 @@ include <tunables/global>
 profile pulseaudio @{exec_path} {
  include <abstractions/base>
  include <abstractions/audio>
+  include <abstractions/bus-session>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.bluez>
  include <abstractions/bus/org.freedesktop.Avahi>
  include <abstractions/bus/org.freedesktop.hostname1>
  include <abstractions/bus/org.freedesktop.RealtimeKit1>
  include <abstractions/consoles>
-  include <abstractions/dbus-session-strict>
-  include <abstractions/dbus-strict>
  include <abstractions/dconf-write>
  include <abstractions/dri-common>
  include <abstractions/dri-enumerate>
--- a/apparmor.d/groups/freedesktop/upowerd
+++ b/apparmor.d/groups/freedesktop/upowerd
@ -10,9 +10,9 @@ include <tunables/global>
@{exec_path} = @{lib}/{,upower/}upowerd
 profile upowerd @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.bluez>
  include <abstractions/bus/org.freedesktop.login1>
-  include <abstractions/dbus-strict>
  include <abstractions/devices-usb>

  network netlink raw,
--- a/apparmor.d/groups/freedesktop/xdg-dbus-proxy
+++ b/apparmor.d/groups/freedesktop/xdg-dbus-proxy
@ -9,12 +9,12 @@ include <tunables/global>
@{exec_path} = @{bin}/xdg-dbus-proxy
 profile xdg-dbus-proxy @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
+  include <abstractions/bus-accessibility>
+  include <abstractions/bus-session>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.Avahi>
  include <abstractions/bus/org.freedesktop.NetworkManager>
  include <abstractions/bus/org.freedesktop.portal.Desktop>
-  include <abstractions/dbus-accessibility-strict>
-  include <abstractions/dbus-session-strict>
-  include <abstractions/dbus-strict>

  dbus send bus=session path=/org/freedesktop/portal/desktop
       interface=org.freedesktop.portal.Realtime
--- a/apparmor.d/groups/freedesktop/xdg-desktop-portal
+++ b/apparmor.d/groups/freedesktop/xdg-desktop-portal
@ -9,12 +9,12 @@ include <tunables/global>
@{exec_path} = @{lib}/xdg-desktop-portal
 profile xdg-desktop-portal @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
+  include <abstractions/bus-session>
+  include <abstractions/bus-system>
  include <abstractions/bus/net.hadess.PowerProfiles>
  include <abstractions/bus/org.freedesktop.impl.portal.PermissionStore>
  include <abstractions/bus/org.freedesktop.NetworkManager>
  include <abstractions/bus/org.freedesktop.RealtimeKit1>
-  include <abstractions/dbus-session-strict>
-  include <abstractions/dbus-strict>
  include <abstractions/dconf-write>
  include <abstractions/freedesktop.org>
  include <abstractions/nameservice-strict>
--- a/apparmor.d/groups/freedesktop/xdg-desktop-portal-gnome
+++ b/apparmor.d/groups/freedesktop/xdg-desktop-portal-gnome
@ -9,12 +9,12 @@ include <tunables/global>
@{exec_path} = @{lib}/xdg-desktop-portal-gnome
 profile xdg-desktop-portal-gnome @{exec_path} {
  include <abstractions/base>
+  include <abstractions/bus-session>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.Accounts>
  include <abstractions/bus/org.freedesktop.portal.Desktop>
  include <abstractions/bus/org.gnome.Mutter.DisplayConfig>
  include <abstractions/bus/org.gtk.vfs.MountTracker>
-  include <abstractions/dbus-session-strict>
-  include <abstractions/dbus-strict>
  include <abstractions/dconf-write>
  include <abstractions/deny-sensitive-home>
  include <abstractions/dri-common>
--- a/apparmor.d/groups/freedesktop/xdg-desktop-portal-gtk
+++ b/apparmor.d/groups/freedesktop/xdg-desktop-portal-gtk
@ -9,6 +9,9 @@ include <tunables/global>
@{exec_path} = @{lib}/xdg-desktop-portal-gtk
 profile xdg-desktop-portal-gtk @{exec_path} {
  include <abstractions/base>
+  include <abstractions/bus-accessibility>
+  include <abstractions/bus-session>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.a11y>
  include <abstractions/bus/org.freedesktop.Accounts>
  include <abstractions/bus/org.freedesktop.NetworkManager>
@ -16,9 +19,6 @@ profile xdg-desktop-portal-gtk @{exec_path} {
  include <abstractions/bus/org.gnome.ScreenSaver>
  include <abstractions/bus/org.gnome.SessionManager>
  include <abstractions/bus/org.gtk.vfs.MountTracker>
-  include <abstractions/dbus-accessibility-strict>
-  include <abstractions/dbus-session-strict>
-  include <abstractions/dbus-strict>
  include <abstractions/dconf-write>
  include <abstractions/dri-common>
  include <abstractions/dri-enumerate>
--- a/apparmor.d/groups/freedesktop/xdg-document-portal
+++ b/apparmor.d/groups/freedesktop/xdg-document-portal
@ -9,8 +9,8 @@ include <tunables/global>
@{exec_path} = @{lib}/xdg-document-portal
 profile xdg-document-portal @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
+  include <abstractions/bus-session>
  include <abstractions/bus/org.freedesktop.impl.portal.PermissionStore>
-  include <abstractions/dbus-session-strict>

  capability sys_nice,
  capability sys_resource,
--- a/apparmor.d/groups/freedesktop/xdg-permission-store
+++ b/apparmor.d/groups/freedesktop/xdg-permission-store
@ -9,7 +9,7 @@ include <tunables/global>
@{exec_path} = @{lib}/xdg-permission-store
 profile xdg-permission-store @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
-  include <abstractions/dbus-session-strict>
+  include <abstractions/bus-session>

  capability sys_nice,

--- a/apparmor.d/groups/freedesktop/xorg
+++ b/apparmor.d/groups/freedesktop/xorg
@ -13,8 +13,8 @@ include <tunables/global>
@{exec_path} += @{lib}/xorg/Xorg{,.wrap}
 profile xorg @{exec_path} flags=(attach_disconnected) {
  include <abstractions/base>
+  include <abstractions/bus-system>
  include <abstractions/bus/org.freedesktop.login1.Session>
-  include <abstractions/dbus-strict>
  include <abstractions/fontconfig-cache-read>
  include <abstractions/fonts>
  include <abstractions/freedesktop.org>