feat(dbus): rewrite some dbus rules (4).

apparmor.d/profiles-s-z/system-config-printer

@@ -28,15 +28,7 @@ profile system-config-printer @{exec_path} flags=(complain) {
   network inet6 stream,
   network netlink raw,
 
-  dbus send bus=system path=/org/freedesktop/PolicyKit1/Authority
-       interface=org.freedesktop.DBus.Properties
-       member=GetAll,
-
-  dbus send bus=system path=/org/freedesktop/PolicyKit1/Authority
-       interface=org.freedesktop.PolicyKit1.Authority
-       member=CheckAuthorization,
-
-  dbus send bus=system path=/org/freedesktop/hostname[0-9]
+  dbus send bus=system path=/org/freedesktop/hostname1
        interface=org.freedesktop.DBus.Properties
        member=GetAll,
 

apparmor.d/profiles-s-z/udisksd

@@ -10,6 +10,7 @@ include <tunables/global>
 @{exec_path} = @{lib}/{,udisks2/}udisksd
 profile udisksd @{exec_path} flags=(attach_disconnected) {
   include <abstractions/base>
+  include <abstractions/bus/login>
   include <abstractions/bus/polkit>
   include <abstractions/dbus-strict>
   include <abstractions/disks-write>
@@ -58,6 +59,14 @@ profile udisksd @{exec_path} flags=(attach_disconnected) {
 
   signal (receive) set=(int) peer=@{systemd},
 
+  dbus bind bus=system name=org.freedesktop.UDisks2,
+  dbus receive bus=system path=/org/freedesktop/UDisks2{,/**}
+       interface=org.freedesktop.UDisks2.*
+       peer=(name="{:*,org.freedesktop.DBus}"),
+  dbus receive bus=system path=/org/freedesktop/UDisks2{,/**}
+       interface=org.freedesktop.DBus.{Properties,ObjectManager}
+       peer=(name=:*),
+  
   dbus (send,receive) bus=system path=/
        interface=org.freedesktop.DBus.Introspectable
        member=Introspect,
@@ -66,37 +75,16 @@ profile udisksd @{exec_path} flags=(attach_disconnected) {
        interface=org.freedesktop.DBus.Properties
        member=Get,
 
-  dbus (send,receive) bus=system path=/org/freedesktop/UDisks2{,/**}
-       interface=org.freedesktop.{DBus*,UDisks2*},
-
-  dbus receive bus=system path=/org/freedesktop/PolicyKit1/Authority
-       interface=org.freedesktop.PolicyKit1.Authority
-       member=Changed 
-       peer=(name=:*, label=polkitd),
-
   dbus send bus=system path=/org/freedesktop/DBus
        interface=org.freedesktop.DBus
-       member={ReleaseName,GetConnectionUnixUser,RequestName},
-
-  dbus send bus=system path=/org/freedesktop/login1
-       interface=org.freedesktop.login1.Manager
-       member=Inhibit,
+       member={GetConnectionUnixUser,GetConnectionUnixProcessID}
+       peer=(name=org.freedesktop.DBus, label=dbus-daemon),
 
   dbus receive bus=system path=/org/freedesktop/login1*
-       interface=org.freedesktop.login1*.Manager
+       interface=org.freedesktop.login1.Manager
        member={PrepareForSleep,PrepareForShutdown}
        peer=(name=:*, label=systemd-logind),
 
-  dbus send bus=system path=/org/freedesktop/PolicyKit1/Authority
-       interface=org.freedesktop.DBus.Properties
-       member=GetAll,
-
-  dbus send bus=system path=/org/freedesktop/PolicyKit1/Authority
-       interface=org.freedesktop.PolicyKit1.Authority
-       member=CheckAuthorization,
-
-  dbus bind bus=system name=org.freedesktop.UDisks2,
-
   @{exec_path} mr,
 
   @{bin}/{,ba,da}sh      rix,

apparmor.d/profiles-s-z/wpa-supplicant

@@ -26,16 +26,11 @@ profile wpa-supplicant @{exec_path} flags=(attach_disconnected) {
   network packet raw,
   network packet dgram,
 
-  dbus send bus=system path=/org/freedesktop/DBus
-       interface=org.freedesktop.DBus
-       member=RequestName,
-
-  dbus receive bus=system path=/fi/w[0-9]/wpa_supplicant1
+  dbus bind bus=system name=fi.w1.wpa_supplicant1,
+  dbus receive bus=system path=/fi/w1/wpa_supplicant1
        interface=org.freedesktop.DBus.Properties
        member=GetAll,
 
-  dbus bind bus=system name=fi.w1.wpa_supplicant1,
-
   @{exec_path} mr,
 
   /etc/wpa_supplicant/wpa_supplicant.conf rw,