From: Sangyoon Jang Date: Tue, 12 Jul 2016 10:19:03 +0000 (+0900) Subject: Replace '_usr_' prefixed api with normal apis X-Git-Tag: accepted/tizen/common/20160713.050558^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F97%2F79697%2F1;p=platform%2Fcore%2Fapi%2Fpackage-manager.git Replace '_usr_' prefixed api with normal apis '_usr_' prefixed apis are for system dameons. noraml apis call '_usr_' prefixed apis with caller's uid. (using getuid()) Change-Id: I680c7db9c8da9577b3075561be5bd5940acd0aff Signed-off-by: Sangyoon Jang --- diff --git a/src/package_info.c b/src/package_info.c index 948a7f7..ad7cb83 100644 --- a/src/package_info.c +++ b/src/package_info.c @@ -28,8 +28,6 @@ #include "package_manager.h" #include "package_manager_internal.h" -#define GLOBAL_USER tzplatform_getuid(TZ_SYS_GLOBALAPP_USER) - struct package_info_s { char *package; pkgmgrinfo_pkginfo_h pkgmgr_pkginfo; @@ -49,18 +47,13 @@ API int package_info_create(const char *package, package_info_h *package_info) { package_info_h package_info_created; pkgmgrinfo_pkginfo_h pkgmgr_pkginfo; - uid_t uid = getuid(); if (package == NULL || package_info == NULL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - if (uid != GLOBAL_USER) { - if (pkgmgrinfo_pkginfo_get_usr_pkginfo(package, uid, &pkgmgr_pkginfo) != PKGMGR_R_OK) - return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } else { - if (pkgmgrinfo_pkginfo_get_pkginfo(package, &pkgmgr_pkginfo) != PKGMGR_R_OK) - return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } + if (pkgmgrinfo_pkginfo_get_pkginfo(package, &pkgmgr_pkginfo) != PKGMGR_R_OK) + return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); + package_info_created = calloc(1, sizeof(struct package_info_s)); if (package_info_created == NULL) { @@ -116,20 +109,19 @@ API int package_info_foreach_app_from_package(package_info_h package_info, packa .user_data = user_data, }; pkgmgrinfo_pkginfo_h pkgmgr_pkginfo; - uid_t uid = getuid(); if (package_info == NULL || callback == NULL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - if (pkgmgrinfo_pkginfo_get_usr_pkginfo(package_info->package, uid, &pkgmgr_pkginfo) != PKGMGR_R_OK) + if (pkgmgrinfo_pkginfo_get_pkginfo(package_info->package, &pkgmgr_pkginfo) != PKGMGR_R_OK) return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); if (comp_type == PACKAGE_INFO_ALLAPP) - pkgmgrinfo_appinfo_get_usr_list(pkgmgr_pkginfo, PMINFO_ALL_APP, package_info_foreach_app_cb, &foreach_app_context, uid); + pkgmgrinfo_appinfo_get_list(pkgmgr_pkginfo, PMINFO_ALL_APP, package_info_foreach_app_cb, &foreach_app_context); if (comp_type == PACKAGE_INFO_UIAPP) - pkgmgrinfo_appinfo_get_usr_list(pkgmgr_pkginfo, PMINFO_UI_APP, package_info_foreach_app_cb, &foreach_app_context, uid); + pkgmgrinfo_appinfo_get_list(pkgmgr_pkginfo, PMINFO_UI_APP, package_info_foreach_app_cb, &foreach_app_context); if (comp_type == PACKAGE_INFO_SERVICEAPP) - pkgmgrinfo_appinfo_get_usr_list(pkgmgr_pkginfo, PMINFO_SVC_APP, package_info_foreach_app_cb, &foreach_app_context, uid); + pkgmgrinfo_appinfo_get_list(pkgmgr_pkginfo, PMINFO_SVC_APP, package_info_foreach_app_cb, &foreach_app_context); return PACKAGE_MANAGER_ERROR_NONE; } @@ -439,7 +431,6 @@ API int package_info_foreach_cert_info(package_info_h package_info, package_info pkgmgrinfo_certinfo_h handle = NULL; int i = 0; const char *cert_value = NULL; - uid_t uid = getuid(); if (package_info == NULL || callback == NULL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); @@ -448,7 +439,7 @@ API int package_info_foreach_cert_info(package_info_h package_info, package_info if (retval != PMINFO_R_OK) return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - retval = pkgmgrinfo_pkginfo_load_certinfo(package_info->package, handle, uid); + retval = pkgmgrinfo_pkginfo_load_certinfo(package_info->package, handle, getuid()); if (retval != PMINFO_R_OK) { pkgmgrinfo_pkginfo_destroy_certinfo(handle); return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); diff --git a/src/package_manager.c b/src/package_manager.c index 4839330..7ece761 100644 --- a/src/package_manager.c +++ b/src/package_manager.c @@ -209,10 +209,7 @@ API int package_manager_request_set_mode(package_manager_request_h request, NULL); } - if (mode == PACKAGE_MANAGER_REQUEST_MODE_QUIET) - request->mode = PM_QUIET; - else - request->mode = PM_DEFAULT; + /* request mode is not used anymore */ return PACKAGE_MANAGER_ERROR_NONE; } @@ -483,18 +480,8 @@ API int package_manager_request_install(package_manager_request_h request, return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); int request_id = 0; - uid_t uid = getuid(); - if (uid != GLOBAL_USER) - request_id = pkgmgr_client_usr_install(request->pc, request->pkg_type, NULL, - path, NULL, - request->mode, request_event_handler, - request, - uid); - else - request_id = pkgmgr_client_install(request->pc, request->pkg_type, NULL, - path, NULL, - request->mode, request_event_handler, - request); + request_id = pkgmgr_client_install(request->pc, request->pkg_type, NULL, + path, NULL, request->mode, request_event_handler, request); if (request_id == PKGMGR_R_EINVAL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); @@ -530,15 +517,8 @@ API int package_manager_request_uninstall(package_manager_request_h request, return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); int request_id = 0; - uid_t uid = getuid(); - if (uid != GLOBAL_USER) - request_id = pkgmgr_client_usr_uninstall(request->pc, request->pkg_type, - name, request->mode, - request_event_handler, request, uid); - else - request_id = pkgmgr_client_uninstall(request->pc, request->pkg_type, - name, request->mode, - request_event_handler, request); + request_id = pkgmgr_client_uninstall(request->pc, request->pkg_type, + name, request->mode, request_event_handler, request); if (request_id == PKGMGR_R_EINVAL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); @@ -574,15 +554,9 @@ API int package_manager_request_move(package_manager_request_h request, return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); int ret = 0; - uid_t uid = getuid(); - if (uid != GLOBAL_USER) - ret = pkgmgr_client_usr_request_service(PM_REQUEST_MOVE, move_type, - request->pc, request->pkg_type, name, - uid, NULL, request_event_handler, NULL); - else - ret = pkgmgr_client_request_service(PM_REQUEST_MOVE, move_type, - request->pc, request->pkg_type, name, - NULL, request_event_handler, NULL); + ret = pkgmgr_client_request_service(PM_REQUEST_MOVE, move_type, + request->pc, request->pkg_type, name, + NULL, request_event_handler, NULL); if (ret == PKGMGR_R_EINVAL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); @@ -931,14 +905,8 @@ API int package_manager_get_package_id_by_app_id(const char *app_id, char **pack if (app_id == NULL || package_id == NULL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - uid_t uid = getuid(); - if (uid != GLOBAL_USER) { - if (pkgmgrinfo_appinfo_get_usr_appinfo(app_id, uid, &pkgmgrinfo_appinfo) != PMINFO_R_OK) - return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } else { - if (pkgmgrinfo_appinfo_get_appinfo(app_id, &pkgmgrinfo_appinfo) != PMINFO_R_OK) - return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } + if (pkgmgrinfo_appinfo_get_appinfo(app_id, &pkgmgrinfo_appinfo) != PMINFO_R_OK) + return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); retval = pkgmgrinfo_appinfo_get_pkgname(pkgmgrinfo_appinfo, &pkg_id); if (retval != PMINFO_R_OK) return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); @@ -991,17 +959,11 @@ API int package_manager_foreach_package_info(package_manager_package_info_cb cal API int package_manager_compare_package_cert_info(const char *lhs_package_id, const char *rhs_package_id, package_manager_compare_result_type_e *compare_result) { pkgmgrinfo_cert_compare_result_type_e result; - uid_t uid = getuid(); if (lhs_package_id == NULL || rhs_package_id == NULL || compare_result == NULL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - if (uid != GLOBAL_USER) { - if (pkgmgrinfo_pkginfo_compare_usr_pkg_cert_info(lhs_package_id, rhs_package_id, uid, &result) != PKGMGR_R_OK) - return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } else { - if (pkgmgrinfo_pkginfo_compare_pkg_cert_info(lhs_package_id, rhs_package_id, &result) != PKGMGR_R_OK) - return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } + if (pkgmgrinfo_pkginfo_compare_pkg_cert_info(lhs_package_id, rhs_package_id, &result) != PKGMGR_R_OK) + return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); *compare_result = (package_manager_compare_result_type_e)result; return PACKAGE_MANAGER_ERROR_NONE; @@ -1010,17 +972,11 @@ API int package_manager_compare_package_cert_info(const char *lhs_package_id, co API int package_manager_compare_app_cert_info(const char *lhs_app_id, const char *rhs_app_id, package_manager_compare_result_type_e *compare_result) { pkgmgrinfo_cert_compare_result_type_e result; - uid_t uid = getuid(); if (lhs_app_id == NULL || rhs_app_id == NULL || compare_result == NULL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - if (uid != GLOBAL_USER) { - if (pkgmgrinfo_pkginfo_compare_usr_app_cert_info(lhs_app_id, rhs_app_id, uid, &result) != PKGMGR_R_OK) - return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } else { - if (pkgmgrinfo_pkginfo_compare_app_cert_info(lhs_app_id, rhs_app_id, &result) != PKGMGR_R_OK) - return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); - } + if (pkgmgrinfo_pkginfo_compare_app_cert_info(lhs_app_id, rhs_app_id, &result) != PKGMGR_R_OK) + return package_manager_error(PACKAGE_MANAGER_ERROR_IO_ERROR, __FUNCTION__, NULL); *compare_result = (package_manager_compare_result_type_e)result; @@ -1040,32 +996,18 @@ API int package_manager_is_preload_package_by_app_id(const char *app_id, bool *p char *pkg_id = NULL; bool is_preload = 0; - uid_t uid = getuid(); - if (uid != GLOBAL_USER) { - if (pkgmgrinfo_appinfo_get_usr_appinfo(app_id, uid, &pkgmgrinfo_appinfo) != PMINFO_R_OK) - return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } else { - if (pkgmgrinfo_appinfo_get_appinfo(app_id, &pkgmgrinfo_appinfo) != PMINFO_R_OK) - return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } + if (pkgmgrinfo_appinfo_get_appinfo(app_id, &pkgmgrinfo_appinfo) != PMINFO_R_OK) + return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); retval = pkgmgrinfo_appinfo_get_pkgname(pkgmgrinfo_appinfo, &pkg_id); if (retval != PMINFO_R_OK) { pkgmgrinfo_appinfo_destroy_appinfo(pkgmgrinfo_appinfo); return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); } - if (uid != GLOBAL_USER) { - if (pkgmgrinfo_pkginfo_get_usr_pkginfo(pkg_id, uid, &pkgmgrinfo_pkginfo) != PMINFO_R_OK) { - pkgmgrinfo_appinfo_destroy_appinfo(pkgmgrinfo_appinfo); - pkgmgrinfo_pkginfo_destroy_pkginfo(pkgmgrinfo_pkginfo); - return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } - } else { - if (pkgmgrinfo_pkginfo_get_pkginfo(pkg_id, &pkgmgrinfo_pkginfo) != PMINFO_R_OK) { - pkgmgrinfo_appinfo_destroy_appinfo(pkgmgrinfo_appinfo); - pkgmgrinfo_pkginfo_destroy_pkginfo(pkgmgrinfo_pkginfo); - return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } + if (pkgmgrinfo_pkginfo_get_pkginfo(pkg_id, &pkgmgrinfo_pkginfo) != PMINFO_R_OK) { + pkgmgrinfo_appinfo_destroy_appinfo(pkgmgrinfo_appinfo); + pkgmgrinfo_pkginfo_destroy_pkginfo(pkgmgrinfo_pkginfo); + return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); } if (pkgmgrinfo_pkginfo_is_preload(pkgmgrinfo_pkginfo, &is_preload) != PMINFO_R_OK) { pkgmgrinfo_appinfo_destroy_appinfo(pkgmgrinfo_appinfo); @@ -1094,14 +1036,8 @@ API int package_manager_get_permission_type(const char *app_id, package_manager_ pkgmgrinfo_appinfo_h pkgmgrinfo_appinfo = NULL; pkgmgrinfo_permission_type permission = 0; - uid_t uid = getuid(); - if (uid != GLOBAL_USER) { - if (pkgmgrinfo_appinfo_get_usr_appinfo(app_id, uid, &pkgmgrinfo_appinfo) != PMINFO_R_OK) - return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } else { - if (pkgmgrinfo_appinfo_get_appinfo(app_id, &pkgmgrinfo_appinfo) != PMINFO_R_OK) - return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); - } + if (pkgmgrinfo_appinfo_get_appinfo(app_id, &pkgmgrinfo_appinfo) != PMINFO_R_OK) + return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); retval = pkgmgrinfo_appinfo_get_permission_type(pkgmgrinfo_appinfo, &permission); if (retval != PMINFO_R_OK) return package_manager_error(PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE, __FUNCTION__, NULL); @@ -1127,7 +1063,7 @@ API int package_manager_clear_cache_dir(const char *package_id) if (retval != PACKAGE_MANAGER_ERROR_NONE) return retval; - int res = pkgmgr_client_usr_clear_cache_dir(package_id, getuid()); + int res = pkgmgr_client_clear_cache_dir(package_id); if (res == PKGMGR_R_EINVAL) { return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); } else if (res == PKGMGR_R_ENOPKG) { @@ -1228,9 +1164,9 @@ static int _get_pkg_size_info(const char *package_id, void *callback, void *user int res = 0; if (strcmp(package_id, PKG_SIZE_INFO_TOTAL) != 0) - res = pkgmgr_client_usr_get_package_size_info(pc, package_id, __result_cb, user_data, getuid()); + res = pkgmgr_client_get_package_size_info(pc, package_id, __result_cb, user_data); else - res = pkgmgr_client_usr_get_total_package_size_info(pc, __total_result_cb, user_data, getuid()); + res = pkgmgr_client_get_total_package_size_info(pc, __total_result_cb, user_data); if (res == PKGMGR_R_EINVAL) { pkgmgr_client_free(pc); diff --git a/src/package_manager_internal.c b/src/package_manager_internal.c index dae6a47..c88fb92 100644 --- a/src/package_manager_internal.c +++ b/src/package_manager_internal.c @@ -29,7 +29,6 @@ #include "package_manager_internal.h" #define MAX_SMACK_LABEL_LEN 255 -#define GLOBAL_USER tzplatform_getuid(TZ_SYS_GLOBALAPP_USER) typedef struct _foreach_pkg_context_ { package_manager_package_info_cb callback; @@ -174,11 +173,7 @@ int package_info_foreach_package_info(package_manager_package_info_cb callback, if (callback == NULL) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - uid_t uid = getuid(); - if (uid != GLOBAL_USER) - ret = pkgmgrinfo_pkginfo_get_usr_list(package_info_foreach_package_info_cb, &foreach_pkg_context, uid); - else - ret = pkgmgrinfo_pkginfo_get_list(package_info_foreach_package_info_cb, &foreach_pkg_context); + ret = pkgmgrinfo_pkginfo_get_list(package_info_foreach_package_info_cb, &foreach_pkg_context); if (ret < 0) return PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE; @@ -193,16 +188,11 @@ int package_info_filter_foreach_package_info(pkgmgrinfo_pkginfo_filter_h handle, .user_data = user_data, }; int ret; - uid_t uid; if ((handle == NULL) || (callback == NULL)) return package_manager_error(PACKAGE_MANAGER_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL); - uid = getuid(); - if (uid != GLOBAL_USER) - ret = pkgmgrinfo_pkginfo_usr_filter_foreach_pkginfo(handle, package_info_foreach_package_info_cb, &foreach_pkg_context, uid); - else - ret = pkgmgrinfo_pkginfo_filter_foreach_pkginfo(handle, package_info_foreach_package_info_cb, &foreach_pkg_context); + ret = pkgmgrinfo_pkginfo_filter_foreach_pkginfo(handle, package_info_foreach_package_info_cb, &foreach_pkg_context); if (ret < 0) return PACKAGE_MANAGER_ERROR_IO_ERROR;