Remove duplicated privilege checking 66/283966/5
authorChanggyu Choi <changyu.choi@samsung.com>
Tue, 8 Nov 2022 02:52:06 +0000 (11:52 +0900)
committerChanggyu Choi <changyu.choi@samsung.com>
Tue, 8 Nov 2022 04:32:29 +0000 (04:32 +0000)
Some package manager apis are already checking their privilege by dbus.
This patch removes duplicated privilege checking from these apis.

Change-Id: I4603771763156d7adb19297bc2fe9c6bbb833eaf
Signed-off-by: Changgyu Choi <changyu.choi@samsung.com>
src/package_manager.c

index 7172fe0..5bf2a44 100644 (file)
@@ -372,10 +372,6 @@ API int package_manager_request_set_tep(package_manager_request_h request,
                         NULL);
        }
 
-       retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (retval != PACKAGE_MANAGER_ERROR_NONE)
-               return retval;
-
        if (pkgmgr_client_set_tep_path(request->pc, tep_path, true))
                return PACKAGE_MANAGER_ERROR_SYSTEM_ERROR;
 
@@ -811,9 +807,6 @@ static int __request_install(package_manager_request_h request,
                const char *path, pkgmgr_handler event_cb, int *id)
 {
        int retval;
-       retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (retval != PACKAGE_MANAGER_ERROR_NONE)
-               return retval;
 
        if (package_manager_client_validate_handle(request))
                return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
@@ -840,9 +833,6 @@ static int __request_install_packages(package_manager_request_h request,
                int *id)
 {
        int retval;
-       retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (retval != PACKAGE_MANAGER_ERROR_NONE)
-               return retval;
 
        if (package_manager_client_validate_handle(request))
                return package_manager_error(
@@ -873,9 +863,6 @@ static int __request_uninstall(package_manager_request_h request,
                const char *name, pkgmgr_handler event_cb, int *id)
 {
        int retval;
-       retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (retval != PACKAGE_MANAGER_ERROR_NONE)
-               return retval;
 
        if (package_manager_client_validate_handle(request))
                return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
@@ -902,9 +889,6 @@ static int __request_move(package_manager_request_h request,
                pkgmgr_handler event_cb, int *id)
 {
        int retval;
-       retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (retval != PACKAGE_MANAGER_ERROR_NONE)
-               return retval;
 
        if (package_manager_client_validate_handle(request))
                return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
@@ -930,9 +914,6 @@ static int __request_mount_install(package_manager_request_h request,
                const char *path, pkgmgr_handler event_cb, int *id)
 {
        int retval;
-       retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (retval != PACKAGE_MANAGER_ERROR_NONE)
-               return retval;
 
        if (package_manager_client_validate_handle(request))
                return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
@@ -959,9 +940,6 @@ static int __request_mount_install_packages(package_manager_request_h request,
                int *id)
 {
        int retval;
-       retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (retval != PACKAGE_MANAGER_ERROR_NONE)
-               return retval;
 
        if (package_manager_client_validate_handle(request))
                return package_manager_error(
@@ -992,9 +970,6 @@ static int __request_res_copy(package_manager_request_h request,
                pkgmgr_res_handler event_cb, int *id)
 {
        int retval;
-       retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (retval != PACKAGE_MANAGER_ERROR_NONE)
-               return retval;
 
        if (package_manager_client_validate_handle(request))
                return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
@@ -1015,9 +990,6 @@ static int __request_res_create_dir(package_manager_request_h request,
                pkgmgr_res_handler event_cb, int *id)
 {
        int retval;
-       retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (retval != PACKAGE_MANAGER_ERROR_NONE)
-               return retval;
 
        if (package_manager_client_validate_handle(request))
                return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
@@ -1039,9 +1011,6 @@ static int __request_res_remove(package_manager_request_h request,
                pkgmgr_res_handler event_cb, int *id)
 {
        int retval;
-       retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (retval != PACKAGE_MANAGER_ERROR_NONE)
-               return retval;
 
        if (package_manager_client_validate_handle(request))
                return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
@@ -1616,9 +1585,6 @@ API int package_manager_set_res_event_cb(package_manager_h manager,
                package_manager_res_event_cb callback, void *user_data)
 {
        int retval;
-       retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (retval != PACKAGE_MANAGER_ERROR_NONE)
-               return retval;
 
        if (package_manager_validate_handle(manager)) {
                return
@@ -1847,9 +1813,6 @@ API int package_manager_get_permission_type(const char *app_id, package_manager_
 API int package_manager_clear_cache_dir(const char *package_id)
 {
        int retval;
-       retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_CACHE);
-       if (retval != PACKAGE_MANAGER_ERROR_NONE)
-               return retval;
 
        int res = pkgmgr_client_clear_cache_dir(package_id);
        if (res < 0) {
@@ -1870,10 +1833,6 @@ API int package_manager_clear_data_dir(const char *package_id)
        if (package_id == NULL)
                return PACKAGE_MANAGER_ERROR_INVALID_PARAMETER;
 
-       retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (retval != PACKAGE_MANAGER_ERROR_NONE)
-               return retval;
-
        retval = pkgmgrinfo_pkginfo_get_pkginfo(package_id, &pkginfo);
        if (retval == PMINFO_R_ENOENT)
                return PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE;
@@ -1951,11 +1910,6 @@ API int package_manager_clear_user_data_with_path(const char *package_id,
 
 API int package_manager_clear_all_cache_dir(void)
 {
-       int retval;
-       retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (retval != PACKAGE_MANAGER_ERROR_NONE)
-               return retval;
-
        return package_manager_clear_cache_dir(PKG_CLEAR_ALL_CACHE);
 }
 
@@ -2387,10 +2341,6 @@ API int package_manager_updateinfo_request_unregister(package_updateinfo_request
        int retval;
        struct package_updateinfo_request_s *update_info;
 
-       retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (retval != PACKAGE_MANAGER_ERROR_NONE)
-               return retval;
-
        if (pkg_updateinfo_req == NULL || pkgid == NULL)
                return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
 
@@ -2407,10 +2357,6 @@ API int package_manager_updateinfo_request_unregister_all(package_updateinfo_req
        int retval;
        struct package_updateinfo_request_s *update_info;
 
-       retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (retval != PACKAGE_MANAGER_ERROR_NONE)
-               return retval;
-
        if (pkg_updateinfo_req == NULL)
                return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
 
@@ -2437,10 +2383,6 @@ API int package_manager_request_add_res_copy_path(
                         NULL);
        }
 
-       retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (retval != PACKAGE_MANAGER_ERROR_NONE)
-               return retval;
-
        if (pkgmgr_client_add_res_copy_path(request->pc, src_path, dest_path))
                return PACKAGE_MANAGER_ERROR_SYSTEM_ERROR;
 
@@ -2460,10 +2402,6 @@ API int package_manager_request_res_copy_with_cb(package_manager_request_h reque
                                PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
        }
 
-       ret = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (ret != PACKAGE_MANAGER_ERROR_NONE)
-               return ret;
-
        if (request->request_cb_table == NULL)
                __initialize_request_cb_table(request);
 
@@ -2495,10 +2433,6 @@ API int package_manager_request_add_res_create_dir_path(
                         NULL);
        }
 
-       retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (retval != PACKAGE_MANAGER_ERROR_NONE)
-               return retval;
-
        if (pkgmgr_client_add_res_create_dir_path(request->pc, dir_path))
                return PACKAGE_MANAGER_ERROR_SYSTEM_ERROR;
 
@@ -2522,10 +2456,6 @@ API int package_manager_request_res_create_dir_with_cb(
        if (request->request_cb_table == NULL)
                __initialize_request_cb_table(request);
 
-       ret = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (ret != PACKAGE_MANAGER_ERROR_NONE)
-               return ret;
-
        ret = __request_res_create_dir(request, internal_res_request_callback, &req_id);
 
        if (req_id > 0) {
@@ -2554,10 +2484,6 @@ API int package_manager_request_add_res_remove_path(
                         NULL);
        }
 
-       retval = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (retval != PACKAGE_MANAGER_ERROR_NONE)
-               return retval;
-
        if (pkgmgr_client_add_res_remove_path(request->pc, res_path))
                return PACKAGE_MANAGER_ERROR_SYSTEM_ERROR;
 
@@ -2578,10 +2504,6 @@ API int package_manager_request_res_remove_with_cb(
                                PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
        }
 
-       ret = check_privilege(PRIVILEGE_PACKAGE_MANAGER_ADMIN);
-       if (ret != PACKAGE_MANAGER_ERROR_NONE)
-               return ret;
-
        if (request->request_cb_table == NULL)
                __initialize_request_cb_table(request);