integrate dbus conf

Change-Id: If0ce4b4e96966cd01a60399258f17caf9c5862b1
Signed-off-by: Jongkyu Koo <jk.koo@samsung.com>

diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index fea2f3ceee589a7e319df76faab540d4c8596ca5..64c7f362ce4545d198a4d3a4d54dc5f01974584d 100644 (file)
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -32,7 +32,6 @@ INSTALL(TARGETS ${DAEMON} DESTINATION ${BIN_INSTALL_DIR})
 
 CONFIGURE_FILE(${DBUS_INTERFACE}.service.in ${DBUS_INTERFACE}.service @ONLY)
 INSTALL(FILES ${DBUS_INTERFACE}.service DESTINATION ${SHARE_INSTALL_PREFIX}/dbus-1/system-services)
-INSTALL(FILES ${DBUS_INTERFACE}.conf DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d)
 
 INSTALL(DIRECTORY DESTINATION /opt/usr/data/${PROJECT_NAME})
 INSTALL(DIRECTORY DESTINATION /opt/usr/data/${PROJECT_NAME}/downloads)

diff --git a/daemon/org.tizen.PhonenumberUtils.dbus.conf b/daemon/org.tizen.PhonenumberUtils.dbus.conf
deleted file mode 100644 (file)
index a4d5136..0000000
--- a/daemon/org.tizen.PhonenumberUtils.dbus.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
-<busconfig>
-
-<!-- root can own the service -->
-       <policy user="root">
-               <allow own="org.tizen.PhonenumberUtils.dbus"/>
-               <allow send_destination="org.tizen.PhonenumberUtils.dbus"/>
-               <allow send_interface="org.tizen.PhonenumberUtils.dbus"/>
-               <allow receive_sender="org.tizen.PhonenumberUtils.dbus"/>
-       </policy>
-
-       <policy user="system">
-               <allow own="org.tizen.PhonenumberUtils.dbus"/>
-               <allow send_destination="org.tizen.PhonenumberUtils.dbus"/>
-               <allow send_interface="org.tizen.PhonenumberUtils.dbus"/>
-               <allow receive_sender="org.tizen.PhonenumberUtils.dbus"/>
-       </policy>
-
-       <policy context="default">
-               <allow send_destination="org.tizen.PhonenumberUtils.dbus"/>
-               <allow send_destination="org.tizen.PhonenumberUtils.dbus"
-                       send_interface="org.tizen.PhonenumberUtils.dbus" send_member="get_location" />
-               <allow send_destination="org.tizen.PhonenumberUtils.dbus"
-                       send_interface="org.tizen.PhonenumberUtils.dbus" send_member="get_number" />
-               <check send_destination="org.tizen.PhonenumberUtils.dbus"
-                       send_interface="org.tizen.PhonenumberUtils.dbus" send_member="get_normalized_number"
-                       privilege="http://tizen.org/privilege/telephony" />
-       </policy>
-
-</busconfig>

diff --git a/packaging/phonenumber-utils.conf.in b/packaging/phonenumber-utils.conf.in
index d942484bb73199859e2c2151f3eb7a1720078e68..bd1f7879e40395652f25bc5ae2bd35130d67f91d 100644 (file)
--- a/packaging/phonenumber-utils.conf.in
+++ b/packaging/phonenumber-utils.conf.in
@@ -14,18 +14,28 @@
     </policy>
     <policy context="default">
         <allow send_destination="@DBUS_INTERFACE@"/>
+               <allow send_destination="@DBUS_INTERFACE@"
+                               send_interface="@DBUS_INTERFACE@" send_member="get_location" />
+               <allow send_destination="@DBUS_INTERFACE@"
+                               send_interface="@DBUS_INTERFACE@" send_member="get_number" />
                <check send_destination="@DBUS_INTERFACE@"
-                               send_interface="@DBUS_INTERFACE@" send_member="add_block_number"
-                               privilege="http://tizen.org/privilege/phonenumber_utils.write"/>
+                               send_interface="@DBUS_INTERFACE@" send_member="get_normalized_number"
+                               privilege="http://tizen.org/privilege/telephony"/>
                <check send_destination="@DBUS_INTERFACE@"
-                               send_interface="@DBUS_INTERFACE@" send_member="remove_block_number"
-                               privilege="http://tizen.org/privilege/phonenumber_utils.write"/>
+                               send_interface="@DBUS_INTERFACE@" send_member="add_blocking_rule"
+                               privilege="http://tizen.org/privilege/blocknumber.write"/>
                <check send_destination="@DBUS_INTERFACE@"
-                               send_interface="@DBUS_INTERFACE@" send_member="check_block_number"
-                               privilege="http://tizen.org/privilege/phonenumber_utils.read"/>
+                               send_interface="@DBUS_INTERFACE@" send_member="remove_blocking_rule"
+                               privilege="http://tizen.org/privilege/blocknumber.write"/>
                <check send_destination="@DBUS_INTERFACE@"
-                               send_interface="@DBUS_INTERFACE@" send_member="get_block_numbers"
-                               privilege="http://tizen.org/privilege/phonenumber_utils.read"/>
+                               send_interface="@DBUS_INTERFACE@" send_member="check_blocking"
+                               privilege="http://tizen.org/privilege/blocknumber.read"/>
+               <check send_destination="@DBUS_INTERFACE@"
+                               send_interface="@DBUS_INTERFACE@" send_member="get_blocking_rules"
+                               privilege="http://tizen.org/privilege/blocknumber.read"/>
+               <check send_destination="@DBUS_INTERFACE@"
+                               send_interface="@DBUS_INTERFACE@" send_member="get_blocking_rules_related"
+                               privilege="http://tizen.org/privilege/blocknumber.read"/>
     </policy>
 </busconfig>
 

diff --git a/packaging/phonenumber-utils.spec b/packaging/phonenumber-utils.spec
index c7ee0dc73589f35012a90e8ed14526fa13fcd106..f3702cb5e2128246064c6ee40018c1eb1ac223e3 100644 (file)
--- a/packaging/phonenumber-utils.spec
+++ b/packaging/phonenumber-utils.spec
@@ -100,7 +100,6 @@ systemctl daemon-reload
 %{_unitdir}/%{name}.service
 %{_bindir}/%{name}-daemon
 %{_datadir}/dbus-1/system-services/%{_dbus_name}.service
-%config %{_sysconfdir}/dbus-1/system.d/%{_dbus_name}.conf
 %{_libdir}/lib%{name}.so.*
 %license LICENSE.APLv2
 %{upgrade_script_path}/500.%{name}.sh