Fixed pkg-mgr plugin related things (install/uninstall callbacks)

Change-Id: Iff8a4d03c9df6965955c953e6a20f3fb2f103671

diff --git a/common/src/PrivacyIdInfo.cpp b/common/src/PrivacyIdInfo.cpp
index 86e574b..c6a8262 100755 (executable)
--- a/common/src/PrivacyIdInfo.cpp
+++ b/common/src/PrivacyIdInfo.cpp
@@ -131,6 +131,7 @@ PrivacyIdInfo::getPrivacyIdListFromPrivilegeList(const std::list< std::string >
                int res = getPrivacyIdFromPrivilege(*iter, privacyId);
                if (res == PRIV_GUARD_ERROR_SUCCESS)
                {
+                       PG_LOGD("Privacy[%s] from Privilege[%s]", privacyId.c_str(), iter->c_str());
                        privacyIdSet.insert(privacyId);
                }
        }

diff --git a/pkgmgr_plugin/CMakeLists.txt b/pkgmgr_plugin/CMakeLists.txt
index f02c398..5144c82 100755 (executable)
--- a/pkgmgr_plugin/CMakeLists.txt
+++ b/pkgmgr_plugin/CMakeLists.txt
@@ -17,7 +17,6 @@ INCLUDE_DIRECTORIES(
     /usr/include/libxml2
     /usr/include/package_manager
     /usr/include/dlog
-    /usr/include/db-util
     "${CMAKE_SOURCE_DIR}/client/inc/"
     "${CMAKE_SOURCE_DIR}/common/inc/"
     "${CMAKE_SOURCE_DIR}/include/"
@@ -45,13 +44,6 @@ ADD_LIBRARY (${this_target} SHARED ${${this_target}_SOURCE_FILES} )
 ADD_DEPENDENCIES(${this_target} privacy-guard-client)
 ## SET LINKER FLAGS
 SET(CMAKE_SHARED_LINKER_FLAGS -Wl,--no-undefined)
-## SET PRIVACY_POPUP FLAG
-#OPTION (PRIVACY_POPUP "PRIVACY_POPUP" ON)
-#IF(PRIVACY_POPUP)
-#      MESSAGE("PRIVACY_POPUP IS ENABLED")
-#      ADD_DEFINITIONS("-D__PRIVACY_POPUP")
-#ENDIF(PRIVACY_POPUP)
-
 
 TARGET_LINK_LIBRARIES(${this_target} ${pkg_LDFLAGS} ${pkg_LIBRARIES})
 TARGET_LINK_LIBRARIES(${this_target} "-lprivacy-guard-client" "-L../client" )
@@ -63,9 +55,5 @@ ADD_CUSTOM_COMMAND(TARGET ${this_target}
     COMMENT "strip ${this_target}"
         )
 
-#INSTALL(TARGETS ${this_target} DESTINATION "../etc/package-manager/parserlib")
-#INSTALL(TARGETS ${this_target} DESTINATION "/etc/package-manager/parserlib")
-#INSTALL(TARGETS ${this_target} DESTINATION ${_sysconfdir}/package-manager/parserlib)
-#INSTALL(TARGETS ${this_target} DESTINATION "etc/package-manager/parserlib")
 INSTALL(TARGETS ${this_target} DESTINATION ${SYSCONF_INSTALL_DIR}/package-manager/parserlib/)
 

diff --git a/pkgmgr_plugin/privileges.cpp b/pkgmgr_plugin/privileges.cpp
index 8ee8c60..3810651 100755 (executable)
--- a/pkgmgr_plugin/privileges.cpp
+++ b/pkgmgr_plugin/privileges.cpp
@@ -21,29 +21,41 @@
 #include <dlog.h>
 #include <list>
 #include <string>
+#include <unistd.h>
 #include "privacy_guard_client_internal.h"
 #include "PrivacyGuardClient.h"
-#include "Utils.h"
+
+#define DEFAULT_MONITOR_POLICY 1
 
 static const xmlChar _NODE_PRIVILEGES[]                = "privileges";
 static const xmlChar _NODE_PRIVILEGE[]         = "privilege";
 
 void destroy_char_list(char** ppList, int size)
 {
-       int i;
-       for (i = 0; i < size; ++i)
-       {
-               if (ppList[i])
-                       free(ppList[i]);
+       int i = 0;
+
+       if (ppList) {
+               for (i = 0; i < size; ++i) {
+                       if (ppList[i])
+                               free(ppList[i]);
+               }
+               free(ppList);
        }
-       free(ppList);
 }
 
 extern "C"
 __attribute__ ((visibility("default")))
 int PKGMGR_PARSER_PLUGIN_INSTALL(xmlDocPtr docPtr, const char* packageId)
-{      
-       PG_LOGD("PKGMGR_PARSER_PLUGIN_INSTALL() called.");
+{
+       if (packageId == NULL) {
+               LOGE("Package ID is NULL");
+               return -EINVAL;
+       }
+
+       LOGD("PKGMGR_PARSER_PLUGIN_INSTALL() called with [%s].", packageId);
+
+       uid_t user_id = getuid();
+       LOGD("Current userid is %d.", user_id);
 
        int ret = 0;
 
@@ -51,26 +63,19 @@ int PKGMGR_PARSER_PLUGIN_INSTALL(xmlDocPtr docPtr, const char* packageId)
        xmlNodePtr curPtr = xmlFirstElementChild(xmlDocGetRootElement(docPtr));
 
        curPtr = curPtr->xmlChildrenNode;
-       if (curPtr == NULL)
-       {
-               LOGD("No privileges");
-               return 0;
+       if (curPtr == NULL) {
+               LOGE("No privileges");
+               return -EINVAL;
        }
 
        std::list <std::string> privilegeList;
-       while (curPtr != NULL)
-       {
-               if (xmlStrcmp(curPtr->name, _NODE_PRIVILEGE) == 0)
-               {
+       while (curPtr != NULL) {
+               if (xmlStrcmp(curPtr->name, _NODE_PRIVILEGE) == 0) {
                        xmlChar* pPrivilege = xmlNodeListGetString(docPtr, curPtr->xmlChildrenNode, 1);
-
-                       if (pPrivilege == NULL)
-                       {
-                               PG_LOGE("Failed to get value");
+                       if (pPrivilege == NULL) {
+                               LOGE("Failed to get privilege value.");
                                return -EINVAL;
-                       }
-            else
-                       {
+                       } else {
                                privilegeList.push_back(std::string( reinterpret_cast<char*> (pPrivilege)));
                        }
                }
@@ -78,12 +83,12 @@ int PKGMGR_PARSER_PLUGIN_INSTALL(xmlDocPtr docPtr, const char* packageId)
        }
 
        char** ppPrivilegeList = (char**) calloc(privilegeList.size() + 1, sizeof(char*));
+       char** temp = ppPrivilegeList;
        std::list <std::string>::iterator iter = privilegeList.begin();
-       for (size_t i = 0; i < privilegeList.size(); ++i)
-       {
-               ppPrivilegeList[i] = (char*)calloc (strlen(iter->c_str()) + 1, sizeof(char));
-               if (ppPrivilegeList[i] == NULL)
-               {
+       for (size_t i = 0; i < privilegeList.size(); ++i) {
+               ppPrivilegeList[i] = (char*)calloc(strlen(iter->c_str()) + 1, sizeof(char));
+               if (ppPrivilegeList[i] == NULL) {
+                       LOGE("Failed allocate memory.");
                        destroy_char_list(ppPrivilegeList, privilegeList.size() + 1);
                        return -ENOMEM;
                }
@@ -94,28 +99,22 @@ int PKGMGR_PARSER_PLUGIN_INSTALL(xmlDocPtr docPtr, const char* packageId)
        ppPrivilegeList[privilegeList.size()] = (char*)calloc (2, sizeof(char));
        memcpy(ppPrivilegeList[privilegeList.size()], "\0", 1);
 
-       // TO DO : get user id
-       int user_id = 1;
-       int monitor_policy = 1;
-
-       if (user_id < 0 || packageId == NULL)
-               return -EINVAL;
-
        PrivacyGuardClient *pInst = PrivacyGuardClient::getInstance();
        std::list < std::string > privilege_List;
 
-       while (*ppPrivilegeList[0] != '\0')
-       {
-               PG_LOGD("privacyList : %s", *ppPrivilegeList);
+       while (*ppPrivilegeList[0] != '\0') {
+               LOGD("privilege in the List: %s", *ppPrivilegeList);
                privilege_List.push_back(std::string(*ppPrivilegeList++));
        }
+
+       int monitor_policy = DEFAULT_MONITOR_POLICY;
        ret = pInst->PgAddMonitorPolicy(user_id, std::string(packageId), privilege_List, monitor_policy);
-       destroy_char_list(ppPrivilegeList, privilegeList.size() + 1);
-       if (ret != PRIV_GUARD_ERROR_SUCCESS)
-       {
-               PG_LOGD("Failed to install monitor policy: %d", ret);
-               return -EINVAL;
+       if (ret != PRIV_GUARD_ERROR_SUCCESS) {
+               LOGE("Failed to add monitor policy: [%d]", ret);
+               return -EIO;
        }
+       if (temp)
+               destroy_char_list(temp, privilegeList.size() + 1);
 
     return 0;
 }
@@ -124,26 +123,29 @@ extern "C"
 __attribute__ ((visibility("default")))
 int PKGMGR_PARSER_PLUGIN_UNINSTALL(xmlDocPtr docPtr, const char* packageId)
 {
-       PG_LOGD("PKGMGR_PARSER_PLUGIN_UNINSTALL() called.");
+       if (packageId == NULL) {
+               LOGE("Package ID is NULL");
+               return -EINVAL;
+       }
 
-       if (packageId == NULL)
-               return PRIV_GUARD_ERROR_INVALID_PARAMETER;
+       LOGD("PKGMGR_PARSER_PLUGIN_UNINSTALL() called with [%s].", packageId);
 
        PrivacyGuardClient *pInst = PrivacyGuardClient::getInstance();
 
        int res = pInst->PgDeleteLogsByPackageId(std::string(packageId));
-       if (res != PRIV_GUARD_ERROR_SUCCESS)
-       {
-               PG_LOGD("Failed to delete logs");
-               return 0;
+       if (res != PRIV_GUARD_ERROR_SUCCESS) {
+               LOGE("Failed to delete logs using PgDeleteLogsByPackageId() [%d]", res);
+               return -EIO;
        }
 
        res = pInst->PgDeleteMonitorPolicyByPackageId(std::string(packageId));
-       if (res != PRIV_GUARD_ERROR_SUCCESS)
-       {
-               PG_LOGD("Failed to delete monitor policy");
+       if (res != PRIV_GUARD_ERROR_SUCCESS) {
+               LOGE("Failed to delete monitor policy using PgDeleteMonitorPolicyByPackageId() [%d]", res);
+               return -EIO;
        }
 
+       LOGD("PKGMGR_PARSER_PLUGIN_UNINSTALL() end.");
+
        return 0;
 }
 
@@ -151,22 +153,24 @@ extern "C"
 __attribute__ ((visibility("default")))
 int PKGMGR_PARSER_PLUGIN_UPGRADE(xmlDocPtr docPtr, const char* packageId)
 {
-       PG_LOGD("PKGMGR_PARSER_PLUGIN_UPGRADE() called.");
-
-       int res = 0;
+       if (packageId == NULL) {
+               LOGE("Package ID is NULL");
+               return -EINVAL;
+       }
 
-    PG_LOGD("Update privacy Info");
+       LOGD("PKGMGR_PARSER_PLUGIN_UPGRADE() called with [%s].", packageId);
 
-       res = PKGMGR_PARSER_PLUGIN_UNINSTALL(docPtr, packageId);
-       if (res != 0)
-       {
-               PG_LOGD("Privacy info can be already uninstalled");
+       int res = PKGMGR_PARSER_PLUGIN_UNINSTALL(docPtr, packageId);
+       if (res != 0) {
+               LOGE("PKGMGR_PARSER_PLUGIN_UNINSTALL is failed. [%d]", res);
+               return res;
        }
 
        res = PKGMGR_PARSER_PLUGIN_INSTALL(docPtr, packageId);
-       if (res != 0)
-       {
-               PG_LOGD("Failed to install privacy Info: %d", res);
+       if (res != 0) {
+               LOGE("PKGMGR_PARSER_PLUGIN_INSTALL is failed. [%d]", res);
+               return res;
        }
+
        return res;
 }

diff --git a/server/src/PrivacyGuardDb.cpp b/server/src/PrivacyGuardDb.cpp
index 2d7fc9b..29573b3 100755 (executable)
--- a/server/src/PrivacyGuardDb.cpp
+++ b/server/src/PrivacyGuardDb.cpp
@@ -237,8 +237,6 @@ PrivacyGuardDb::PgAddPrivacyAccessLogTest(const int userId, const std::string pa
 int
 PrivacyGuardDb::PgAddMonitorPolicy(const int userId, const std::string packageId, const std::list < std::string > privacyList, bool monitorPolicy)
 {
-       PG_LOGD("PrivacyGuardDb::PgAddMonitorPolicy");
-
        int res = -1;
 
        static const std::string QUERY_INSERT = std::string("INSERT INTO MonitorPolicy(USER_ID, PKG_ID, PRIVACY_ID, MONITOR_POLICY) VALUES(?, ?, ?, ?)");
@@ -1173,8 +1171,7 @@ PrivacyGuardDb::getInstance(void)
 {
        std::lock_guard < std::mutex > guard(m_singletonMutex);
 
-       if (m_pInstance == NULL)
-       {       
+       if (m_pInstance == NULL) {
                m_pInstance = new PrivacyGuardDb();
        }