From da3366a2a6ba2dbeb0e917393a0b0eab7b4e9d1d Mon Sep 17 00:00:00 2001
From: Mike Brady <mikebrady@eircom.net>
Date: Sat, 25 Nov 2017 09:25:50 +0000
Subject: [PATCH] Remember to install a dbus system bus access rule for mpris,
 separate dbus and mpris access rules, move them to scripts folder

---
 Makefile.am                                    |  5 ++++-
 .../shairport-sync-dbus-policy.conf            |  3 ---
 scripts/shairport-sync-mpris-policy.conf       | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 4 deletions(-)
 rename shairport-sync-dbus-policy.conf => scripts/shairport-sync-dbus-policy.conf (77%)
 create mode 100644 scripts/shairport-sync-mpris-policy.conf

diff --git a/Makefile.am b/Makefile.am
index 353d54b5..48ef77aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -131,7 +131,10 @@ if INSTALL_CONFIG_FILES
 	cp scripts/shairport-sync.conf $(DESTDIR)$(sysconfdir)/shairport-sync.conf.sample
 	[ -f $(DESTDIR)$(sysconfdir)/shairport-sync.conf ] || cp scripts/shairport-sync.conf $(DESTDIR)$(sysconfdir)/shairport-sync.conf
 if USE_DBUS
-	cp shairport-sync-dbus-policy.conf $(DESTDIR)$(sysconfdir)/dbus-1/system.d/shairport-sync.conf
+	cp scripts/shairport-sync-dbus-policy.conf $(DESTDIR)$(sysconfdir)/dbus-1/system.d/shairport-sync-dbus.conf
+endif
+if USE_MPRIS
+	cp scripts/shairport-sync-mpris-policy.conf $(DESTDIR)$(sysconfdir)/dbus-1/system.d/shairport-sync-mpris.conf
 endif
 endif
 if INSTALL_SYSTEMV
diff --git a/shairport-sync-dbus-policy.conf b/scripts/shairport-sync-dbus-policy.conf
similarity index 77%
rename from shairport-sync-dbus-policy.conf
rename to scripts/shairport-sync-dbus-policy.conf
index 01e09521..497dd885 100644
--- a/shairport-sync-dbus-policy.conf
+++ b/scripts/shairport-sync-dbus-policy.conf
@@ -7,15 +7,12 @@
   <!-- Only user shairport-sync can own the Shairport Sync service -->
   <policy user="shairport-sync">
     <allow own="org.gnome.ShairportSync"/>
-    <allow own="org.mpris.MediaPlayer2.ShairportSync"/>
   </policy>
 
   <!-- Allow anyone to invoke methods on Shairport Sync server -->
   <policy context="default">
     <allow send_destination="org.gnome.ShairportSync"/>
-    <allow send_destination="org.mpris.MediaPlayer2.ShairportSync"/>
     <allow receive_sender="org.gnome.ShairportSync"/>
-    <allow receive_sender="org.mpris.MediaPlayer2.ShairportSync"/>
   </policy>
 
 </busconfig>
diff --git a/scripts/shairport-sync-mpris-policy.conf b/scripts/shairport-sync-mpris-policy.conf
new file mode 100644
index 00000000..1efb0072
--- /dev/null
+++ b/scripts/shairport-sync-mpris-policy.conf
@@ -0,0 +1,18 @@
+<!-- initial version, based on /etc/dbus-1/system.d/avahi-dbus.conf, with thanks -->
+<!DOCTYPE busconfig PUBLIC
+          "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+          "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <!-- Only user shairport-sync can own the Shairport Sync MPRIS service -->
+  <policy user="shairport-sync">
+    <allow own="org.mpris.MediaPlayer2.ShairportSync"/>
+  </policy>
+
+  <!-- Allow anyone to invoke methods on Shairport Sync MPRIS server -->
+  <policy context="default">
+     <allow send_destination="org.mpris.MediaPlayer2.ShairportSync"/>
+    <allow receive_sender="org.mpris.MediaPlayer2.ShairportSync"/>
+  </policy>
+
+</busconfig>