[pkg-fso-commits] [fso-frameworkd] 11/20: update fix-dbus-permissions.patch

[Sebastian Reichel]

This is an automated email from the git hooks/post-receive script.

sre pushed a commit to branch debian
in repository fso-frameworkd.

commit 7476f6f294d8fa58002e34c86bb682e94b0b4094
Author: Sebastian Reichel <sre at ring0.de>
Date:   Sun Nov 8 10:54:35 2015 +0100

    update fix-dbus-permissions.patch
---
 debian/changelog                          |  1 +
 debian/patches/fix-dbus-permissions.patch | 48 +++++++++++++++++++++++++++----
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1492741..0db872b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ fso-frameworkd (0.10.1-1) UNRELEASED; urgency=low
   * Update Debian Standards Version to 3.9.6
   * Switch to debhelper compat level 9
   * Refresh patches
+  * Update DBus permission patch to be more restrictive
 
  -- Rico Rommel <rico at bierrommel.de>  Sun, 13 May 2012 17:26:15 +0200
 
diff --git a/debian/patches/fix-dbus-permissions.patch b/debian/patches/fix-dbus-permissions.patch
index 7b5d017..0f7b120 100644
--- a/debian/patches/fix-dbus-permissions.patch
+++ b/debian/patches/fix-dbus-permissions.patch
@@ -12,85 +12,121 @@ Index: fso-frameworkd/etc/dbus-1/system.d/frameworkd.conf
 ===================================================================
 --- fso-frameworkd.orig/etc/dbus-1/system.d/frameworkd.conf
 +++ fso-frameworkd/etc/dbus-1/system.d/frameworkd.conf
-@@ -3,70 +3,57 @@
+@@ -3,74 +3,85 @@
  <busconfig>
      <policy context="default">
          <allow own="org.freesmartphone.testing"/>
 -        <allow send_path="/org/freesmartphone/testing"/>
 -        <allow send_destination="org.freesmartphone.testing"/>
 +        <allow send_destination="org.freesmartphone.testing" send_path="/org/freesmartphone/testing"/>
++        <allow send_destination="org.freesmartphone.testing" send_interface="org.freedesktop.DBus.Introspectable"/>
++        <allow send_destination="org.freesmartphone.testing" send_interface="org.freedesktop.DBus.Peer"/>
      </policy>
      <policy context="default">
          <allow own="org.freesmartphone.onetworkd"/>
 -        <allow send_path="/org/freesmartphone.onetworkd"/>
 -        <allow send_destination="org.freesmartphone.onetwork"/>
 +        <allow send_destination="org.freesmartphone.onetwork" send_path="/org/freesmartphone.onetworkd"/>
++        <allow send_destination="org.freesmartphone.onetwork" send_interface="org.freedesktop.DBus.Introspectable"/>
++        <allow send_destination="org.freesmartphone.onetwork" send_interface="org.freedesktop.DBus.Peer"/>
      </policy>
      <policy context="default">
          <allow own="org.freesmartphone.frameworkd"/>
 -        <allow send_path="/org/freesmartphone/Framework"/>
 -        <allow send_destination="org.freesmartphone.frameworkd"/>
 +        <allow send_destination="org.freesmartphone.frameworkd" send_path="/org/freesmartphone/Framework"/>
++        <allow send_destination="org.freesmartphone.frameworkd" send_interface="org.freedesktop.DBus.Introspectable"/>
++        <allow send_destination="org.freesmartphone.frameworkd" send_interface="org.freedesktop.DBus.Peer"/>
      </policy>
      <policy context="default">
          <allow own="org.freesmartphone.odeviced"/>
 -        <allow send_path="/"/>
-         <allow send_destination="org.freesmartphone.odeviced"/>
+-        <allow send_destination="org.freesmartphone.odeviced"/>
++        <allow send_destination="org.freesmartphone.odeviced" send_path="/org/freesmartphone/Device"/>
++        <allow send_destination="org.freesmartphone.odeviced" send_interface="org.freedesktop.DBus.Introspectable"/>
++        <allow send_destination="org.freesmartphone.odeviced" send_interface="org.freedesktop.DBus.Peer"/>
      </policy>
      <policy context="default">
          <allow own="org.freesmartphone.oeventsd"/>
 -        <allow send_path="/org/freesmartphone/Events"/>
 -        <allow send_destination="org.freesmartphone.oeventsd"/>
 +        <allow send_destination="org.freesmartphone.oeventsd" send_path="/org/freesmartphone/Events"/>
++        <allow send_destination="org.freesmartphone.oeventsd" send_interface="org.freedesktop.DBus.Introspectable"/>
++        <allow send_destination="org.freesmartphone.oeventsd" send_interface="org.freedesktop.DBus.Peer"/>
      </policy>
      <policy context="default">
          <allow own="org.freesmartphone.ousaged"/>
 -        <allow send_path="/org/freesmartphone/Usage"/>
 -        <allow send_destination="org.freesmartphone.ousaged"/>
 +        <allow send_destination="org.freesmartphone.ousaged" send_path="/org/freesmartphone/Usage"/>
++        <allow send_destination="org.freesmartphone.ousaged" send_interface="org.freedesktop.DBus.Introspectable"/>
++        <allow send_destination="org.freesmartphone.ousaged" send_interface="org.freedesktop.DBus.Peer"/>
      </policy>
      <policy context="default">
          <allow own="org.freesmartphone.ogsmd"/>
 -        <allow send_path="/org/freesmartphone/GSM"/>
 -        <allow send_destination="org.freesmartphone.ogsmd"/>
 +        <allow send_destination="org.freesmartphone.ogsmd" send_path="/org/freesmartphone/GSM"/>
++        <allow send_destination="org.freesmartphone.ogsmd" send_interface="org.freedesktop.DBus.Introspectable"/>
++        <allow send_destination="org.freesmartphone.ogsmd" send_interface="org.freedesktop.DBus.Peer"/>
      </policy>
      <policy context="default">
          <allow own="org.freesmartphone.ogpsd"/>
          <allow own="org.freedesktop.Gypsy"/>
 -        <allow send_path="/org/freedesktop/Gypsy"/>
-         <allow send_destination="org.freesmartphone.ogpsd"/>
-         <allow send_destination="org.freedesktop.gypsy"/>
+-        <allow send_destination="org.freesmartphone.ogpsd"/>
+-        <allow send_destination="org.freedesktop.gypsy"/>
++        <allow send_destination="org.freesmartphone.ogpsd" send_path="/org/freesmartphone/GPS"/>
++        <allow send_destination="org.freedesktop.gypsy" send_path="/org/freedesktop/Gypsy"/>
++        <allow send_destination="org.freesmartphone.ogpsd" send_interface="org.freedesktop.DBus.Introspectable"/>
++        <allow send_destination="org.freesmartphone.ogpsd" send_interface="org.freedesktop.DBus.Peer"/>
++        <allow send_destination="org.freedesktop.gypsy" send_interface="org.freedesktop.DBus.Introspectable"/>
++        <allow send_destination="org.freedesktop.gypsy" send_interface="org.freedesktop.DBus.Peer"/>
      </policy>
      <policy context="default">
          <allow own="org.freesmartphone.opreferencesd"/>
 -        <allow send_path="/org/freesmartphone/Preferences"/>
 -        <allow send_destination="org.freesmartphone.opreferencesd"/>
 +        <allow send_destination="org.freesmartphone.opreferencesd" send_path="/org/freesmartphone/Preferences"/>
++        <allow send_destination="org.freesmartphone.opreferencesd" send_interface="org.freedesktop.DBus.Introspectable"/>
++        <allow send_destination="org.freesmartphone.opreferencesd" send_interface="org.freedesktop.DBus.Peer"/>
      </policy>
      <policy context="default">
          <allow own="org.freesmartphone.ophoned"/>
 -        <allow send_path="/org/freesmartphone/Phone"/>
 -        <allow send_destination="org.freesmartphone.ophoned"/>
 +        <allow send_destination="org.freesmartphone.ophoned" send_path="/org/freesmartphone/Phone"/>
++        <allow send_destination="org.freesmartphone.ophoned" send_interface="org.freedesktop.DBus.Introspectable"/>
++        <allow send_destination="org.freesmartphone.ophoned" send_interface="org.freedesktop.DBus.Peer"/>
      </policy>
      <policy context="default">
          <allow own="org.freesmartphone.opimd"/>
 -        <allow send_path="/org/freesmartphone/PIM"/>
 -        <allow send_destination="org.freesmartphone.opimd"/>
 +        <allow send_destination="org.freesmartphone.opimd" send_path="/org/freesmartphone/PIM"/>
++        <allow send_destination="org.freesmartphone.opimd" send_interface="org.freedesktop.DBus.Introspectable"/>
++        <allow send_destination="org.freesmartphone.opimd" send_interface="org.freedesktop.DBus.Peer"/>
      </policy>
      <policy context="default">
          <allow own="org.freesmartphone.otimed"/>
 -        <allow send_path="/org/freesmartphone/Time"/>
 -        <allow send_destination="org.freesmartphone.otimed"/>
 +        <allow send_destination="org.freesmartphone.otimed" send_path="/org/freesmartphone/Time"/>
++        <allow send_destination="org.freesmartphone.otimed" send_interface="org.freedesktop.DBus.Introspectable"/>
++        <allow send_destination="org.freesmartphone.otimed" send_interface="org.freedesktop.DBus.Peer"/>
      </policy>
      <policy context="default">
          <allow own="org.freesmartphone.omuxerd"/>
 -        <allow send_path="/org/freesmartphone/GSM/Muxer"/>
 -        <allow send_destination="org.freesmartphone.omuxerd"/>
+-        <allow send_interface="org.freesmartphone.GSM.MUX"/>
+-    </policy>
+-    <policy context="default">
+-        <allow send_interface="org.freedesktop.DBus.Introspectable"/>
+-        <allow send_interface="org.freedesktop.DBus.Peer"/>       
 +        <allow send_destination="org.freesmartphone.omuxerd" send_path="/org/freesmartphone/GSM/Muxer"/>
-         <allow send_interface="org.freesmartphone.GSM.MUX"/>
++        <allow send_destination="org.freesmartphone.omuxerd" send_interface="org.freesmartphone.GSM.MUX"/>
++        <allow send_destination="org.freesmartphone.omuxerd" send_interface="org.freedesktop.DBus.Introspectable"/>
++        <allow send_destination="org.freesmartphone.omuxerd" send_interface="org.freedesktop.DBus.Peer"/>
      </policy>
-     <policy context="default">
+ </busconfig>

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-fso/fso-frameworkd.git