dbus-policy : Simplified complex dbus config. rules.

Change-Id: I365e42d6da8234024c188fbe79961f4933b6015f
Signed-off-by: saerome.kim <saerome.kim@samsung.com>

diff --git a/introspection/wmesh.xml b/introspection/wmesh.xml
index 725902f..e3989a0 100644 (file)
--- a/introspection/wmesh.xml
+++ b/introspection/wmesh.xml
@@ -7,6 +7,7 @@
 <node>\r
        <interface name="net.wmesh">\r
                <!-- Method definitions -->\r
+               <method name="check_privilege"></method>\r
                <method name="scan">\r
                        <arg type="i" name="result" direction="out"/>\r
                </method>\r

diff --git a/packaging/dbus-wmeshd.conf b/packaging/dbus-wmeshd.conf
index 10fc9ab..1f1abec 100644 (file)
--- a/packaging/dbus-wmeshd.conf
+++ b/packaging/dbus-wmeshd.conf
@@ -18,60 +18,17 @@
        <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" />
+               <check send_destination="net.wmesh" send_interface="net.wmesh"
+                       privilege="http://tizen.org/privilege/wifi.mesh"/>
+               <check send_destination="net.wmesh.manager" send_interface="net.wmesh.manager"
+                       privilege="http://tizen.org/privilege/wifi.mesh" />
 
                <!-- wmesh.manager methods -->
                <check send_destination="net.wmesh.manager" send_interface="net.wmesh.manager"
                        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/wifi.mesh"/>
-
-               <!-- 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/wifi.mesh"/>
-               <check send_destination="net.wmesh" send_interface="net.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/wifi.mesh"/>
-               <check send_destination="net.wmesh" send_interface="net.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/wifi.mesh"/>
-               <check send_destination="net.wmesh" send_interface="net.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/wifi.mesh"/>
-               <check send_destination="net.wmesh" send_interface="net.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/wifi.mesh"/>
-               <check send_destination="net.wmesh" send_interface="net.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/wifi.mesh"/>
-               <check send_destination="net.wmesh" send_interface="net.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/wifi.mesh"/>
-               <check send_destination="net.wmesh" send_interface="net.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/wifi.mesh"/>
-               <check send_destination="net.wmesh" send_interface="net.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/wifi.mesh"/>
-               <check send_destination="net.wmesh" send_interface="net.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/wifi.mesh"/>
-               <check send_destination="net.wmesh" send_interface="net.wmesh"
-                       send_member="get_mpath_info" privilege="http://tizen.org/privilege/wifi.mesh"/>
-
+               <check receive_sender="net.wmesh" receive_interface="net.wmesh"
+                       privilege="http://tizen.org/privilege/wifi.mesh"/>
        </policy>
 </busconfig>