From 0c5dd9887d2e2f8835ea76d37f50764b25113345 Mon Sep 17 00:00:00 2001 From: Pawel Andruszkiewicz Date: Wed, 18 Mar 2015 15:24:32 +0100 Subject: [PATCH] [Alarm] Added privilege checks. Change-Id: I28031cfd813991c03e7fcf2966e2aef16091096a --- src/alarm/alarm_manager.cc | 6 +++--- src/alarm/alarm_utils.cc | 4 ---- src/alarm/alarm_utils.h | 2 -- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/alarm/alarm_manager.cc b/src/alarm/alarm_manager.cc index e32ae509..a92ed8c9 100644 --- a/src/alarm/alarm_manager.cc +++ b/src/alarm/alarm_manager.cc @@ -62,7 +62,7 @@ AlarmManager& AlarmManager::GetInstance() { void AlarmManager::Add(const picojson::value& args, picojson::object& out) { LoggerD("Entered"); - util::CheckAccess(kPrivilegeAlarm); + CHECK_PRIVILEGE_ACCESS(kPrivilegeAlarm, &out); if (!args.contains("alarm")) { LoggerE("Invalid parameter passed."); @@ -216,7 +216,7 @@ void AlarmManager::Add(const picojson::value& args, picojson::object& out) { void AlarmManager::Remove(const picojson::value& args, picojson::object& out) { LoggerD("Entered"); - util::CheckAccess(kPrivilegeAlarm); + CHECK_PRIVILEGE_ACCESS(kPrivilegeAlarm, &out); int id = 0; @@ -244,7 +244,7 @@ void AlarmManager::Remove(const picojson::value& args, picojson::object& out) { void AlarmManager::RemoveAll(const picojson::value& args, picojson::object& out) { LoggerD("Entered"); - util::CheckAccess(kPrivilegeAlarm); + CHECK_PRIVILEGE_ACCESS(kPrivilegeAlarm, &out); if (ALARM_ERROR_NONE != alarm_cancel_all()) { LoggerE("Platform unknown error."); diff --git a/src/alarm/alarm_utils.cc b/src/alarm/alarm_utils.cc index 608351cf..c4c2a22b 100644 --- a/src/alarm/alarm_utils.cc +++ b/src/alarm/alarm_utils.cc @@ -12,10 +12,6 @@ namespace util { using namespace common; -void CheckAccess(const std::string& privilege) { - // TODO: check access to privilege, throw exception on failure -} - PlatformResult AppControlToService(const picojson::object& obj, app_control_h *app_control) { LoggerD("Entered"); diff --git a/src/alarm/alarm_utils.h b/src/alarm/alarm_utils.h index 62948f83..f5f0b5ed 100644 --- a/src/alarm/alarm_utils.h +++ b/src/alarm/alarm_utils.h @@ -14,8 +14,6 @@ namespace extension { namespace alarm { namespace util { -void CheckAccess(const std::string& privilege); - common::PlatformResult AppControlToService(const picojson::object& obj, app_control_h *app_control); common::PlatformResult AppControlToServiceExtraData(const picojson::object& app_obj, app_control_h *app_control); -- 2.34.1