From f5ce9b556e233b877336d1269c0057171c17fad5 Mon Sep 17 00:00:00 2001
From: Tomasz Marciniak <t.marciniak@samsung.com>
Date: Wed, 4 Nov 2015 13:00:30 +0100
Subject: [PATCH] Revert "[package] - checking privileges moved to JS layer"

This reverts commit 85c867082d19eb3eb6ef341c694b13925a1ee114.

[Verification] Code compiles. TCT pass didn't change against results on: http://168.219.209.56/confluence/display/WRT/TCT+results+-+WebAPI+for+Tizen+3.0+Mobile

Change-Id: Idd7d3912dc5cc23f103e7b5cc818983a14fdcc92
Signed-off-by: Tomasz Marciniak <t.marciniak@samsung.com>
---
 src/package/package_api.js      | 13 -------------
 src/package/package_instance.cc | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/package/package_api.js b/src/package/package_api.js
index f57c3553..285786e8 100644
--- a/src/package/package_api.js
+++ b/src/package/package_api.js
@@ -15,7 +15,6 @@
  */
 
 var validator_ = xwalk.utils.validator;
-var privilege_ = xwalk.utils.privilege;
 var types_ = validator_.Types;
 
 
@@ -144,8 +143,6 @@ function PackageManager() {
 
 
 PackageManager.prototype.install = function(packageFileURI, progressCallback) {
-  xwalk.utils.checkPrivilegeAccess(privilege_.PACKAGEMANAGER_INSTALL);
-
   var args = validator_.validateArgs(arguments, [
     {'name' : 'packageFileURI', 'type' : types_.STRING},
     {'name' : 'progressCallback',
@@ -185,8 +182,6 @@ PackageManager.prototype.install = function(packageFileURI, progressCallback) {
 };
 
 PackageManager.prototype.uninstall = function(id, progressCallback) {
-  xwalk.utils.checkPrivilegeAccess(privilege_.PACKAGEMANAGER_INSTALL);
-
   var args = validator_.validateArgs(arguments, [
     {'name' : 'id', 'type' : types_.STRING},
     {'name' : 'progressCallback',
@@ -227,8 +222,6 @@ PackageManager.prototype.uninstall = function(id, progressCallback) {
 };
 
 PackageManager.prototype.getPackagesInfo = function(successCallback, errorCallback) {
-  xwalk.utils.checkPrivilegeAccess(privilege_.PACKAGE_INFO);
-
   var args = validator_.validateArgs(arguments, [
     {'name' : 'successCallback', 'type' : types_.FUNCTION},
     {'name' : 'errorCallback', 'type' : types_.FUNCTION, 'optional' : true, 'nullable' : true}
@@ -263,8 +256,6 @@ PackageManager.prototype.getPackagesInfo = function(successCallback, errorCallba
 };
 
 PackageManager.prototype.getPackageInfo = function() {
-  xwalk.utils.checkPrivilegeAccess(privilege_.PACKAGE_INFO);
-
   var args = validator_.validateArgs(arguments, [
     {'name': 'id', 'type': types_.STRING, 'optional' : true, 'nullable' : true}
   ]);
@@ -285,8 +276,6 @@ PackageManager.prototype.getPackageInfo = function() {
 };
 
 PackageManager.prototype.setPackageInfoEventListener = function(eventCallback) {
-  xwalk.utils.checkPrivilegeAccess(privilege_.PACKAGE_INFO);
-
   var args = validator_.validateArgs(
       arguments,
       [
@@ -325,8 +314,6 @@ PackageManager.prototype.setPackageInfoEventListener = function(eventCallback) {
 };
 
 PackageManager.prototype.unsetPackageInfoEventListener = function() {
-  xwalk.utils.checkPrivilegeAccess(privilege_.PACKAGE_INFO);
-
   var nativeParam = {
   };
 
diff --git a/src/package/package_instance.cc b/src/package/package_instance.cc
index 99c53004..2f197342 100644
--- a/src/package/package_instance.cc
+++ b/src/package/package_instance.cc
@@ -23,6 +23,7 @@
 #include "common/logger.h"
 #include "common/task-queue.h"
 #include "common/picojson.h"
+#include "common/tools.h"
 
 namespace extension {
 namespace package {
@@ -37,6 +38,12 @@ using common::SecurityException;
 using common::ErrorCode;
 using common::PlatformResult;
 
+namespace {
+// The privileges that required in Package API
+const std::string kPrivilegePackageInstall = "http://tizen.org/privilege/packagemanager.install";
+const std::string kPrivilegePackageInfo = "http://tizen.org/privilege/package.info";
+}  // namespace
+
 typedef enum _PackageThreadWorkType {
   PackageThreadWorkNone = 0,
   PackageThreadWorkGetPackagesInfo,
@@ -296,6 +303,8 @@ void PackageInstance::PackageManagerInstall(
     const picojson::value& args, picojson::object& out) {
   LoggerD("Enter");
 
+  CHECK_PRIVILEGE_ACCESS(kPrivilegePackageInstall, &out);
+
   CHECK_EXIST(args, "callbackId", out)
   CHECK_EXIST(args, "packageFileURI", out)
 
@@ -338,6 +347,8 @@ void PackageInstance::PackageManagerUninstall(
     const picojson::value& args, picojson::object& out) {
   LoggerD("Enter");
 
+  CHECK_PRIVILEGE_ACCESS(kPrivilegePackageInstall, &out);
+
   CHECK_EXIST(args, "callbackId", out)
   CHECK_EXIST(args, "id", out)
 
@@ -377,6 +388,8 @@ void PackageInstance::PackageManagerGetpackagesinfo(
     const picojson::value& args, picojson::object& out) {
   LoggerD("Enter");
 
+  CHECK_PRIVILEGE_ACCESS(kPrivilegePackageInfo, &out);
+
   CHECK_EXIST(args, "callbackId", out)
   int callback_id =
       static_cast<int>(args.get("callbackId").get<double>());
@@ -391,6 +404,8 @@ void PackageInstance::PackageManagerGetpackageinfo(
     const picojson::value& args, picojson::object& out) {
   LoggerD("Enter");
 
+  CHECK_PRIVILEGE_ACCESS(kPrivilegePackageInfo, &out);
+
   if ( args.contains("id") ) {
     std::string id = args.get("id").get<std::string>();
     PackageInfoProvider::GetPackageInfo(id.c_str(), out);
@@ -438,6 +453,8 @@ void PackageInstance::
     const picojson::value& args, picojson::object& out) {
   LoggerD("Enter");
 
+  CHECK_PRIVILEGE_ACCESS(kPrivilegePackageInfo, &out);
+
   CHECK_EXIST(args, "callbackId", out)
 
   if ( is_package_info_listener_set_ ) {
@@ -475,6 +492,8 @@ void PackageInstance::
     const picojson::value& args, picojson::object& out) {
   LoggerD("Enter");
 
+  CHECK_PRIVILEGE_ACCESS(kPrivilegePackageInfo, &out);
+
   if ( !is_package_info_listener_set_ ) {
     LoggerD("Listener is not set");
     ReportSuccess(out);
-- 
2.34.1