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

apparmor.d/profiles-s-z/su

@@ -37,9 +37,10 @@ profile su @{exec_path} {
 
   network netlink raw,
 
-  dbus (send) bus=system path=/org/freedesktop/login1
-    interface=org.freedesktop.login1.Manager
-    member={CreateSession,ReleaseSession},
+  dbus send bus=system path=/org/freedesktop/login1
+       interface=org.freedesktop.logi1.Manager
+       member={CreateSession,ReleaseSession}
+       peer=(name=org.freedesktop.login1, label=systemd-logind),
 
   @{exec_path} mr,
 

apparmor.d/profiles-s-z/sudo

@@ -43,8 +43,8 @@ profile sudo @{exec_path} {
 
   dbus send bus=system path=/org/freedesktop/login1
        interface=org.freedesktop.logi1.Manager
-       member=CreateSession
-       peer=(name=org.freedesktop.login1),
+       member={CreateSession,ReleaseSession}
+       peer=(name=org.freedesktop.login1, label=systemd-logind),
 
   dbus (send receive) bus=session path=/org/freedesktop/systemd1
          interface=org.freedesktop.systemd.Manager

apparmor.d/profiles-s-z/switcheroo-control

@@ -15,16 +15,11 @@ profile switcheroo-control @{exec_path} flags=(attach_disconnected) {
 
   network netlink raw,
 
+  dbus bind bus=system name=net.hadess.SwitcherooControl,
   dbus receive bus=system path=/net/hadess/SwitcherooControl
        interface=org.freedesktop.DBus.Properties
-       member=GetAll,
-
-  dbus send bus=system path=/org/freedesktop/DBus
-       interface=org.freedesktop.DBus
-       member=RequestName,
-
-  dbus bind bus=system 
-       name=net.hadess.SwitcherooControl,
+       member=GetAll
+       peer=(name=:*),
 
   @{exec_path} mr,
 

apparmor.d/profiles-s-z/thunderbird

@@ -61,8 +61,8 @@ profile thunderbird @{exec_path} {
        member=Read
        peer=(name=:*),
 
-  dbus receive bus=system path=/org/freedesktop/login1*
-       interface=org.freedesktop.login1*.Manager
+  dbus receive bus=system path=/org/freedesktop/login1
+       interface=org.freedesktop.login1.Manager
        member={UserAdded,UserRemoved}
        peer=(name=:*, label=systemd-logind),
 

apparmor.d/profiles-s-z/udisksd

@@ -80,11 +80,6 @@ profile udisksd @{exec_path} flags=(attach_disconnected) {
        member={GetConnectionUnixUser,GetConnectionUnixProcessID}
        peer=(name=org.freedesktop.DBus, label=dbus-daemon),
 
-  dbus receive bus=system path=/org/freedesktop/login1*
-       interface=org.freedesktop.login1.Manager
-       member={PrepareForSleep,PrepareForShutdown}
-       peer=(name=:*, label=systemd-logind),
-
   @{exec_path} mr,
 
   @{bin}/{,ba,da}sh      rix,