feat(profile): use new dbus profile in dbus label.

2024-12-23 21:46:44 +01:00 · 2024-03-16 13:10:25 +00:00 · 2024-03-16 13:10:25 +00:00 · c6717d2bab
commit c6717d2bab
parent 61e2cb55ac
32 changed files with 44 additions and 44 deletions
--- a/apparmor.d/abstractions/bus-accessibility
+++ b/apparmor.d/abstractions/bus-accessibility
@ -5,12 +5,12 @@
  dbus send bus=accessibility path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={Hello,AddMatch,RemoveMatch,GetNameOwner,NameHasOwner,StartServiceByName}
-       peer=(name=org.freedesktop.DBus, label="{dbus-daemon,at-spi-bus-launcher}"),
+       peer=(name=org.freedesktop.DBus, label=dbus-accessibility),

  dbus send bus=accessibility path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={RequestName,ReleaseName}
-       peer=(name=org.freedesktop.DBus, label="{dbus-daemon,at-spi-bus-launcher}"),
+       peer=(name=org.freedesktop.DBus, label=dbus-accessibility),

  owner @{run}/user/@{uid}/at-spi/ rw,
  owner @{run}/user/@{uid}/at-spi/bus rw,
--- a/apparmor.d/abstractions/bus-session
+++ b/apparmor.d/abstractions/bus-session
@ -9,12 +9,12 @@
  dbus send bus=session path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={Hello,AddMatch,RemoveMatch,GetNameOwner,NameHasOwner,StartServiceByName}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-session),

  dbus send bus=session path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={RequestName,ReleaseName}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-session),

  /etc/machine-id r,
  /var/lib/dbus/machine-id r,
--- a/apparmor.d/abstractions/bus-system
+++ b/apparmor.d/abstractions/bus-system
@ -5,12 +5,12 @@
  dbus send bus=system path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={Hello,AddMatch,RemoveMatch,GetNameOwner,NameHasOwner,StartServiceByName}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  dbus send bus=system path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={RequestName,ReleaseName}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  @{run}/dbus/system_bus_socket rw,

--- a/apparmor.d/abstractions/bus/org.a11y
+++ b/apparmor.d/abstractions/bus/org.a11y
@ -34,7 +34,7 @@
  dbus send bus=session path=/org/a11y/bus
       interface=org.a11y.Bus
       member=GetAddress
-       peer=(name=org.a11y.Bus, label="{at-spi-bus-launcher,dbus-daemon}"),
+       peer=(name=org.a11y.Bus, label=dbus-accessibility),

  dbus send bus=session path=/org/a11y/bus
       interface=org.a11y.Bus
--- a/apparmor.d/groups/_full/systemd
+++ b/apparmor.d/groups/_full/systemd
@ -125,7 +125,7 @@ profile systemd flags=(attach_disconnected,mediate_deleted) {
  dbus send bus=system path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member=GetConnectionUnixUser
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  @{bin}/systemctl                  rix,
  @{bin}/mount                      rix,
--- a/apparmor.d/groups/apt/apt
+++ b/apparmor.d/groups/apt/apt
@ -43,7 +43,7 @@ profile apt @{exec_path} flags=(attach_disconnected) {
  dbus send bus=system path=/org/freedesktop/DBus/Bus
       interface=org.freedesktop.DBus
       member={GetConnectionUnixProcessID,GetConnectionUnixUser}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  dbus send bus=system
       interface=org.freedesktop.DBus.Introspectable
--- a/apparmor.d/groups/freedesktop/accounts-daemon
+++ b/apparmor.d/groups/freedesktop/accounts-daemon
@ -28,7 +28,7 @@ profile accounts-daemon @{exec_path} flags=(attach_disconnected) {
  dbus send bus=system path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={GetConnectionUnixUser,GetConnectionUnixProcessID}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  @{exec_path} mr,

--- a/apparmor.d/groups/freedesktop/colord
+++ b/apparmor.d/groups/freedesktop/colord
@ -25,7 +25,7 @@ profile colord @{exec_path} flags=(attach_disconnected) {
  dbus send bus=system path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={GetConnectionUnixUser,GetConnectionUnixProcessID}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  @{exec_path} mrix,

--- a/apparmor.d/groups/freedesktop/dconf-service
+++ b/apparmor.d/groups/freedesktop/dconf-service
@ -13,8 +13,8 @@ profile dconf-service @{exec_path} flags=(attach_disconnected) {
  include <abstractions/bus-session>
  include <abstractions/dconf-write>

-  signal (receive) set=(term kill hup) peer=dbus-daemon,
-  signal (receive) set=(term hup) peer=gdm*,
+  signal (receive) set=(term kill hup) peer=dbus-session,
+  signal (receive) set=(term hup) peer=gdm,

  # dbus: own bus=session name=ca.desrt.dconf

--- a/apparmor.d/groups/freedesktop/geoclue
+++ b/apparmor.d/groups/freedesktop/geoclue
@ -29,7 +29,7 @@ profile geoclue @{exec_path} flags=(attach_disconnected) {
  dbus send bus=system path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={GetConnectionUnixUser,GetConnectionUnixProcessID}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  @{exec_path} mr,

--- a/apparmor.d/groups/freedesktop/pipewire
+++ b/apparmor.d/groups/freedesktop/pipewire
@ -28,7 +28,7 @@ profile pipewire @{exec_path} flags=(attach_disconnected) {
  dbus send bus=session path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={GetConnectionUnixUser,GetConnectionUnixProcessID}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-session),

  dbus receive bus=session
       interface=org.freedesktop.DBus.Introspectable
--- a/apparmor.d/groups/freedesktop/pipewire-media-session
+++ b/apparmor.d/groups/freedesktop/pipewire-media-session
@ -26,7 +26,7 @@ profile pipewire-media-session @{exec_path} {
  dbus send bus=session path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member=GetConnectionUnixProcessID
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-session),

  dbus receive bus=session
       interface=org.freedesktop.DBus.Introspectable
--- a/apparmor.d/groups/freedesktop/polkitd
+++ b/apparmor.d/groups/freedesktop/polkitd
@ -26,7 +26,7 @@ profile polkitd @{exec_path} flags=(attach_disconnected) {
  dbus send bus=system path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={GetConnectionUnixProcessID,GetConnectionUnixUser,GetConnectionCredentials}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  @{exec_path} mr,

--- a/apparmor.d/groups/freedesktop/xdg-desktop-portal
+++ b/apparmor.d/groups/freedesktop/xdg-desktop-portal
@ -49,7 +49,7 @@ profile xdg-desktop-portal @{exec_path} flags=(attach_disconnected) {
  dbus send bus=session path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={GetConnectionUnixUser,GetConnectionUnixProcessID}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-session),

  dbus receive bus=session
       interface=org.freedesktop.DBus.Introspectable
--- a/apparmor.d/groups/gnome/gdm
+++ b/apparmor.d/groups/gnome/gdm
@ -38,7 +38,7 @@ profile gdm @{exec_path} flags=(attach_disconnected) {
  dbus send bus=system path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={GetConnectionUnixProcessID,GetConnectionUnixUser}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  @{exec_path} mr,

--- a/apparmor.d/groups/gnome/gnome-extension-ding
+++ b/apparmor.d/groups/gnome/gnome-extension-ding
@ -37,14 +37,14 @@ profile gnome-extension-ding @{exec_path} {
  dbus send bus=session path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus.Introspectable
       member=Introspect 
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-session),

  dbus send bus=session path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus*
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-session),
  dbus send bus=system path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus*
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  dbus send bus=session path=/org/gtk/vfs/metadata
       interface=org.gtk.vfs.Metadata
--- a/apparmor.d/groups/gnome/gnome-session-binary
+++ b/apparmor.d/groups/gnome/gnome-session-binary
@ -40,7 +40,7 @@ profile gnome-session-binary @{exec_path} flags=(attach_disconnected) {
  dbus send bus=session path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={GetConnectionUnixUser,GetConnectionUnixProcessID,UpdateActivationEnvironment}
-       peer=(name=org.freedesktop.DBus label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus label=dbus-session),

  dbus send bus=system path=/org/freedesktop/login1
       interface=org.freedesktop.login1.Manager
--- a/apparmor.d/groups/gnome/gnome-shell
+++ b/apparmor.d/groups/gnome/gnome-shell
@ -144,22 +144,22 @@ profile gnome-shell @{exec_path} flags=(attach_disconnected,mediate_deleted) {
  dbus send bus=system path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={GetConnectionUnixUser,GetConnectionUnixProcessID,GetNameOwner,ListNames}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  ## Session bus

  dbus send bus=session path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={GetConnectionUnixUser,GetConnectionUnixProcessID,GetNameOwner,ListNames}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-session),
  dbus send bus=session path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus.Properties
       member=GetAll
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-session),
  dbus send bus=session path=/
       interface=org.freedesktop.DBus
       member={GetConnectionUnixProcessID,GetNameOwner,ListNames}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-session),

  dbus send bus=accessibility path=/org/a11y/atspi/accessible/root
       interface=org.a11y.atspi.Socket
@ -202,7 +202,7 @@ profile gnome-shell @{exec_path} flags=(attach_disconnected,mediate_deleted) {
  dbus send bus=session
       interface=org.freedesktop.DBus.Introspectable
       member=Introspect
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-session),

  @{exec_path} mr,

--- a/apparmor.d/groups/gnome/gsd-media-keys
+++ b/apparmor.d/groups/gnome/gsd-media-keys
@ -65,7 +65,7 @@ profile gsd-media-keys @{exec_path} flags=(attach_disconnected) {
  dbus send bus=session path=/
       interface=org.freedesktop.DBus
       member=ListNames
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-session),

  dbus send bus=session path=/org/gnome/SettingsDaemon/Power
       interface=org.freedesktop.DBus.Properties
--- a/apparmor.d/groups/gnome/gsd-xsettings
+++ b/apparmor.d/groups/gnome/gsd-xsettings
@ -41,7 +41,7 @@ profile gsd-xsettings @{exec_path} {
  dbus send bus=session path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member=GetId
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-session),

  @{exec_path} mr,

--- a/apparmor.d/groups/gnome/nautilus
+++ b/apparmor.d/groups/gnome/nautilus
@ -52,7 +52,7 @@ profile nautilus @{exec_path} flags=(attach_disconnected) {
  dbus send bus=session path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus.Properties
       member={GetAll,ListActivatableNames}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-session),

  dbus send bus=session path=/org/gtk/Notifications
       interface=org.gtk.Notifications
@ -67,12 +67,12 @@ profile nautilus @{exec_path} flags=(attach_disconnected) {
  dbus send bus=session path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member=ListActivatableNames
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-session),

  dbus send bus=session path=/org/freedesktop/dbus
       interface=org.freedesktop.DBus
       member=NameHasOwner
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-session),

  @{exec_path} mr,

--- a/apparmor.d/groups/network/NetworkManager
+++ b/apparmor.d/groups/network/NetworkManager
@ -82,7 +82,7 @@ profile NetworkManager @{exec_path} flags=(attach_disconnected) {
  dbus send bus=system path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={GetConnectionUnixUser,GetConnectionUnixProcessID}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  @{exec_path} mr,

--- a/apparmor.d/groups/ssh/ssh-agent-launch
+++ b/apparmor.d/groups/ssh/ssh-agent-launch
@ -27,7 +27,7 @@ profile ssh-agent-launch @{exec_path} {
    dbus send bus=session path=/org/freedesktop/DBus
        interface=org.freedesktop.DBus
        member=UpdateActivationEnvironment 
-        peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+        peer=(name=org.freedesktop.DBus, label=dbus-session),

    dbus send bus=session path=/org/freedesktop/systemd1
        interface=org.freedesktop.systemd1.Manager
--- a/apparmor.d/groups/systemd/busctl
+++ b/apparmor.d/groups/systemd/busctl
@ -30,7 +30,7 @@ profile busctl @{exec_path} {
  dbus send bus=system path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus.Monitoring
       member=BecomeMonitor
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  @{exec_path} mr,

--- a/apparmor.d/groups/systemd/systemd-hostnamed
+++ b/apparmor.d/groups/systemd/systemd-hostnamed
@ -23,7 +23,7 @@ profile systemd-hostnamed @{exec_path}  flags=(attach_disconnected) {
  dbus send bus=system path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member=GetConnectionUnixUser
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  @{exec_path} mr,

--- a/apparmor.d/groups/systemd/systemd-logind
+++ b/apparmor.d/groups/systemd/systemd-logind
@ -47,7 +47,7 @@ profile systemd-logind @{exec_path} flags=(attach_disconnected) {
  dbus send bus=system path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={GetConnectionUnixUser,GetConnectionUnixProcessID,GetConnectionCredentials}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  @{exec_path} mr,

--- a/apparmor.d/groups/systemd/systemd-resolved
+++ b/apparmor.d/groups/systemd/systemd-resolved
@ -34,7 +34,7 @@ profile systemd-resolved @{exec_path} flags=(attach_disconnected) {
  dbus send bus=system path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={GetConnectionUnixUser,GetConnectionUnixProcessID}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  @{exec_path} mr,

--- a/apparmor.d/profiles-a-f/engrampa
+++ b/apparmor.d/profiles-a-f/engrampa
@ -29,7 +29,7 @@ profile engrampa @{exec_path} {
  dbus send bus=session path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member=GetId
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-session),

  dbus receive bus=session path=/org/gtk/Application/anonymous
       interface=org.freedesktop.DBus.Properties
--- a/apparmor.d/profiles-a-f/fwupd
+++ b/apparmor.d/profiles-a-f/fwupd
@ -38,7 +38,7 @@ profile fwupd @{exec_path} flags=(complain,attach_disconnected) {
  dbus send bus=system path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={GetConnectionUnixUser,GetConnectionUnixProcessID}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  dbus send bus=system path=/org/freedesktop/UDisks2/Manager
       interface=org.freedesktop.UDisks2.Manager
--- a/apparmor.d/profiles-m-r/packagekitd
+++ b/apparmor.d/profiles-m-r/packagekitd
@ -42,7 +42,7 @@ profile packagekitd @{exec_path} flags=(attach_disconnected) {
  dbus send bus=system path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={GetConnectionUnixUser,GetConnectionUnixProcessID}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  @{exec_path} mr,

--- a/apparmor.d/profiles-m-r/rtkit-daemon
+++ b/apparmor.d/profiles-m-r/rtkit-daemon
@ -26,7 +26,7 @@ profile rtkit-daemon @{exec_path} flags=(attach_disconnected) {
  dbus send bus=system path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={GetConnectionUnixUser,GetConnectionUnixProcessID}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  @{exec_path} mr,

--- a/apparmor.d/profiles-s-z/udisksd
+++ b/apparmor.d/profiles-s-z/udisksd
@ -64,7 +64,7 @@ profile udisksd @{exec_path} flags=(attach_disconnected) {
  dbus send bus=system path=/org/freedesktop/DBus
       interface=org.freedesktop.DBus
       member={GetConnectionUnixUser,GetConnectionUnixProcessID}
-       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
+       peer=(name=org.freedesktop.DBus, label=dbus-system),

  @{exec_path} mr,