From 502aac073f0874102a1df078afd920466ca34fb3 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 14 Sep 2018 15:24:15 +0200
Subject: [PATCH] tools: Add configure option and D-Bus policy file for hwsim
 utility

---
 Makefile.am           |  9 +++++++--
 bootstrap-configure   |  1 +
 configure.ac          |  5 +++++
 src/iwd-dbus.conf     |  3 ---
 tools/hwsim-dbus.conf | 23 +++++++++++++++++++++++
 5 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 tools/hwsim-dbus.conf

diff --git a/Makefile.am b/Makefile.am
index b0a5bef8..0714933b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -209,14 +209,18 @@ dbus_bus_DATA += wired/net.connman.ead.service
 endif
 endif
 
-if TOOLS
-noinst_PROGRAMS += tools/hwsim
+if HWSIM
+bin_PROGRAMS += tools/hwsim
 
 tools_hwsim_SOURCES = tools/hwsim.c src/mpdu.h \
 					src/util.h src/util.c \
 					src/storage.h src/storage.c \
 					src/common.h src/common.c
 tools_hwsim_LDADD = ell/libell-internal.la
+
+if DBUS_POLICY
+dist_dbus_data_DATA += tools/hwsim-dbus.conf
+endif
 endif
 
 if TOOLS
@@ -378,6 +382,7 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-dbus-policy --disable-systemd-service \
 				--enable-sim-hardcoded \
 				--enable-ofono \
 				--enable-wired \
+				--enable-hwsim \
 				--enable-tools
 
 DISTCLEANFILES = $(BUILT_SOURCES) $(unit_tests) $(manual_pages)
diff --git a/bootstrap-configure b/bootstrap-configure
index 4b12d5a9..4ca06002 100755
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -12,6 +12,7 @@ fi
 		--enable-sim-hardcoded \
 		--enable-ofono \
 		--enable-wired \
+		--enable-hwsim \
 		--enable-tools \
 		--disable-dbus-policy \
 		--disable-systemd-service $*
diff --git a/configure.ac b/configure.ac
index 43e166ab..b363d4cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,6 +164,11 @@ AC_ARG_ENABLE(wired, AC_HELP_STRING([--enable-wired],
 					[enable_wired=${enableval}])
 AM_CONDITIONAL(WIRED, test "${enable_wired}" = "yes")
 
+AC_ARG_ENABLE(hwsim, AC_HELP_STRING([--enable-hwsim],
+				[enable Wireless simulation utility]),
+					[enable_hwsim=${enableval}])
+AM_CONDITIONAL(HWSIM, test "${enable_hwsim}" = "yes")
+
 AC_ARG_ENABLE(tools, AC_HELP_STRING([--enable-tools],
 				[enable internal testing utilities]),
 					[enable_tools=${enableval}])
diff --git a/src/iwd-dbus.conf b/src/iwd-dbus.conf
index 1c619f65..6b07ba9e 100644
--- a/src/iwd-dbus.conf
+++ b/src/iwd-dbus.conf
@@ -11,9 +11,6 @@
     <allow own="net.connman.iwd"/>
     <allow send_destination="net.connman.iwd"/>
     <allow send_interface="net.connman.iwd.Agent"/>
-
-    <allow own="net.connman.iwd.hwsim"/>
-    <allow send_destination="net.connman.iwd.hwsim"/>
   </policy>
 
   <policy group="wheel">
diff --git a/tools/hwsim-dbus.conf b/tools/hwsim-dbus.conf
new file mode 100644
index 00000000..09ea6d88
--- /dev/null
+++ b/tools/hwsim-dbus.conf
@@ -0,0 +1,23 @@
+<!-- This configuration file specifies the required security policies
+     for Simulation daemon to work. -->
+
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <!-- ../system.conf have denied everything, so we just punch some holes -->
+
+  <policy user="root">
+    <allow own="net.connman.iwd.hwsim"/>
+    <allow send_destination="net.connman.iwd.hwsim"/>
+  </policy>
+
+  <policy group="wheel">
+    <allow send_destination="net.connman.iwd.hwsim"/>
+  </policy>
+
+  <policy context="default">
+    <deny send_destination="net.connman.iwd.hwsim"/>
+  </policy>
+
+</busconfig>