Update privilege check logic

Change-Id: I29646ced9c012664fcfdc75b830f4a675b6563cc
Signed-off-by: Duyoung Jang <duyoung.jang@samsung.com>

diff --git a/src/app/package/FAppPkgPackageInfo.cpp b/src/app/package/FAppPkgPackageInfo.cpp
index bf2dfdc..63e3243 100755 (executable)
--- a/src/app/package/FAppPkgPackageInfo.cpp
+++ b/src/app/package/FAppPkgPackageInfo.cpp
@@ -153,7 +153,7 @@ PackageInfo::GetType(void) const
 {
        result r = E_SUCCESS;
 
-       r = _AccessController::CheckUserPrivilege(_PRV_PACKAGESETTING);
+       r = _AccessController::CheckUserPrivilege(_PRV_PACKAGESETTING, _PRV_PACKAGEMANAGER_SETTING);
        SysTryReturn(NID_APP, r == E_SUCCESS, PACKAGE_TYPE_TPK, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
 
        return __pPackageInfoImpl->GetType();
@@ -162,9 +162,6 @@ PackageInfo::GetType(void) const
 IList*
 PackageInfo::GetPrivilegeListN(void) const
 {
-       //result r = _AccessController::CheckUserPrivilege(_PRV_PACKAGESETTING);
-       //SysTryReturn(NID_APP, r == E_SUCCESS, PACKAGE_TYPE_TPK, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
-
        return __pPackageInfoImpl->GetPrivilegeListN();
 }
 

diff --git a/src/app/package/FAppPkgPackageManager.cpp b/src/app/package/FAppPkgPackageManager.cpp
index f762709..2b41a69 100755 (executable)
--- a/src/app/package/FAppPkgPackageManager.cpp
+++ b/src/app/package/FAppPkgPackageManager.cpp
@@ -59,7 +59,7 @@ PackageManager::AddPackageInstallationEventListener(IPackageInstallationEventLis
 
        result r = E_SUCCESS;
 
-       r = _AccessController::CheckUserPrivilege(_PRV_PACKAGEINFO);
+       r = _AccessController::CheckUserPrivilege(_PRV_PACKAGEINFO, _PRV_PACKAGE_INFO);
        SysTryReturnResult(NID_APP, r == E_SUCCESS, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
 
        r = __pPackageManagerImpl->AddEventListener(&listener);
@@ -75,7 +75,7 @@ PackageManager::RemovePackageInstallationEventListener(IPackageInstallationEvent
 
        result r = E_SUCCESS;
 
-       r = _AccessController::CheckUserPrivilege(_PRV_PACKAGEINFO);
+       r = _AccessController::CheckUserPrivilege(_PRV_PACKAGEINFO, _PRV_PACKAGE_INFO);
        SysTryReturnResult(NID_APP, r == E_SUCCESS, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
 
        __pPackageManagerImpl->RemoveEventListener(&listener);
@@ -92,7 +92,7 @@ PackageManager::GetPackageInfoN(const PackageId& packageId) const
        result r = E_SUCCESS;
        PackageInfo* pPackageInfo = null;
 
-       r = _AccessController::CheckUserPrivilege(_PRV_PACKAGEINFO);
+       r = _AccessController::CheckUserPrivilege(_PRV_PACKAGEINFO, _PRV_PACKAGE_INFO);
        SysTryReturn(NID_APP, r == E_SUCCESS, null, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
 
        pPackageInfo = __pPackageManagerImpl->GetPackageInfoN(packageId);
@@ -108,7 +108,7 @@ PackageManager::GetPackageAppInfoN(const AppId& appId) const
        result r = E_SUCCESS;
        PackageAppInfo* pPackageAppInfo = null;
 
-       r = _AccessController::CheckUserPrivilege(_PRV_PACKAGEINFO);
+       r = _AccessController::CheckUserPrivilege(_PRV_PACKAGEINFO, _PRV_PACKAGE_INFO);
        SysTryReturn(NID_APP, r == E_SUCCESS, null, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
 
        pPackageAppInfo = __pPackageManagerImpl->GetPackageAppInfoN(appId);
@@ -123,7 +123,7 @@ PackageManager::GetPackageInfoListN(void) const
 
        result r = E_SUCCESS;
 
-       r = _AccessController::CheckUserPrivilege(_PRV_PACKAGEINFO);
+       r = _AccessController::CheckUserPrivilege(_PRV_PACKAGEINFO, _PRV_PACKAGE_INFO);
        SysTryReturn(NID_APP, r == E_SUCCESS, null, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
 
        return __pPackageManagerImpl->GetPackageInfoListN();
@@ -136,7 +136,7 @@ PackageManager::IsPackageInstalled(const PackageId& packageId) const
 
        result r = E_SUCCESS;
 
-       r = _AccessController::CheckUserPrivilege(_PRV_PACKAGEINFO);
+       r = _AccessController::CheckUserPrivilege(_PRV_PACKAGEINFO, _PRV_PACKAGE_INFO);
        SysTryReturn(NID_APP, r == E_SUCCESS, false, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
 
        return __pPackageManagerImpl->IsPackageInstalled(packageId);
@@ -165,7 +165,7 @@ PackageManager::MoveToExternalStorage(const PackageId& packageId)
 
        result r = E_SUCCESS;
 
-       r = _AccessController::CheckUserPrivilege(_PRV_PACKAGESETTING);
+       r = _AccessController::CheckUserPrivilege(_PRV_PACKAGESETTING, _PRV_PACKAGEMANAGER_SETTING);
        SysTryReturnResult(NID_APP, r == E_SUCCESS, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
 
        return __pPackageManagerImpl->MoveToExternalStorage(packageId);
@@ -178,7 +178,7 @@ PackageManager::MoveToInternalStorage(const PackageId& packageId)
 
        result r = E_SUCCESS;
 
-       r = _AccessController::CheckUserPrivilege(_PRV_PACKAGESETTING);
+       r = _AccessController::CheckUserPrivilege(_PRV_PACKAGESETTING, _PRV_PACKAGEMANAGER_SETTING);
        SysTryReturnResult(NID_APP, r == E_SUCCESS, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
 
        return __pPackageManagerImpl->MoveToInternalStorage(packageId);
@@ -189,8 +189,8 @@ PackageManager::GetPackageInfoFromFileN(const String& packagePath) const
 {
        SysAssertf(__pPackageManagerImpl != null, "Not yet constructed. GetInstance() should be called before use.");
 
-       //result r = _AccessController::CheckUserPrivilege(_PRV_PACKAGEINFO);
-       //SysTryReturn(NID_APP, r == E_SUCCESS, null, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
+       result r = _AccessController::CheckUserPrivilege(_PRV_PACKAGEMANAGER_INFO);
+       SysTryReturn(NID_APP, r == E_SUCCESS, null, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
 
        return __pPackageManagerImpl->GetPackageInfoFromFileN(packagePath);
 }
@@ -200,8 +200,8 @@ PackageManager::GetPackageInfoListN(const IMap& packageFilterMap) const
 {
        SysAssertf(__pPackageManagerImpl != null, "Not yet constructed. GetInstance() should be called before use.");
 
-       //result r = _AccessController::CheckUserPrivilege(_PRV_PACKAGEINFO);
-       //SysTryReturn(NID_APP, r == E_SUCCESS, null, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
+       result r = _AccessController::CheckUserPrivilege(_PRV_PACKAGE_INFO);
+       SysTryReturn(NID_APP, r == E_SUCCESS, null, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
 
        return __pPackageManagerImpl->GetPackageInfoListN(packageFilterMap);
 }
@@ -211,8 +211,8 @@ PackageManager::GetPackageAppInfoListN(const IMap& packageAppFilterMap) const
 {
        SysAssertf(__pPackageManagerImpl != null, "Not yet constructed. GetInstance() should be called before use.");
 
-       //result r = _AccessController::CheckUserPrivilege(_PRV_PACKAGEINFO);
-       //SysTryReturn(NID_APP, r == E_SUCCESS, null, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
+       result r = _AccessController::CheckUserPrivilege(_PRV_PACKAGE_INFO);
+       SysTryReturn(NID_APP, r == E_SUCCESS, null, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
 
        return __pPackageManagerImpl->GetPackageAppInfoListN(packageAppFilterMap);
 }
@@ -222,8 +222,8 @@ PackageManager::GetPackageAppInfoListN(const IMap& packageFilterMap, const IMap&
 {
        SysAssertf(__pPackageManagerImpl != null, "Not yet constructed. GetInstance() should be called before use.");
 
-       //result r = _AccessController::CheckUserPrivilege(_PRV_PACKAGEINFO);
-       //SysTryReturn(NID_APP, r == E_SUCCESS, null, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
+       result r = _AccessController::CheckUserPrivilege(_PRV_PACKAGE_INFO);
+       SysTryReturn(NID_APP, r == E_SUCCESS, null, E_PRIVILEGE_DENIED, "[E_PRIVILEGE_DENIED] The application does not have the privilege to call this method.");
 
        return __pPackageManagerImpl->GetPackageAppInfoListN(packageFilterMap, packageAppFilterMap);
 }