From 839389040f701c9cd331f9dde9a963967eac91e0 Mon Sep 17 00:00:00 2001
From: "saerome.kim" <saerome.kim@samsung.com>
Date: Thu, 5 Apr 2018 10:33:39 +0900
Subject: [PATCH] Add privilege to dbus conf file

Change-Id: I49860a47e7016893aace225d20f089adb33a4b80
Signed-off-by: saerome.kim <saerome.kim@samsung.com>
---
 packaging/dbus-wmeshd.conf | 61 ++++++++++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 24 deletions(-)

diff --git a/packaging/dbus-wmeshd.conf b/packaging/dbus-wmeshd.conf
index 9c98339..10fc9ab 100644
--- a/packaging/dbus-wmeshd.conf
+++ b/packaging/dbus-wmeshd.conf
@@ -8,57 +8,70 @@
 		<allow send_destination="net.wmesh.manager"/>
 		<allow receive_sender="net.wmesh"/>
 	</policy>
+	<policy user="network_fw">
+		<allow own="net.wmesh"/>
+		<allow own="net.wmesh.manager"/>
+		<allow send_destination="net.wmesh"/>
+		<allow send_destination="net.wmesh.manager"/>
+		<allow receive_sender="net.wmesh"/>
+	</policy>
 	<policy context="default">
+		<deny own="net.wmesh"/>
+		<deny own="net.wmesh.manager"/>
 		<allow send_destination="net.wmesh" send_interface="net.wmesh" />
 		<allow send_destination="net.wmesh.manager" send_interface="net.wmesh.manager" />
 
-		<!-- Manager -->
+		<!-- wmesh.manager methods -->
 		<check send_destination="net.wmesh.manager" send_interface="net.wmesh.manager"
-			send_member="enable" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="enable" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh.manager" send_interface="net.wmesh.manager"
-			send_member="disable" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="disable" privilege="http://tizen.org/privilege/wifi.mesh"/>
 
-		<!-- Normal methods -->
+		<!-- wmesh methods -->
+		<check send_destination="net.wmesh" send_interface="net.wmesh"
+			send_member="start" privilege="http://tizen.org/privilege/wifi.mesh.admin"/>
+		<check send_destination="net.wmesh" send_interface="net.wmesh"
+			send_member="stop" privilege="http://tizen.org/privilege/wifi.mesh.admin"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="scan" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="scan" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="specific_scan" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="specific_scan" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="cancel_scan" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="cancel_scan" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="get_found_mesh_networks" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="get_found_mesh_networks" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="get_connected_peers" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="get_connected_peers" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="enable_mesh" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="enable_mesh" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="disable_mesh" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="disable_mesh" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="get_joined_mesh_network" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="get_joined_mesh_network" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="set_gate" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="set_gate" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="unset_gate" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="unset_gate" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="set_softap" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="set_softap" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="enable_softap" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="enable_softap" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="disable_softap" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="disable_softap" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="create_mesh_network" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="create_mesh_network" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="connect_mesh_network" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="connect_mesh_network" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="disconnect_mesh_network" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="disconnect_mesh_network" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="forget_mesh_network" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="forget_mesh_network" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="set_interfaces" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="set_interfaces" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="get_station_info" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="get_station_info" privilege="http://tizen.org/privilege/wifi.mesh"/>
 		<check send_destination="net.wmesh" send_interface="net.wmesh"
-			send_member="get_mpath_info" privilege="http://tizen.org/privilege/wmesh"/>
+			send_member="get_mpath_info" privilege="http://tizen.org/privilege/wifi.mesh"/>
 
 	</policy>
 </busconfig>
-- 
2.7.4