Add gdbus permission check logic & fix shorcut get list bug

Change-Id: Ic04cdedd32a90e00c885bbbe442f5109b5a1946c
Signed-off-by: Hyunho Kang <hhstark.kang@samsung.com>

diff --git a/data-provider-master.conf.in b/data-provider-master.conf.in
index 4767630..7770ed6 100644 (file)
--- a/data-provider-master.conf.in
+++ b/data-provider-master.conf.in
@@ -7,9 +7,16 @@
                <allow own="org.tizen.data_provider_service"/>
        </policy>
        <policy context="default">
-                <allow send_destination="org.tizen.data_provider_service"/>
-               <check send_destination="org.tizen.data_provider_service" send_interface="org.tizen.data_provider_noti_service" send_member="service_register" privilege="http://tizen.org/privilege/notification"/>
-               <check send_destination="org.tizen.data_provider_service" send_interface="org.tizen.data_provider_badge_service" send_member="service_register" privilege="http://tizen.org/privilege/notification"/>
-               <check send_destination="org.tizen.data_provider_service" send_interface="org.tizen.data_provider_shortcut_service" send_member="service_register" privilege="http://tizen.org/privilege/shortcut"/>
-        </policy>
+        <allow send_destination="org.tizen.data_provider_service"/>
+       <check send_destination="org.tizen.data_provider_service" send_interface="org.tizen.data_provider_noti_service" send_member="service_register" privilege="http://tizen.org/privilege/notification"/>
+       <check send_destination="org.tizen.data_provider_service" send_interface="org.tizen.data_provider_noti_service" send_member="add_noti" privilege="http://tizen.org/privilege/notification"/>
+       <check send_destination="org.tizen.data_provider_service" send_interface="org.tizen.data_provider_noti_service" send_member="del_noti_single" privilege="http://tizen.org/privilege/notification"/>
+       <check send_destination="org.tizen.data_provider_service" send_interface="org.tizen.data_provider_noti_service" send_member="del_noti_multiple" privilege="http://tizen.org/privilege/notification"/>
+       <check send_destination="org.tizen.data_provider_service" send_interface="org.tizen.data_provider_noti_service" send_member="load_noti_by_tag" privilege="http://tizen.org/privilege/notification"/>
+       <check send_destination="org.tizen.data_provider_service" send_interface="org.tizen.data_provider_noti_service" send_member="update_noti" privilege="http://tizen.org/privilege/notification"/>
+       <check send_destination="org.tizen.data_provider_service" send_interface="org.tizen.data_provider_noti_service" send_member="update_noti" privilege="http://tizen.org/privilege/notification"/>
+
+        <check send_destination="org.tizen.data_provider_service" send_interface="org.tizen.data_provider_badge_service" privilege="http://tizen.org/privilege/notification"/>
+        <check send_destination="org.tizen.data_provider_service" send_interface="org.tizen.data_provider_shortcut_service" privilege="http://tizen.org/privilege/shortcut"/>
+    </policy>
 </busconfig>

diff --git a/src/shortcut_service.c b/src/shortcut_service.c
index 647fbfc..f43d4a5 100755 (executable)
--- a/src/shortcut_service.c
+++ b/src/shortcut_service.c
@@ -179,7 +179,7 @@ int shortcut_get_shortcut_service_list(GVariant *parameters, GVariant **reply_bo
                        shortcut = iter_list->data;
                        body = g_variant_new("(&s&s&s&s&s)",
                                shortcut->package_name, shortcut->icon, shortcut->name, shortcut->extra_key, shortcut->extra_data);
-                       g_variant_builder_add(builder, "v", body);
+                       g_variant_builder_add(builder, "(v)", body);
                }
                g_list_free_full(shortcut_list, (GDestroyNotify)_release_shortcut_info);
        }