From c35058286ee75ea46251ba02bbba7d60a425be9f Mon Sep 17 00:00:00 2001 From: Mateusz Bruno-Kaminski Date: Mon, 7 Nov 2016 10:46:42 +0100 Subject: [PATCH] [Convergence] Privilege checks [Details] Enabled privilege checks in some methods. Change-Id: Ib92da3fffe1cf24d9552e52afebac9bbd8e13aa2 Signed-off-by: Mateusz Bruno-Kaminski --- src/convergence/convergence_instance.cc | 52 ++++++++++++------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/src/convergence/convergence_instance.cc b/src/convergence/convergence_instance.cc index e4221b28..06e80953 100644 --- a/src/convergence/convergence_instance.cc +++ b/src/convergence/convergence_instance.cc @@ -37,7 +37,7 @@ namespace { // The privileges that required in Convergence API const std::string kPrivilegeInternet = "http://tizen.org/privilege/internet"; const std::string kPrivilegeBluetooth = "http://tizen.org/privilege/bluetooth"; -const std::string kPrivilegeWifiDirect = "http://tizen.org/privilege/wifidirect"; +const std::string kPrivilegeDataSharing = "http://tizen.org/privilege/datasharing"; // JS listener keys static const std::string kJSListenerStatus = "status"; @@ -155,9 +155,8 @@ void ConvergenceInstance::ConvergenceManagerStartDiscovery( CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "timeout", out) - /*CHECK_PRIVILEGE_ACCESS(kPrivilegeInternet, &out) - CHECK_PRIVILEGE_ACCESS(kPrivilegeBluetooth, &out) - CHECK_PRIVILEGE_ACCESS(kPrivilegeWifiDirect, &out)*/ + CHECK_PRIVILEGE_ACCESS(kPrivilegeInternet, &out); + CHECK_PRIVILEGE_ACCESS(kPrivilegeBluetooth, &out); LoggerI("ARGS: %s", args.serialize().c_str()); @@ -211,9 +210,8 @@ void ConvergenceInstance::RemoteAppControlServiceConnect( ScopeLogger(); CHECK_EXIST(args, "callbackId", out) - /*CHECK_PRIVILEGE_ACCESS(kPrivilegeInternet, &out) - CHECK_PRIVILEGE_ACCESS(kPrivilegeBluetooth, &out) - CHECK_PRIVILEGE_ACCESS(kPrivilegeWifiDirect, &out)*/ + CHECK_PRIVILEGE_ACCESS(kPrivilegeInternet, &out); + CHECK_PRIVILEGE_ACCESS(kPrivilegeBluetooth, &out); LoggerI("ARGS: %s", args.serialize().c_str()); @@ -264,9 +262,8 @@ void ConvergenceInstance::RemoteAppControlServiceDisconnect( const picojson::value& args, picojson::object& out) { ScopeLogger(); - /*CHECK_PRIVILEGE_ACCESS(kPrivilegeInternet, &out) - CHECK_PRIVILEGE_ACCESS(kPrivilegeBluetooth, &out) - CHECK_PRIVILEGE_ACCESS(kPrivilegeWifiDirect, &out)*/ + CHECK_PRIVILEGE_ACCESS(kPrivilegeInternet, &out); + CHECK_PRIVILEGE_ACCESS(kPrivilegeBluetooth, &out); //LoggerI("ARGS: %s", args.serialize().c_str()); @@ -308,9 +305,9 @@ void ConvergenceInstance::RemoteAppControlServiceLaunch( ScopeLogger(); CHECK_EXIST(args, "callbackId", out) - /*CHECK_PRIVILEGE_ACCESS(kPrivilegeInternet, &out) - CHECK_PRIVILEGE_ACCESS(kPrivilegeBluetooth, &out) - CHECK_PRIVILEGE_ACCESS(kPrivilegeWifiDirect, &out)*/ + CHECK_PRIVILEGE_ACCESS(kPrivilegeInternet, &out); + CHECK_PRIVILEGE_ACCESS(kPrivilegeBluetooth, &out); + CHECK_PRIVILEGE_ACCESS(kPrivilegeDataSharing, &out); auto launch = [this, args](const std::shared_ptr& result) { ScopeLogger("send"); @@ -361,9 +358,9 @@ void ConvergenceInstance::AppCommunicationServiceStart( ScopeLogger(); CHECK_EXIST(args, "callbackId", out) - /*CHECK_PRIVILEGE_ACCESS(kPrivilegeInternet, &out) - CHECK_PRIVILEGE_ACCESS(kPrivilegeBluetooth, &out) - CHECK_PRIVILEGE_ACCESS(kPrivilegeWifiDirect, &out)*/ + CHECK_PRIVILEGE_ACCESS(kPrivilegeInternet, &out); + CHECK_PRIVILEGE_ACCESS(kPrivilegeBluetooth, &out); + CHECK_PRIVILEGE_ACCESS(kPrivilegeDataSharing, &out); auto start = [this, args](const std::shared_ptr& result) { ScopeLogger("start"); @@ -411,9 +408,9 @@ void ConvergenceInstance::AppCommunicationServiceSend( ScopeLogger(); CHECK_EXIST(args, "callbackId", out) - /*CHECK_PRIVILEGE_ACCESS(kPrivilegeInternet, &out) - CHECK_PRIVILEGE_ACCESS(kPrivilegeBluetooth, &out) - CHECK_PRIVILEGE_ACCESS(kPrivilegeWifiDirect, &out)*/ + CHECK_PRIVILEGE_ACCESS(kPrivilegeInternet, &out); + CHECK_PRIVILEGE_ACCESS(kPrivilegeBluetooth, &out); + CHECK_PRIVILEGE_ACCESS(kPrivilegeDataSharing, &out); auto send = [this, args](const std::shared_ptr& result) { ScopeLogger("send"); @@ -463,9 +460,9 @@ void ConvergenceInstance::AppCommunicationServiceStop( ScopeLogger(); CHECK_EXIST(args, "callbackId", out) - /*CHECK_PRIVILEGE_ACCESS(kPrivilegeInternet, &out) - CHECK_PRIVILEGE_ACCESS(kPrivilegeBluetooth, &out) - CHECK_PRIVILEGE_ACCESS(kPrivilegeWifiDirect, &out)*/ + CHECK_PRIVILEGE_ACCESS(kPrivilegeInternet, &out); + CHECK_PRIVILEGE_ACCESS(kPrivilegeBluetooth, &out); + CHECK_PRIVILEGE_ACCESS(kPrivilegeDataSharing, &out); auto stop = [this, args](const std::shared_ptr& result) { ScopeLogger("stop"); @@ -587,9 +584,8 @@ void ConvergenceInstance::AppCommunicationClientServiceConnect( ScopeLogger(); CHECK_EXIST(args, "callbackId", out) - /*CHECK_PRIVILEGE_ACCESS(kPrivilegeInternet, &out) - CHECK_PRIVILEGE_ACCESS(kPrivilegeBluetooth, &out) - CHECK_PRIVILEGE_ACCESS(kPrivilegeWifiDirect, &out)*/ + CHECK_PRIVILEGE_ACCESS(kPrivilegeInternet, &out); + CHECK_PRIVILEGE_ACCESS(kPrivilegeBluetooth, &out); LoggerI("ARGS: %s", args.serialize().c_str()); @@ -638,9 +634,9 @@ void ConvergenceInstance::AppCommunicationClientServiceConnect( void ConvergenceInstance::AppCommunicationClientServiceDisconnect( const picojson::value& args, picojson::object& out) { ScopeLogger(); - /*CHECK_PRIVILEGE_ACCESS(kPrivilegeInternet, &out) - CHECK_PRIVILEGE_ACCESS(kPrivilegeBluetooth, &out) - CHECK_PRIVILEGE_ACCESS(kPrivilegeWifiDirect, &out)*/ + + CHECK_PRIVILEGE_ACCESS(kPrivilegeInternet, &out); + CHECK_PRIVILEGE_ACCESS(kPrivilegeBluetooth, &out); //LoggerI("ARGS: %s", args.serialize().c_str()); -- 2.34.1