Refactor AccessProvider and ScopedAccessProvider

[platform/core/test/security-tests.git] / src / ckm / privileged / capi-access_control.cpp

diff --git a/src/ckm/privileged/capi-access_control.cpp b/src/ckm/privileged/capi-access_control.cpp
index db28b1c..351c0b2 100644 (file)
--- a/src/ckm/privileged/capi-access_control.cpp
+++ b/src/ckm/privileged/capi-access_control.cpp
@@ -6,7 +6,7 @@
 
 #include <tests_common.h>
 #include <ckm-common.h>
-#include <access_provider2.h>
+#include <scoped-app-context.h>
 
 #include <ckmc/ckmc-manager.h>
 #include <ckmc/ckmc-control.h>
@@ -96,7 +96,7 @@ RUNNER_TEST(T3000_init)
 // invalid arguments check
 RUNNER_TEST(T3001_manager_allow_access_invalid)
 {
-    ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+    ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
 
     RUNNER_ASSERT(
             CKMC_ERROR_INVALID_PARAMETER == ckmc_set_permission(NULL, "accessor", CKMC_PERMISSION_READ));
@@ -107,7 +107,7 @@ RUNNER_TEST(T3001_manager_allow_access_invalid)
 // invalid arguments check
 RUNNER_TEST(T3002_manager_deny_access_invalid)
 {
-    ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+    ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
 
     RUNNER_ASSERT(CKMC_ERROR_INVALID_PARAMETER == ckmc_set_permission(NULL, "accessor", CKMC_PERMISSION_NONE));
     RUNNER_ASSERT(CKMC_ERROR_INVALID_PARAMETER == ckmc_set_permission("alias", NULL, CKMC_PERMISSION_NONE));
@@ -116,7 +116,7 @@ RUNNER_TEST(T3002_manager_deny_access_invalid)
 // tries to allow access for non existing alias
 RUNNER_CHILD_TEST(T3003_manager_allow_access_non_existing)
 {
-    ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+    ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
 
     int ret = ckmc_set_permission(NO_ALIAS, "label", CKMC_PERMISSION_READ);
     RUNNER_ASSERT_MSG(CKMC_ERROR_DB_ALIAS_UNKNOWN == ret,
@@ -126,7 +126,7 @@ RUNNER_CHILD_TEST(T3003_manager_allow_access_non_existing)
 // tries to deny access for non existing alias
 RUNNER_CHILD_TEST(T3004_manager_deny_access_non_existing)
 {
-    ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+    ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
 
     int ret = ckmc_set_permission(NO_ALIAS, "label", CKMC_PERMISSION_NONE);
     RUNNER_ASSERT_MSG(CKMC_ERROR_DB_ALIAS_UNKNOWN == ret,
@@ -136,7 +136,7 @@ RUNNER_CHILD_TEST(T3004_manager_deny_access_non_existing)
 // tries to deny access that does not exist in database
 RUNNER_CHILD_TEST(T3005_manager_deny_access_non_existing_access)
 {
-    ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+    ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
 
     ScopedSaveData ssd(TEST_ALIAS, TEST_DATA);
 
@@ -149,7 +149,7 @@ RUNNER_CHILD_TEST(T3005_manager_deny_access_non_existing_access)
 // tries to allow access to application own data
 RUNNER_CHILD_TEST(T3006_manager_allow_access_to_myself)
 {
-    ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+    ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
 
     ScopedSaveData ssd(TEST_ALIAS, TEST_DATA);
 
@@ -162,7 +162,7 @@ RUNNER_CHILD_TEST(T3006_manager_allow_access_to_myself)
 // verifies that alias can not contain forbidden characters
 RUNNER_CHILD_TEST(T3007_manager_check_alias_valid)
 {
-    ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+    ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
 
     ScopedSaveData ssd(TEST_ALIAS, TEST_DATA);
 
@@ -177,7 +177,7 @@ RUNNER_CHILD_TEST(T3007_manager_check_alias_valid)
 // verifies that label can not contain forbidden characters
 RUNNER_CHILD_TEST(T3008_manager_check_label_valid)
 {
-    ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+    ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
 
     ScopedSaveData ssd(TEST_ALIAS, TEST_DATA);
 
@@ -210,13 +210,13 @@ RUNNER_TEST(T3020_manager_access_not_allowed, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
     }
 
     // test accessibility from another label
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         std::string TEST_ALIAS_adr = aliasWithLabel(APP_LABEL_1, TEST_ALIAS);
         check_read_not_visible(TEST_ALIAS_adr.c_str());
@@ -229,14 +229,14 @@ RUNNER_TEST(T3021_manager_access_allowed, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
         allow_access(TEST_ALIAS, APP_LABEL_2, CKMC_PERMISSION_READ);
     }
 
     // test accessibility from another label
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
         check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), TEST_DATA);
     }
 }
@@ -246,14 +246,14 @@ RUNNER_TEST(T3022_manager_access_allowed_with_remove, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
         allow_access(TEST_ALIAS, APP_LABEL_2, CKMC_PERMISSION_READ | CKMC_PERMISSION_REMOVE);
     }
 
     // test accessibility from another label
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
         check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), TEST_DATA);
     }
 }
@@ -263,14 +263,14 @@ RUNNER_TEST(T3023_manager_access_allowed_remove_denied, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
         allow_access(TEST_ALIAS, APP_LABEL_2, CKMC_PERMISSION_READ);
     }
 
     // test accessibility from another label
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
         std::string TEST_ALIAS_adr = aliasWithLabel(APP_LABEL_1, TEST_ALIAS);
         check_remove_denied(TEST_ALIAS_adr.c_str());
         check_read_allowed(TEST_ALIAS_adr.c_str(), TEST_DATA);
@@ -282,14 +282,14 @@ RUNNER_TEST(T3025_manager_remove_allowed, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
         allow_access(TEST_ALIAS, APP_LABEL_2, CKMC_PERMISSION_READ | CKMC_PERMISSION_REMOVE);
     }
 
     // test accessibility from another label
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
         check_remove_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str());
     }
 }
@@ -300,7 +300,7 @@ RUNNER_TEST(T3026_manager_double_allow, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
 
         // access should be overwritten
@@ -310,7 +310,7 @@ RUNNER_TEST(T3026_manager_double_allow, RemoveDataEnv<APP_1>)
 
     // test accessibility from another label
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         std::string TEST_ALIAS_adr = aliasWithLabel(APP_LABEL_1, TEST_ALIAS);
         check_remove_denied(TEST_ALIAS_adr.c_str());
@@ -324,7 +324,7 @@ RUNNER_TEST(T3027_manager_allow_deny, RemoveDataEnv<APP_1>)
     // prepare: add data
     std::string TEST_ALIAS_adr = aliasWithLabel(APP_LABEL_1, TEST_ALIAS);
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
 
         allow_access(TEST_ALIAS, APP_LABEL_2, CKMC_PERMISSION_READ);
@@ -332,7 +332,7 @@ RUNNER_TEST(T3027_manager_allow_deny, RemoveDataEnv<APP_1>)
 
     // test accessibility from another label
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         check_remove_denied(TEST_ALIAS_adr.c_str());
         check_read_allowed(TEST_ALIAS_adr.c_str(), TEST_DATA);
@@ -340,14 +340,14 @@ RUNNER_TEST(T3027_manager_allow_deny, RemoveDataEnv<APP_1>)
 
     // remove permission
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
 
         deny_access(TEST_ALIAS, APP_LABEL_2);
     }
 
     // test accessibility from another label
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         check_remove_not_visible(TEST_ALIAS_adr.c_str());
         check_read_not_visible(TEST_ALIAS_adr.c_str());
@@ -359,7 +359,7 @@ RUNNER_TEST(T3028_manager_access_by_label, RemoveDataEnv<APP_1>)
     // prepare: add data
     const char *additional_data = "label-2-data";
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
 
         allow_access(TEST_ALIAS, APP_LABEL_2, CKMC_PERMISSION_READ);
@@ -367,7 +367,7 @@ RUNNER_TEST(T3028_manager_access_by_label, RemoveDataEnv<APP_1>)
 
     // add data as app 2
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
         save_data(TEST_ALIAS, additional_data);
 
         allow_access(TEST_ALIAS, APP_LABEL_1, CKMC_PERMISSION_READ);
@@ -378,7 +378,7 @@ RUNNER_TEST(T3028_manager_access_by_label, RemoveDataEnv<APP_1>)
 
     // test accessibility to app 2 from app 1
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
 
         // test if can access label2 alias from label1 domain - should succeed
         check_read_allowed(aliasWithLabel(APP_LABEL_2, TEST_ALIAS).c_str(), additional_data);
@@ -390,7 +390,7 @@ RUNNER_TEST(T3029_manager_access_modification_by_foreign_label, RemoveDataEnv<AP
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
 
         allow_access(TEST_ALIAS, APP_LABEL_3, CKMC_PERMISSION_READ | CKMC_PERMISSION_REMOVE);
@@ -398,7 +398,7 @@ RUNNER_TEST(T3029_manager_access_modification_by_foreign_label, RemoveDataEnv<AP
 
     // test accessibility from another label
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         allow_access_negative(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), APP_LABEL_4, CKMC_PERMISSION_READ | CKMC_PERMISSION_REMOVE, CKMC_ERROR_PERMISSION_DENIED);
         deny_access_negative (aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), APP_LABEL_4, CKMC_ERROR_PERMISSION_DENIED);
@@ -411,7 +411,7 @@ RUNNER_TEST(T3030_manager_get_all_aliases, RemoveDataEnv<APP_1>)
     // prepare: add data
     size_t count;
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
         save_data(TEST_ALIAS2, TEST_DATA);
 
@@ -421,7 +421,7 @@ RUNNER_TEST(T3030_manager_get_all_aliases, RemoveDataEnv<APP_1>)
 
     // test accessibility from another label
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         // check that app can access other aliases when it has permission
         check_alias_count(count - 1);
@@ -434,13 +434,13 @@ RUNNER_TEST(T3030_manager_get_all_aliases, RemoveDataEnv<APP_1>)
 
     // remove permission
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         deny_access(TEST_ALIAS, APP_LABEL_2);
     }
 
     // test accessibility from another label
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         // check that app can't access other aliases for which permission has been revoked
         check_alias_count(count - 2);
@@ -452,7 +452,7 @@ RUNNER_TEST(T3031_manager_deprecated_access_allowed, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
 
         allow_access_deprecated(TEST_ALIAS, APP_LABEL_2, CKMC_AR_READ);
@@ -460,7 +460,7 @@ RUNNER_TEST(T3031_manager_deprecated_access_allowed, RemoveDataEnv<APP_1>)
 
     // test accessibility from another label
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), TEST_DATA);
     }
@@ -471,7 +471,7 @@ RUNNER_TEST(T3032_manager_deprecated_access_allowed_with_remove, RemoveDataEnv<A
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
 
         allow_access_deprecated(TEST_ALIAS, APP_LABEL_2, CKMC_AR_READ_REMOVE);
@@ -479,7 +479,7 @@ RUNNER_TEST(T3032_manager_deprecated_access_allowed_with_remove, RemoveDataEnv<A
 
     // test accessibility from another label
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), TEST_DATA);
     }
@@ -490,7 +490,7 @@ RUNNER_TEST(T3033_manager_deprecated_access_allowed_remove_denied, RemoveDataEnv
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
 
         allow_access_deprecated(TEST_ALIAS, APP_LABEL_2, CKMC_AR_READ);
@@ -498,7 +498,7 @@ RUNNER_TEST(T3033_manager_deprecated_access_allowed_remove_denied, RemoveDataEnv
 
     // test accessibility from another label
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         std::string TEST_ALIAS_adr = aliasWithLabel(APP_LABEL_1, TEST_ALIAS);
         check_remove_denied(TEST_ALIAS_adr.c_str());
@@ -511,7 +511,7 @@ RUNNER_TEST(T3034_manager_deprecated_remove_allowed, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
 
         allow_access_deprecated(TEST_ALIAS, APP_LABEL_2, CKMC_AR_READ_REMOVE);
@@ -519,7 +519,7 @@ RUNNER_TEST(T3034_manager_deprecated_remove_allowed, RemoveDataEnv<APP_1>)
 
     // test accessibility from another label
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         check_remove_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str());
     }
@@ -541,7 +541,7 @@ RUNNER_TEST(T3101_control_allow_access_invalid, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
     }
 
@@ -562,7 +562,7 @@ RUNNER_TEST(T3102_control_deny_access_invalid, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
     }
 
@@ -600,7 +600,7 @@ RUNNER_TEST(T3105_control_remove_non_existing_access, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
     }
 
@@ -613,7 +613,7 @@ RUNNER_TEST(T3105_control_remove_non_existing_access, RemoveDataEnv<APP_1>)
 RUNNER_TEST(T3106_control_allow_access_to_myself, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
-    ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+    ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
     save_data(TEST_ALIAS, TEST_DATA);
 
     // test
@@ -628,7 +628,7 @@ RUNNER_CHILD_TEST(T3110_control_allow_access_as_user, RemoveDataEnv<APP_1>)
     RUNNER_IGNORED_MSG("Disabled until labeled sockets not available");
 
     // prepare: add data
-    ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+    ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
     save_data(TEST_ALIAS, TEST_DATA);
 
     // test
@@ -643,7 +643,7 @@ RUNNER_CHILD_TEST(T3111_control_deny_access_as_user, RemoveDataEnv<APP_1>)
     RUNNER_IGNORED_MSG("Disabled until labeled sockets not available");
 
     // prepare: add data
-    ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+    ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
     save_data(TEST_ALIAS, TEST_DATA);
 
     // test
@@ -657,13 +657,13 @@ RUNNER_TEST(T3121_control_access_allowed, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
     }
 
     allow_access_by_adm(APP_1, APP_LABEL_1, TEST_ALIAS, APP_LABEL_2, CKMC_PERMISSION_READ);
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), TEST_DATA);
     }
@@ -674,13 +674,13 @@ RUNNER_TEST(T3122_control_access_allowed_with_remove, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
     }
 
     allow_access_by_adm(APP_1, APP_LABEL_1, TEST_ALIAS, APP_LABEL_2, CKMC_PERMISSION_READ | CKMC_PERMISSION_REMOVE);
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), TEST_DATA);
     }
@@ -691,13 +691,13 @@ RUNNER_TEST(T3122_control_access_allowed_remove_denied, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
     }
 
     allow_access_by_adm(APP_1, APP_LABEL_1, TEST_ALIAS, APP_LABEL_2, CKMC_PERMISSION_READ);
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         check_remove_denied(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str());
     }
@@ -708,13 +708,13 @@ RUNNER_TEST(T3125_control_remove_allowed, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
     }
 
     allow_access_by_adm(APP_1, APP_LABEL_1, TEST_ALIAS, APP_LABEL_2, CKMC_PERMISSION_READ | CKMC_PERMISSION_REMOVE);
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         check_remove_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str());
     }
@@ -726,7 +726,7 @@ RUNNER_TEST(T3126_control_double_allow, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
     }
 
@@ -734,7 +734,7 @@ RUNNER_TEST(T3126_control_double_allow, RemoveDataEnv<APP_1>)
     allow_access_by_adm(APP_1, APP_LABEL_1, TEST_ALIAS, APP_LABEL_2, CKMC_PERMISSION_READ | CKMC_PERMISSION_REMOVE);
     allow_access_by_adm(APP_1, APP_LABEL_1, TEST_ALIAS, APP_LABEL_2, CKMC_PERMISSION_READ);
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         std::string TEST_ALIAS_adr = aliasWithLabel(APP_LABEL_1, TEST_ALIAS);
         check_remove_denied(TEST_ALIAS_adr.c_str());
@@ -747,14 +747,14 @@ RUNNER_TEST(T3127_control_allow_deny, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
     }
 
     std::string TEST_ALIAS_adr = aliasWithLabel(APP_LABEL_1, TEST_ALIAS);
     allow_access_by_adm(APP_1, APP_LABEL_1, TEST_ALIAS, APP_LABEL_2, CKMC_PERMISSION_READ);
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         check_remove_denied(TEST_ALIAS_adr.c_str());
         check_read_allowed(TEST_ALIAS_adr.c_str(), TEST_DATA);
@@ -762,7 +762,7 @@ RUNNER_TEST(T3127_control_allow_deny, RemoveDataEnv<APP_1>)
 
     deny_access_by_adm(APP_1, APP_LABEL_1, TEST_ALIAS, APP_LABEL_2);
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         check_remove_not_visible(TEST_ALIAS_adr.c_str());
         check_read_not_visible(TEST_ALIAS_adr.c_str());
@@ -775,7 +775,7 @@ RUNNER_TEST(T3130_control_get_all_aliases, RemoveDataEnv<APP_1>)
     // prepare: add data
     size_t count;
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
         save_data(TEST_ALIAS2, TEST_DATA);
 
@@ -784,7 +784,7 @@ RUNNER_TEST(T3130_control_get_all_aliases, RemoveDataEnv<APP_1>)
 
     allow_access_by_adm(APP_1, APP_LABEL_1, TEST_ALIAS, APP_LABEL_2, CKMC_PERMISSION_READ);
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         // check that app can access other aliases when it has permission
         check_alias_count(count - 1);
@@ -797,7 +797,7 @@ RUNNER_TEST(T3130_control_get_all_aliases, RemoveDataEnv<APP_1>)
 
     deny_access_by_adm(APP_1, APP_LABEL_1, TEST_ALIAS, APP_LABEL_2);
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         // check that app can't access other aliases for which permission has been revoked
         check_alias_count(count - 2);
@@ -809,7 +809,7 @@ RUNNER_TEST(T3140_control_allow_invalid_user, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
     }
 
@@ -823,7 +823,7 @@ RUNNER_TEST(T3141_control_deny_invalid_user, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
     }
 
@@ -837,13 +837,13 @@ RUNNER_TEST(T3142_control_deprecated_access_allowed, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
     }
 
     allow_access_deprecated_by_adm(APP_1, APP_LABEL_1, TEST_ALIAS, APP_LABEL_2, CKMC_AR_READ);
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), TEST_DATA);
     }
@@ -854,13 +854,13 @@ RUNNER_TEST(T3143_control_deprecated_access_allowed_with_remove, RemoveDataEnv<A
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
     }
 
     allow_access_deprecated_by_adm(APP_1, APP_LABEL_1, TEST_ALIAS, APP_LABEL_2, CKMC_AR_READ_REMOVE);
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         check_read_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str(), TEST_DATA);
     }
@@ -871,13 +871,13 @@ RUNNER_TEST(T3144_control_deprecated_access_allowed_remove_denied, RemoveDataEnv
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
     }
 
     allow_access_deprecated_by_adm(APP_1, APP_LABEL_1, TEST_ALIAS, APP_LABEL_2, CKMC_AR_READ);
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         check_remove_denied(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str());
     }
@@ -888,13 +888,13 @@ RUNNER_TEST(T3145_control_deprecated_remove_allowed, RemoveDataEnv<APP_1>)
 {
     // prepare: add data
     {
-        ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
         save_data(TEST_ALIAS, TEST_DATA);
     }
 
     allow_access_deprecated_by_adm(APP_1, APP_LABEL_1, TEST_ALIAS, APP_LABEL_2, CKMC_AR_READ_REMOVE);
     {
-        ScopedAccessProvider ap(APP_LABEL_2, APP_1, GROUP_1);
+        ScopedAppContext ctx(APP_LABEL_2, APP_1, GROUP_1);
 
         check_remove_allowed(aliasWithLabel(APP_LABEL_1, TEST_ALIAS).c_str());
     }
@@ -943,7 +943,7 @@ RUNNER_TEST(utc_ckmc_get_data_alias_info_list_p1)
 
 RUNNER_TEST(utc_ckmc_get_data_alias_info_list_p2, RemoveDataEnv<APP_1>)
 {
-    ScopedAccessProvider ap(APP_LABEL_1, APP_1, GROUP_1);
+    ScopedAppContext ctx(APP_LABEL_1, APP_1, GROUP_1);
     save_data(TEST_ALIAS, TEST_DATA);
 
     ckmc_alias_info_list_s* ppalias_list = NULL;