From c858da4ff6f4de7b596789de735b4fb526cf30a0 Mon Sep 17 00:00:00 2001
From: Jim Hebert <jimhebert@chromium.org>
Date: Fri, 24 Feb 2012 12:06:42 -0800
Subject: [PATCH] Fix eavesdropping config to avoid masking bad dbus configs

BUG=chromium-os:26824
TEST=repro'd chromium-os:26790 on a test system with this config,
demonstrating that it no longer masks the bug. Confirmed
dbus-monitoring still works while doing so. (Tested with
help from jorgelo.) Confirmed the 26790 fix is not regressed by this
either.

Change-Id: I60ce833ffb14a9a709ca6bfecf40221940845aa0
Reviewed-on: https://gerrit.chromium.org/gerrit/16739
Reviewed-by: Scott James Remnant <keybuk@chromium.org>
Commit-Ready: Jim Hebert <jimhebert@chromium.org>
Tested-by: Jim Hebert <jimhebert@chromium.org>
---
 mod_for_test_scripts/760enableDbusMonitor | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/mod_for_test_scripts/760enableDbusMonitor b/mod_for_test_scripts/760enableDbusMonitor
index 1f0b500b34..7143b1dc87 100755
--- a/mod_for_test_scripts/760enableDbusMonitor
+++ b/mod_for_test_scripts/760enableDbusMonitor
@@ -8,9 +8,12 @@ echo "Configuring to enable root access to dbus-monitor"
 
 cat > "${ROOT_FS_DIR}/etc/dbus-1/system-local.conf" <<EOF
 <busconfig>
-  <policy user="root">
-    <allow send_destination="*" eavesdrop="true"/>
-    <allow receive_sender="*" eavesdrop="true"/>
+  <policy context="default">
+    <!-- All messages may be received by default -->
+    <allow receive_requested_reply="false" receive_type="method_call" eavesdrop="true"/>
+    <allow receive_requested_reply="false" receive_type="method_return" eavesdrop="true"/>
+    <allow receive_requested_reply="false" receive_type="error" eavesdrop="true"/>
+    <allow receive_requested_reply="false" receive_type="signal" eavesdrop="true"/>
   </policy>
 </busconfig>
 EOF