From: Yunjin Lee Date: Fri, 10 Jul 2020 05:33:28 +0000 (+0900) Subject: Rename privilege_info_db_row and related function X-Git-Tag: submit/tizen/20200806.054000~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee50d48246e60b3c556d032b255fe3028502c46e;p=platform%2Fcore%2Fsecurity%2Fprivilege-checker.git Rename privilege_info_db_row and related function - Originally privilege_info_db_row_s was made to have all privilege info such as privilege name, level, issued and deprecaed version or so. But the required privilege info for privilege verification was reduced to only privilege level and now, the name is not matched to its role. Hence rename it properly. - struct - AS-IS: privilege_info_db_row_s - TO-BE: privilege_level_info_s - functions - AS-IS: privilege_db_manager_get_privilege_list() - TO-BE: privilege_db_manager_get_privilege_level_info_list() - AS-IS: free_privilege_info_db_row_list() - TO-BE: free_privilege_level_info_list() Change-Id: Ie72fe0fe423742bc1e7b5f12ff243dd56af23a47 Signed-off-by: Yunjin Lee --- diff --git a/capi/include/privilege_db_manager.h b/capi/include/privilege_db_manager.h index 8474f2e..b799de4 100755 --- a/capi/include/privilege_db_manager.h +++ b/capi/include/privilege_db_manager.h @@ -26,10 +26,10 @@ #endif /** - * @brief Free GList of privilege_info_db_row_s* allocated by privilege_db_manager_get_privilege_list() - * @param [in] list The GList allocated by privilege_db_manager_get_privilege_list() + * @brief Free GList of privilege_info_db_row_s* allocated by privilege_db_manager_get_privilege_level_info_list() + * @param [in] list The GList allocated by privilege_db_manager_get_privilege_level_info_list() */ -void free_privilege_info_db_row_list(GList* list); +void free_privilege_level_info_list(GList* list); /** * @brief Free GList allocated by privilege_db_manager APIs @@ -38,7 +38,7 @@ void free_privilege_info_db_row_list(GList* list); void privilege_db_manager_list_free(GList* list); /** - * @brief Get all privilege information of the target profile and package type + * @brief Get privileges and its level information of the target profile and package type * @remarks @a privilege_list must be released by you. * @param [in] package_type The package type * @param [out] privilege_list The privilege list @@ -49,7 +49,7 @@ void privilege_db_manager_list_free(GList* list); * @retval #PRIVILEGE_DB_MANAGER_ERR_DB_NOENTRY DB not exist. * @retval #PRIVILEGE_DB_MANAGER_ERR_CONNECTION_FAIL DB exist but failed to open DB. */ -int privilege_db_manager_get_privilege_list(privilege_manager_package_type_e package_type, GList** privilege_list); +int privilege_db_manager_get_privilege_level_info_list(privilege_manager_package_type_e package_type, GList** privilege_list); /** * @brief Get mapped privilege list for the given api-version and privilege list. diff --git a/capi/include/privilege_manager_types.h b/capi/include/privilege_manager_types.h index 5565ba2..166a622 100644 --- a/capi/include/privilege_manager_types.h +++ b/capi/include/privilege_manager_types.h @@ -79,7 +79,7 @@ typedef enum { typedef struct { char* privilege_name; int privilege_level_id; -} privilege_info_db_row_s; +} privilege_level_info_s; /** * @brief Enumerations of privilege DB type diff --git a/capi/src/privilege_db_manager.c b/capi/src/privilege_db_manager.c index 4569bbc..6d3cd22 100755 --- a/capi/src/privilege_db_manager.c +++ b/capi/src/privilege_db_manager.c @@ -261,26 +261,26 @@ int privilege_db_manager_check_black_list(uid_t uid, privilege_manager_package_t return count; } -static void __free_privilege_info_db_row(privilege_info_db_row_s* p) +static void __free_privilege_level_info(privilege_level_info_s* p) { SAFE_FREE(p->privilege_name); SAFE_FREE(p); } -static void __free_privilege_info_db_row_list(gpointer privilege_info_db_row_list) +static void __free_privilege_level_info_list(gpointer privilege_level_info_list) { - __free_privilege_info_db_row((privilege_info_db_row_s*)privilege_info_db_row_list); + __free_privilege_level_info((privilege_level_info_s*)privilege_level_info_list); } -void free_privilege_info_db_row_list(GList* row_list) +void free_privilege_level_info_list(GList* row_list) { - SAFE_G_LIST_FREE_FULL(row_list, __free_privilege_info_db_row_list); + SAFE_G_LIST_FREE_FULL(row_list, __free_privilege_level_info_list); } -static privilege_info_db_row_s* __new_privilege_info_db_row(const char* privilege, int privilege_level_id) +static privilege_level_info_s* __new_privilege_level_info(const char* privilege, int privilege_level_id) { - privilege_info_db_row_s *p = (privilege_info_db_row_s*)malloc(sizeof(privilege_info_db_row_s)); - TryReturn(p != NULL, , NULL, "malloc() of privilege_info_db_row_s failed."); + privilege_level_info_s *p = (privilege_level_info_s*)malloc(sizeof(privilege_level_info_s)); + TryReturn(p != NULL, , NULL, "malloc() of privilege_level_info_s failed."); p->privilege_name = g_strdup(privilege); p->privilege_level_id = privilege_level_id; @@ -288,7 +288,7 @@ static privilege_info_db_row_s* __new_privilege_info_db_row(const char* privileg return p; } -int privilege_db_manager_get_privilege_list(privilege_manager_package_type_e package_type, GList ** privilege_list) +int privilege_db_manager_get_privilege_level_info_list(privilege_manager_package_type_e package_type, GList ** privilege_list) { sqlite3 *db = NULL; sqlite3_stmt *stmt = NULL; @@ -301,8 +301,8 @@ int privilege_db_manager_get_privilege_list(privilege_manager_package_type_e pac GList *temp_privilege_list = NULL; while (sqlite3_step(stmt) == SQLITE_ROW) { - privilege_info_db_row_s *p = __new_privilege_info_db_row((const char*)sqlite3_column_text(stmt, 0), sqlite3_column_int(stmt, 1)); - TryReturn(p != NULL, free_privilege_info_db_row_list(temp_privilege_list); __finalize_db(db, stmt, sql), PRIVILEGE_DB_MANAGER_ERR_OUT_OF_MEMORY, "[PRIVILEGE_DB_MANAGER_ERR_OUT_OF_MEMORY] __new_privilege_info_db_row() failed."); + privilege_level_info_s *p = __new_privilege_level_info((const char*)sqlite3_column_text(stmt, 0), sqlite3_column_int(stmt, 1)); + TryReturn(p != NULL, free_privilege_level_info_list(temp_privilege_list); __finalize_db(db, stmt, sql), PRIVILEGE_DB_MANAGER_ERR_OUT_OF_MEMORY, "[PRIVILEGE_DB_MANAGER_ERR_OUT_OF_MEMORY] __new_privilege_level_info() failed."); temp_privilege_list = g_list_append(temp_privilege_list, p); } diff --git a/capi/src/privilege_manager.c b/capi/src/privilege_manager.c index 9ee43af..25ae8ac 100755 --- a/capi/src/privilege_manager.c +++ b/capi/src/privilege_manager.c @@ -101,7 +101,7 @@ int __get_api_version_code(const char *api_version, api_version_code_t *api_vers static int __comp_privilege_name(gconstpointer a, gconstpointer b) { - privilege_info_db_row_s *info = (privilege_info_db_row_s*)a; + privilege_level_info_s *info = (privilege_level_info_s*)a; return strcmp(info->privilege_name, b); } @@ -112,7 +112,7 @@ static int __get_privilege_level(const char *privilege, GList *privilege_list, i GList *matched = g_list_find_custom(privilege_list, privilege, __comp_privilege_name); if (matched != NULL) { - *privilege_level = ((privilege_info_db_row_s*)matched->data)->privilege_level_id; + *privilege_level = ((privilege_level_info_s*)matched->data)->privilege_level_id; ret = PRVMGR_ERR_NONE; } return ret; @@ -213,12 +213,12 @@ int privilege_manager_verify_privilege(uid_t uid, const char *api_version, privi GList *valid_privilege_list = NULL; /* Get valid privilege list */ - ret = privilege_db_manager_get_privilege_list(package_type, &valid_privilege_list); + ret = privilege_db_manager_get_privilege_level_info_list(package_type, &valid_privilege_list); if (ret != PRIVILEGE_DB_MANAGER_ERR_NONE) { if (ret == PRIVILEGE_DB_MANAGER_ERR_DB_NOENTRY) { _LOGE("[PRVMGR_ERR_INTERNAL_ERROR] privilege db cannot be found"); } else { - _LOGE("[PRVMGR_ERR_INTERNAL_ERROR] privilege_db_manager_get_privilege_list() failed. ret = %d", ret); + _LOGE("[PRVMGR_ERR_INTERNAL_ERROR] privilege_db_manager_get_privilege_level_info_list() failed. ret = %d", ret); } return PRVMGR_ERR_INTERNAL_ERROR; } @@ -276,7 +276,7 @@ int privilege_manager_verify_privilege(uid_t uid, const char *api_version, privi FINISH: for (unsigned int i = 0; i < g_list_length(privilege_list); ++i) SafeFree(msg_list[i]); - free_privilege_info_db_row_list(valid_privilege_list); + free_privilege_level_info_list(valid_privilege_list); return ret_val; } diff --git a/test/tc-privilege-db-manager.c b/test/tc-privilege-db-manager.c index c767a0e..071591a 100755 --- a/test/tc-privilege-db-manager.c +++ b/test/tc-privilege-db-manager.c @@ -8,19 +8,19 @@ static void __free_privilege_list(GList * privilege_list) { GList *l = NULL; for (l = privilege_list; l != NULL; l = l->next) { - privilege_info_db_row_s *privilege_info_db_row = (privilege_info_db_row_s *) l->data; - if (privilege_info_db_row->privilege_name != NULL) - free(privilege_info_db_row->privilege_name); + privilege_level_info_s *privilege_level_info = (privilege_level_info_s *) l->data; + if (privilege_level_info->privilege_name != NULL) + free(privilege_level_info->privilege_name); } } -void __test_privilege_db_manager_get_privilege_list() +void __test_privilege_db_manager_get_privilege_level_info_list() { GList *privilege_list = NULL; - int ret = privilege_db_manager_get_privilege_list(PRVMGR_PACKAGE_TYPE_CORE, &privilege_list); + int ret = privilege_db_manager_get_privilege_level_info_list(PRVMGR_PACKAGE_TYPE_CORE, &privilege_list); if (ret != PRIVILEGE_DB_MANAGER_ERR_NONE) { - printf("failed to call privilege_db_manager_get_privilege_list()\n"); + printf("failed to call privilege_db_manager_get_privilege_level_info_list()\n"); printf("error message = %s\n", __get_result_string('d', ret)); printf_red("test fail\n"); fail_cnt++; @@ -29,9 +29,9 @@ void __test_privilege_db_manager_get_privilege_list() GList *l = NULL; for (l = privilege_list; l != NULL; l = l->next) { - privilege_info_db_row_s *privilege_info_db_row = (privilege_info_db_row_s *) l->data; - printf("privilege_name = %s\n", privilege_info_db_row->privilege_name); - printf("privilege_level_id = %d\n", privilege_info_db_row->privilege_level_id); + privilege_level_info_s *privilege_level_info = (privilege_level_info_s *) l->data; + printf("privilege_name = %s\n", privilege_level_info->privilege_name); + printf("privilege_level_id = %d\n", privilege_level_info->privilege_level_id); } __free_privilege_list(privilege_list); @@ -609,8 +609,8 @@ void __test_privilege_db_manager_get_same_privacy_grouped_privileges() int main() { - __tcinfo(function, "privilege_db_manager_get_privilege_list"); - __test_privilege_db_manager_get_privilege_list(); + __tcinfo(function, "privilege_db_manager_get_privilege_level_info_list"); + __test_privilege_db_manager_get_privilege_level_info_list(); __tcinfo(function, "privilege_db_manager_get_mapped_privilege_list"); __test_privilege_db_manager_get_mapped_privilege_list();