Remove the temporary code for unauthorized application

[platform/framework/native/appfw.git] / src / security / FSec_PrivilegeInfo.cpp

diff --git a/src/security/FSec_PrivilegeInfo.cpp b/src/security/FSec_PrivilegeInfo.cpp
index 1cb7d72..bc6621c 100644 (file)
--- a/src/security/FSec_PrivilegeInfo.cpp
+++ b/src/security/FSec_PrivilegeInfo.cpp
@@ -98,6 +98,10 @@ _PrivilegeInfo::Construct(const AppId& appId, const byte* pBitwisePrivilege, con
                SysTryReturnResult(NID_SEC, ret == PRVMGR_ERR_NONE, E_SYSTEM, "An unexpected system error occurred.");
 
                __privilegeList.Add((new String(*pTempString)), (new String(pPrivilegeLevel)));
+               if (pPrivilegeLevel != null)
+               {
+                       free(pPrivilegeLevel);
+               }
        }
 
        return r;
@@ -165,6 +169,10 @@ _PrivilegeInfo::Construct(const AppId& appId, const String& encryptedPrivileges,
                SysTryReturnResult(NID_SEC, ret == PRVMGR_ERR_NONE, E_SYSTEM, "An unexpected system error occurred.");
 
                __privilegeList.Add((new String(*pTempString)), (new String(pPrivilegeLevel)));
+               if (pPrivilegeLevel != null)
+               {
+                       free(pPrivilegeLevel);
+               }
        }
 
        return r;
@@ -265,6 +273,10 @@ _PrivilegeInfo::Construct(const AppId& appId, const String& encryptedPrivileges,
                SysTryReturnResult(NID_SEC, ret == PRVMGR_ERR_NONE, E_SYSTEM, "An unexpected system error occurred.");
 
                __privilegeList.Add((new String(*pTempString)), (new String(pPrivilegeLevel)));
+               if (pPrivilegeLevel != null)
+               {
+                       free(pPrivilegeLevel);
+               }
        }
 
        return r;
@@ -469,13 +481,10 @@ _PrivilegeInfo::HasPrivilege(_Privilege privilege) const
        byte bitwiseTargetPrivilege = 0;
        byte tempBitwisePrivilege = 0;
 
-       if (__apiVisibility != _API_VISIBILITY_NONE) // To be removed
+       if (visibilityLevelListTable[privilege] > __apiVisibility)
        {
-               if (visibilityLevelListTable[privilege] > __apiVisibility)
-               {
-                       SysLog(NID_SEC, "Result : FALSE [Visibility]");
-                       return ret;
-               }
+               SysLog(NID_SEC, "Result : FALSE [Visibility]");
+               return ret;
        }
 
        bitwiseTargetPrivilege = bitwiseTargetPrivilege | (1 << privilegeBit);
@@ -503,12 +512,9 @@ _PrivilegeInfo::HasPrivilegeEx(_Privilege privilege) const
        byte bitwiseTargetPrivilege = 0;
        byte tempBitwisePrivilege = 0;
 
-       if (__apiVisibility != _API_VISIBILITY_NONE) // To be removed
+       if (visibilityLevelListTable[privilege] > __apiVisibility)
        {
-               if (visibilityLevelListTable[privilege] > __apiVisibility)
-               {
-                       return ret;
-               }
+               return ret;
        }
 
        bitwiseTargetPrivilege = bitwiseTargetPrivilege | (1 << privilegeBit);
@@ -559,17 +565,14 @@ _PrivilegeInfo::HasPrivilege(const String& privilege) const
                ret = __privilegeList.ContainsKey(privilege);
        if (ret)
                {
-               if (__apiVisibility != _API_VISIBILITY_NONE) // To be removed
+                       const String* pPrivilegeLevel = static_cast< const String* >(__privilegeList.GetValue(privilege));
+                       SysTryReturn(NID_SEC, pPrivilegeLevel != null, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] An unexpected system error occurred.");
+
+                       int privilegeLevel = GetPrivilegeLevel(*pPrivilegeLevel);
+                       if (privilegeLevel > __apiVisibility)
                        {
-                       const String* pPrivilegeLevel = static_cast< const String* >(__privilegeList.GetValue(privilege));
-                       SysTryReturn(NID_SEC, pPrivilegeLevel != null, E_SYSTEM, E_SYSTEM, "[E_SYSTEM] An unexpected system error occurred.");
-
-                       int privilegeLevel = GetPrivilegeLevel(*pPrivilegeLevel);
-                               if (privilegeLevel > __apiVisibility)
-                               {
-                                       SysLog(NID_SEC, "Result : FALSE [Visibility]");
-                                       return false;
-                               }
+                               SysLog(NID_SEC, "Result : FALSE [Visibility]");
+                               return false;
                        }
 
                        SysLog(NID_SEC, "Result : TRUE");