From d205455cdabc8a56005d249d9e8244dc2be612a9 Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Tue, 9 Jul 2019 15:37:57 -0700
Subject: [PATCH] dbus: Allow plinth user to own FreedomBox DBus service

Without this fix, the daemon plinth will not able to acquire a DBus connection
and listen for the FreedomBox DBus service when running as user plinth user.
This is the case for production FreedomBox machines.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 .../dbus-1/system.d/org.freedombox.Service.conf      | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/data/usr/share/dbus-1/system.d/org.freedombox.Service.conf b/data/usr/share/dbus-1/system.d/org.freedombox.Service.conf
index cb5215fa0..107a20ea3 100644
--- a/data/usr/share/dbus-1/system.d/org.freedombox.Service.conf
+++ b/data/usr/share/dbus-1/system.d/org.freedombox.Service.conf
@@ -5,15 +5,21 @@
 <!--
 This file is part of FreedomBox.
 
-Allow only root user to send any notifications to FreedomBox.
+Allow only root and plinth users to send any notifications to FreedomBox Service
+or to own the FreedomBox Service.
+
 -->
 
 <busconfig>
 
   <policy user="root">
     <allow own="org.freedombox.Service"/>
-    <allow send_destination="org.freedombox.Service"
-           send_path="/org/freedombox/Service/PackageHandler"/>
+    <allow send_destination="org.freedombox.Service"/>
+  </policy>
+
+  <policy user="plinth">
+    <allow own="org.freedombox.Service"/>
+    <allow send_destination="org.freedombox.Service"/>
   </policy>
 
 </busconfig>