RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
"perm_app_install failed: " << result);
- // Enable a permission:
- result = perm_app_enable_permissions(EFL_APP_ID, APP_TYPE_EFL, PRIVS_EFL, 0);
+ // Register a permission:
+ result = perm_app_setup_permissions(EFL_APP_ID, APP_TYPE_EFL, PRIVS_EFL);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
- "Error enabling app permissions. Result: " << result);
+ "Error registering app permissions. Result: " << result);
DB_END
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
"perm_app_install failed: " << result);
- // Enable a permission
- result = perm_app_enable_permissions(EFL_APP_ID, APP_TYPE_EFL, PRIVS_EFL, 0);
+ // Register a permission
+ result = perm_app_setup_permissions(EFL_APP_ID, APP_TYPE_EFL, PRIVS_EFL);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
- "Error enabling app permissions. Result: " << result);
+ "Error registering app permissions. Result: " << result);
DB_END
*/
// Prepare permissions that we want to disable
- result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2, 1);
+ result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
- " Error enabling app permissions. Result: " << result);
+ " Error registering app permissions. Result: " << result);
DB_END
DB_BEGIN
// Prepare permissions that will not be disabled
- result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS, 1);
+ result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
" Error adding app first permissions. Result: " << result);
// Prepare permissions that we want to disable
- result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2, 1);
+ result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
" Error adding app second permissions. Result: " << result);
DB_BEGIN
// Prepare permissions
- result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_R, 1);
+ result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_R);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
- " Error adding app permissions. Result: " << result);
+ " Error registering app r permissions. Result: " << result);
+
+ result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_NO_R);
+ RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
+ " Error registering app no r permissions. Result: " << result);
// Disable same permissions without r
result = perm_app_disable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_NO_R);
RUNNER_ASSERT_MSG(ret == PC_OPERATION_SUCCESS, "Error in perm_app_install.");
- ret = perm_app_enable_permissions(APP_TEST, APP_TYPE_OSP, PRIV_APPSETTING, true);
+ ret = perm_app_setup_permissions(APP_TEST, APP_TYPE_OSP, PRIV_APPSETTING);
RUNNER_ASSERT_MSG(ret == PC_OPERATION_SUCCESS,
- " Error enabling app permissions. Result: " << ret);
+ " Error registering app permissions. Result: " << ret);
DB_END
RUNNER_ASSERT_MSG(result == 0, "perm_app_install returned " << result << ". Errno: " << strerror(errno));
- result = perm_app_enable_permissions(APP_ID, APP_TYPE_EFL, PRIVS_EFL, TRUE);
+ result = perm_app_setup_permissions(APP_ID, APP_TYPE_EFL, PRIVS_EFL);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
- " perm_app_enable_permissions failed with result: " << result);
+ " perm_app_setup_permissions failed with result: " << result);
DB_END
" perm_app_install returned " << result << ". Errno: " << strerror(errno));
// TEST:
- result = perm_app_enable_permissions(app_id, APP_TYPE, privileges, 1);
+ result = perm_app_setup_permissions(app_id, APP_TYPE, privileges);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Line: " << line_no <<
- " Error enabling app permissions. Result: " << result);
+ " Error registering app permissions. Result: " << result);
DB_END
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
"Error revoking app permissions. Result: " << result);
- result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2, 1);
+ result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
- " Error enabling app permissions. Result: " << result);
+ " Error registering app permissions. Result: " << result);
DB_END
*/
DB_BEGIN
+ result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2);
+ RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
+ " Error registering app permissions. Result: " << result);
result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2, 0);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
check_app_has_permission(WGT_APP_ID, APP_TYPE_WGT, PRIVS2, false);
/**
- * Test - Enabling all permissions in two complementary files
+ * Test - Registering new permissions in two complementary files
*/
DB_BEGIN
- result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_R_AND_NO_R, 1);
+ result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_R_AND_NO_R);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
- " Error enabling app permissions. Result: " << result);
+ " Error registering app permissions. Result: " << result);
DB_END
DB_BEGIN
- // Enable permission for rules 2 no r
- result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_NO_R, 1);
+ // Register permission for rules 2 no r
+ result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_NO_R);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
- " Error enabling app permissions without r. Result: " << result);
+ " Error registering app permissions without r. Result: " << result);
DB_END
DB_BEGIN
- // Enable permission for rules 2
- result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2, 1);
+ // Register permission for rules 2
+ result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
- " Error enabling app all permissions. Result: " << result);
+ " Error registering app all permissions. Result: " << result);
DB_END
*/
// Enable permission for rules 2 no r
- result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_NO_R, 1);
+ result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_NO_R);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
- " Error enabling app permissions without r. Result: " << result);
+ " Error registering app permissions without r. Result: " << result);
DB_END
DB_BEGIN
// Enable permission for rules 2
- result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_R, 1);
+ result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_R);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
- " Error enabling app permissions with only r. Result: " << result);
+ " Error registering app permissions with only r. Result: " << result);
DB_END
RUNNER_ASSERT_MSG(result == 0, "perm_app_install returned " << result << ". Errno: " << strerror(errno));
// Prepare permissions to reset
- result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2, 1);
+ result = perm_app_setup_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
- " Error adding app permissions. Result: " << result);
+ " Error registering app permissions. Result: " << result);
// Reset permissions
result = perm_app_reset_permissions(WGT_APP_ID);
DB_BEGIN
- result = perm_app_enable_permissions(APP_ID, APP_TYPE_WGT, (const char**) &perm, 1);
- RUNNER_ASSERT_MSG(result == 0, "app_enable_permission failed: " << result);
- result = perm_app_enable_permissions(APP_TEST_APP_1, APP_TYPE_WGT, (const char**) &perm, 1);
- RUNNER_ASSERT_MSG(result == 0, "app_enable_permission failed: " << result);
+ result = perm_app_setup_permissions(APP_ID, APP_TYPE_WGT, (const char**) &perm);
+ RUNNER_ASSERT_MSG(result == 0, "app_register_permissions failed: " << result);
+ result = perm_app_setup_permissions(APP_TEST_APP_1, APP_TYPE_WGT, (const char**) &perm);
+ RUNNER_ASSERT_MSG(result == 0, "app_register_permissions failed: " << result);
DB_END
result = perm_app_install(av_id);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "perm_app_install failed. Result: "
<< result << ", av_type: " << av_type);
- result = perm_app_enable_permissions(av_id, av_type, PRIVS_AV, 1);
- RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "enable_permissions failed. Result: "
+ result = perm_app_setup_permissions(av_id, av_type, PRIVS_AV);
+ RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "register_permissions failed. Result: "
<< result << ", av_type: " << av_type);
DB_END
PRIVS2[0], NULL) == PC_ERR_INVALID_PARAM,
"perm_app_has_permission didn't check if has_permission isn't NULL.");
}
+
+RUNNER_TEST(privilege_control21n_incorrect_params_perm_app_setup_permissions)
+{
+ RUNNER_ASSERT_MSG(perm_app_setup_permissions(APP_ID, APP_TYPE_OTHER,
+ NULL) == PC_ERR_INVALID_PARAM,
+ "perm_app_setup_permissions didn't check if perm_list isn't NULL");
+ RUNNER_ASSERT_MSG(perm_app_setup_permissions(NULL, APP_TYPE_OTHER,
+ PRIVS2) == PC_ERR_INVALID_PARAM,
+ "perm_app_setup_permissions didn't check if pkg_id isn't NULL.");
+ RUNNER_ASSERT_MSG(perm_app_setup_permissions("", APP_TYPE_OTHER,
+ PRIVS2) == PC_ERR_INVALID_PARAM,
+ "perm_app_setup_permissions didn't check if pkg_id isn't empty.");
+ RUNNER_ASSERT_MSG(perm_app_setup_permissions(APP_ID, (app_type_t)-1,
+ PRIVS2) == PC_ERR_INVALID_PARAM,
+ "perm_app_setup_permissions didn't check if app type is valid.");
+ RUNNER_ASSERT_MSG(perm_app_setup_permissions("~APP~", APP_TYPE_OTHER,
+ PRIVS2) == PC_ERR_INVALID_PARAM,
+ "perm_app_setup_permissions didn't check if pkg_id is valid");
+}
+
result = perm_app_install(APP_TEST_SETTINGS_ASP1);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
"Error in perm_app_install. Result: " << result);
- result = perm_app_enable_permissions(APP_TEST_SETTINGS_ASP1,
- APP_TYPE_OSP, PRIV_APPSETTING, 1);
+ result = perm_app_setup_permissions(APP_TEST_SETTINGS_ASP1,
+ APP_TYPE_OSP, PRIV_APPSETTING);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
"Error enabling App-Setting permissions. Result: " << result);
result = perm_app_install(TEST_OSP_FEATURE_APP_ID);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
"Error in perm_app_install. Result: " << result);
- result = perm_app_enable_permissions(TEST_OSP_FEATURE_APP_ID,
- APP_TYPE_OSP,(const char*[]) {NULL}, 1);
+ result = perm_app_setup_permissions(TEST_OSP_FEATURE_APP_ID,
+ APP_TYPE_OSP,(const char*[]) {NULL});
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
"Error enabling permissions. Result: " << result);
<< ". Result: " << result);
// Add persistent permissions
- result = perm_app_enable_permissions(APP_ID, APP_TYPE_OSP,
- TEST_OSP_FEATURE_PRIVS, 1);
+ result = perm_app_setup_permissions(APP_ID, APP_TYPE_OSP,
+ TEST_OSP_FEATURE_PRIVS);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
- "Error in perm_app_enable_permissions from OSP Feature. Loop index: "
+ "Error in perm_app_setup_permissions from OSP Feature. Loop index: "
<< i << ". Result: " << result);
- result = perm_app_enable_permissions(APP_ID, APP_TYPE_WGT,
- TEST_WGT_FEATURE_PRIVS, 1);
+ result = perm_app_setup_permissions(APP_ID, APP_TYPE_WGT,
+ TEST_WGT_FEATURE_PRIVS);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
- "Error in perm_app_enable_permissions from WGT Feature. Loop index: "
+ "Error in perm_app_setup_permissions from WGT Feature. Loop index: "
<< i << ". Result: " << result);
DB_END
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
"Error in perm_app_install."
<< " Result: " << result);
- result = perm_app_enable_permissions(APP_TEST_SETTINGS_ASP1,
- APP_TYPE_OSP, PRIV_APPSETTING, 1);
+ result = perm_app_setup_permissions(APP_TEST_SETTINGS_ASP1,
+ APP_TYPE_OSP, PRIV_APPSETTING);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
- "Error enabling App-Setting permissions."
+ "Error registering App-Setting permissions."
<< " Result: " << result);
// Register two valid api features
for (int j = 0; j < (app_count/2); ++j)
{
// add persistent api feature permissions
- result = perm_app_enable_permissions(app_ids[j], APP_TYPE_OSP,
- TEST_OSP_FEATURE_PRIVS, 1);
+ result = perm_app_setup_permissions(app_ids[j], APP_TYPE_OSP,
+ TEST_OSP_FEATURE_PRIVS);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
- "Error in perm_app_enable_permissions from OSP Feature. App id: "
+ "Error in perm_app_setup_permissions from OSP Feature. App id: "
<< app_ids[j] << " Loop index: " << i << ". Result: " << result);
- result = perm_app_enable_permissions(app_ids[j+5], APP_TYPE_WGT,
- TEST_WGT_FEATURE_PRIVS, 1);
+ result = perm_app_setup_permissions(app_ids[j+5], APP_TYPE_WGT,
+ TEST_WGT_FEATURE_PRIVS);
RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
- "Error in perm_app_enable_permissions from WGT Feature. App id: "
+ "Error in perm_app_setup_permissions from WGT Feature. App id: "
<< app_ids[j+5] << " Loop index: " << i << ". Result: " << result);
}