d2d-conv-manager: privilege check

In platform-permission CTC, d2d privilege check testcase is added.
So now, d2d-conv-manager needs to check privilege.

Signed-off-by: Hongkuk, Son <hongkuk.son@samsung.com>
Change-Id: I02df6e642d7c91738a81b97e3f4e1e8fd1ec30ef

diff --git a/daemon/access_control/privilege.cpp b/daemon/access_control/privilege.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 6619ca7..b449b33
--- a/daemon/access_control/privilege.cpp
+++ b/daemon/access_control/privilege.cpp
@@ -57,15 +57,13 @@ public:
 };
 
 bool conv::privilege_manager::is_allowed(const conv::credentials *creds, const char *privilege)
-{/*
+{
        IF_FAIL_RETURN(creds && privilege, true);
 
        std::string priv = "http://tizen.org/privilege/";
        priv += privilege;
 
        return permission_checker::get_instance().has_permission(creds, priv.c_str());
-*/
-       return true;
 }
 
 

diff --git a/daemon/dbus_server_impl.cpp b/daemon/dbus_server_impl.cpp
index e111410..e81002d 100755 (executable)
--- a/daemon/dbus_server_impl.cpp
+++ b/daemon/dbus_server_impl.cpp
@@ -82,14 +82,13 @@ static void handle_request(GDBusConnection* conn, const char *sender, GVariant *
        _SI("Input: %s", input);
 
        conv::credentials *creds = NULL;
-       // temporaily removed - privilege checker
-/*
-       if (!peer_creds::get(conn, sender, &creds)) {
+
+       if (!conv::peer_creds::get(conn, sender, &creds)) {
                _E("Peer credentialing failed");
                g_dbus_method_invocation_return_value(invocation, g_variant_new("(iss)", CONV_ERROR_INVALID_OPERATION, EMPTY_JSON_OBJECT, EMPTY_JSON_OBJECT));
                return;
        }
-*/
+
        conv::request *recv_request = NULL;
        try{
                recv_request = new conv::request(req_type, DEFAULT_APP_ID, req_id, subject, input, sender, creds, invocation);