diff --git a/frameworks/common/permission_definition_parser.py b/frameworks/common/permission_definition_parser.py index dfd729dba475699e10f6158b0860457390dabd47..abc9f75d3bf2538dfbff9233678112d8e62abc34 100755 --- a/frameworks/common/permission_definition_parser.py +++ b/frameworks/common/permission_definition_parser.py @@ -163,7 +163,7 @@ class PermissionDef(object): return False -def parse_json(path, platform, permission_list): +def parse_json(path, platform): extend_perm = { 'name' : 'ohos.permission.KERNEL_ATM_SELF_USE', 'grantMode' : 'system_grant', @@ -177,6 +177,7 @@ def parse_json(path, platform, permission_list): 'hasValue' : True } + def_list = [] with open(path, "r", encoding="utf-8") as f: data = json.load(f) index = 0 @@ -184,10 +185,10 @@ def parse_json(path, platform, permission_list): perm_def = PermissionDef(perm, index) if not perm_def.check_device_type(platform): continue - permission_list.append(perm_def) + def_list.append(perm_def) index += 1 - permission_list.append(PermissionDef(extend_perm, index)) - return permission_list + def_list.append(PermissionDef(extend_perm, index)) + return def_list def convert_to_cpp(path, permission_list, hash_str): @@ -225,7 +226,6 @@ if __name__ == "__main__": curr_platform = "general" if input_args.target_platform in CONVERT_TARGET_PLATFORM: curr_platform = CONVERT_TARGET_PLATFORM[input_args.target_platform] - permission_list = [] - parse_json(input_args.input_json, curr_platform, permission_list) + permission_list = parse_json(input_args.input_json, curr_platform) hash_str = get_file_hash(input_args.input_json) convert_to_cpp(input_args.output_path, permission_list, hash_str) diff --git a/services/accesstokenmanager/main/cpp/include/permission/permission_manager.h b/services/accesstokenmanager/main/cpp/include/permission/permission_manager.h index 0f2c9fa84ce60355617deb44af9dbb433c2b0d52..7117b673f16143ae115a7e2e92b4f5963d7a2a1a 100644 --- a/services/accesstokenmanager/main/cpp/include/permission/permission_manager.h +++ b/services/accesstokenmanager/main/cpp/include/permission/permission_manager.h @@ -95,7 +95,7 @@ public: void AddHapPermToKernel(AccessTokenID tokenID, const std::vector& permList); void RemovePermFromKernel(AccessTokenID tokenID); void SetPermToKernel(AccessTokenID tokenID, const std::string& permissionName, bool isGranted); - bool InitPermissionList(const HapInitInfo& initInfo, std::vector& initializedList, + bool InitPermissionList(HapInitInfo& initInfo, std::vector& initializedList, HapInfoCheckResult& result, std::vector& undefValues); bool InitDlpPermissionList(const std::string& bundleName, int32_t userId, std::vector& initializedList, std::vector& undefValues); @@ -123,7 +123,7 @@ private: void FillUndefinedPermVector(const std::string& permissionName, const std::string& appDistributionType, const HapPolicy& policy, std::vector& undefValues); bool AclAndEdmCheck(const PermissionBriefDef& briefDef, const HapPolicy& policy, const std::string& permissionName, - const std::string appDistributionType, HapInfoCheckResult& result); + const std::string& appDistributionType, HapInfoCheckResult& result); void GetMasterAppUndValues(AccessTokenID tokenId, std::vector& undefValues); std::shared_ptr GetAbilityManager(); diff --git a/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h b/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h index 41da54b3b4dbb1c47d66449072251d0e26790a36..8d70754ed6122167dc7aa335965b1822b78e71f1 100644 --- a/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h +++ b/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h @@ -151,8 +151,8 @@ private: int32_t UpdateUndefinedToDb(const std::vector& stateValues, const std::vector& extendValues, const std::vector& validValueList); int32_t UpdateUndefinedInfo(const std::vector& validValueList); - void HandleHapUndefinedInfo(std::map& tokenId2apl); - void HandlePermDefUpdate(std::map& tokenId2apl); + void HandleHapUndefinedInfo(std::map& tokenIdAplMap); + void HandlePermDefUpdate(std::map& tokenIdAplMap); ServiceRunningState state_; std::string grantBundleName_; diff --git a/services/accesstokenmanager/main/cpp/include/token/accesstoken_info_manager.h b/services/accesstokenmanager/main/cpp/include/token/accesstoken_info_manager.h index 901317a83c2f71b1b8af3aa6729a28f546cda01d..d067a53479841461c897369022303bc765aa5054 100644 --- a/services/accesstokenmanager/main/cpp/include/token/accesstoken_info_manager.h +++ b/services/accesstokenmanager/main/cpp/include/token/accesstoken_info_manager.h @@ -47,7 +47,7 @@ public: static AccessTokenInfoManager& GetInstance(); ~AccessTokenInfoManager(); void Init(uint32_t& hapSize, uint32_t& nativeSize, uint32_t& pefDefSize, uint32_t& dlpSize, - std::map& tokenId2apl); + std::map& tokenIdAplMap); void InitNativeTokenInfos(const std::vector& tokenInfos); int32_t GetTokenIDByUserID(int32_t userID, std::unordered_set& tokenIdList); std::shared_ptr GetHapTokenInfoInner(AccessTokenID id); @@ -109,7 +109,7 @@ private: int32_t AddHapInfoToCache(const GenericValues& tokenValue, const std::vector& permStateRes, const std::vector& extendedPermRes); - void InitHapTokenInfos(uint32_t& hapSize, std::map& tokenId2apl); + void InitHapTokenInfos(uint32_t& hapSize, std::map& tokenIdAplMap); void ReportAddHapIdChange(const std::shared_ptr& hapInfo, AccessTokenID oriTokenId); int AddHapTokenInfo(const std::shared_ptr& info, AccessTokenID& oriTokenId); std::string GetHapUniqueStr(const std::shared_ptr& info) const; diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp index 386ebc3b9bfa04ee4ad95c75e8b8ea9fb6879b5b..55ad3b471048c8cff3fa030f4f2857d6ccf08862 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp @@ -974,7 +974,7 @@ void PermissionManager::FillUndefinedPermVector(const std::string& permissionNam } auto iter = std::find_if(policy.aclExtendedMap.begin(), policy.aclExtendedMap.end(), - [permissionName](const std::map::value_type item) { + [permissionName](const auto& item) { return permissionName == item.first; }); if (iter != policy.aclExtendedMap.end()) { @@ -1009,7 +1009,7 @@ bool PermissionManager::AclAndEdmCheck(const PermissionBriefDef& briefDef, const return true; } -bool PermissionManager::InitPermissionList(const HapInitInfo& initInfo, std::vector& initializedList, +bool PermissionManager::InitPermissionList(HapInitInfo& initInfo, std::vector& initializedList, HapInfoCheckResult& result, std::vector& undefValues) { LOGI(ATM_DOMAIN, ATM_TAG, "Before, request perm list size: %{public}zu, preAuthorizationInfo size %{public}zu, " @@ -1018,7 +1018,7 @@ bool PermissionManager::InitPermissionList(const HapInitInfo& initInfo, std::vec std::string appDistributionType = (initInfo.isUpdate) ? initInfo.updateInfo.appDistributionType : initInfo.installInfo.appDistributionType; - for (auto state : initInfo.policy.permStateList) { + for (auto& state : initInfo.policy.permStateList) { PermissionBriefDef briefDef; if (!GetPermissionBriefDef(state.permissionName, briefDef)) { LOGE(ATM_DOMAIN, ATM_TAG, "Get definition of %{public}s failed.", diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp index fb5b17e3754abdd1a3f15aa2cf8d9394a801fc42..a650004bb769fa79aacc65e9ce7e75bac0b71a01 100644 --- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp +++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp @@ -1515,7 +1515,7 @@ bool AccessTokenManagerService::IsPermissionValid(int32_t hapApl, const Permissi return false; } -void AccessTokenManagerService::HandleHapUndefinedInfo(std::map& tokenId2apl) +void AccessTokenManagerService::HandleHapUndefinedInfo(std::map& tokenIdAplMap) { GenericValues conditionValue; std::vector results; @@ -1540,7 +1540,7 @@ void AccessTokenManagerService::HandleHapUndefinedInfo(std::map& tokenId2apl) +void AccessTokenManagerService::HandlePermDefUpdate(std::map& tokenIdAplMap) { std::string dbPermDefVersion; GenericValues conditionValue; @@ -1594,7 +1594,7 @@ void AccessTokenManagerService::HandlePermDefUpdate(std::map& return; } if (!dbPermDefVersion.empty()) { // dbPermDefVersion empty means undefine table is empty - HandleHapUndefinedInfo(tokenId2apl); + HandleHapUndefinedInfo(tokenIdAplMap); } } } @@ -1608,9 +1608,9 @@ bool AccessTokenManagerService::Initialize() uint32_t nativeSize = 0; uint32_t pefDefSize = 0; uint32_t dlpSize = 0; - std::map tokenId2apl; - AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenId2apl); - HandlePermDefUpdate(tokenId2apl); + std::map tokenIdAplMap; + AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenIdAplMap); + HandlePermDefUpdate(tokenIdAplMap); #ifdef EVENTHANDLER_ENABLE TempPermissionObserver::GetInstance().InitEventHandler(); diff --git a/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp index 330764b267d21cb21466d59d063db7f3690d831b..3e4883d072e3d079ad7255b92c53dfde35af5e3f 100644 --- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp @@ -87,7 +87,7 @@ AccessTokenInfoManager::~AccessTokenInfoManager() } void AccessTokenInfoManager::Init(uint32_t& hapSize, uint32_t& nativeSize, uint32_t& pefDefSize, uint32_t& dlpSize, - std::map& tokenId2apl) + std::map& tokenIdAplMap) { OHOS::Utils::UniqueWriteGuard lk(this->managerLock_); if (hasInited_) { @@ -118,7 +118,7 @@ void AccessTokenInfoManager::Init(uint32_t& hapSize, uint32_t& nativeSize, uint3 } #endif - InitHapTokenInfos(hapSize, tokenId2apl); + InitHapTokenInfos(hapSize, tokenIdAplMap); nativeSize = tokenInfos.size(); InitNativeTokenInfos(tokenInfos); pefDefSize = GetDefPermissionsSize(); @@ -207,7 +207,7 @@ int32_t AccessTokenInfoManager::AddHapInfoToCache(const GenericValues& tokenValu return RET_SUCCESS; } -void AccessTokenInfoManager::InitHapTokenInfos(uint32_t& hapSize, std::map& tokenId2apl) +void AccessTokenInfoManager::InitHapTokenInfos(uint32_t& hapSize, std::map& tokenIdAplMap) { GenericValues conditionValue; std::vector hapTokenRes; @@ -234,7 +234,7 @@ void AccessTokenInfoManager::InitHapTokenInfos(uint32_t& hapSize, std::map(PermissionState::PERMISSION_DENIED), permissionState.grantStatus); } +/* + * @tc.name: OnCreate001 + * @tc.desc: AccessTokenOpenCallback::OnCreate + * @tc.type: FUNC + * @tc.require: + */ +HWTEST_F(AccessTokenDatabaseCoverageTest, OnCreate001, TestSize.Level4) +{ + std::shared_ptr db = AccessTokenDb::GetInstance().GetRdb(); + AccessTokenOpenCallback callback; + ASSERT_EQ(NativeRdb::E_OK, callback.OnCreate(*(db.get()))); +} + /* * @tc.name: OnUpgrade001 * @tc.desc: AccessTokenOpenCallback::OnUpgrade diff --git a/services/accesstokenmanager/test/coverage/permission_manager_coverage_test.cpp b/services/accesstokenmanager/test/coverage/permission_manager_coverage_test.cpp index e4529d6b89796a285a8cce39d115e1c71be98f38..ff979a0be6bcc45321a1ce84421111953179f7a8 100644 --- a/services/accesstokenmanager/test/coverage/permission_manager_coverage_test.cpp +++ b/services/accesstokenmanager/test/coverage/permission_manager_coverage_test.cpp @@ -17,10 +17,12 @@ #include #include "access_token.h" +#include "access_token_db.h" #include "accesstoken_kit.h" #include "access_token_error.h" #define private public #include "accesstoken_info_manager.h" +#include "accesstoken_manager_service.h" #include "form_manager_access_client.h" #include "permission_manager.h" #undef private @@ -78,8 +80,8 @@ void PermissionManagerCoverageTest::SetUpTestCase() uint32_t nativeSize = 0; uint32_t pefDefSize = 0; uint32_t dlpSize = 0; - std::map tokenId2apl; - AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenId2apl); + std::map tokenIdAplMap; + AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenIdAplMap); } void PermissionManagerCoverageTest::TearDownTestCase() {} @@ -281,6 +283,51 @@ HWTEST_F(PermissionManagerCoverageTest, GetMasterAppUndValues001, TestSize.Level ASSERT_EQ(true, undefValues.empty()); } +/** + * @tc.name: InitPermissionList001 + * @tc.desc: PermissionManager::InitPermissionList function test + * @tc.type: FUNC + * @tc.require: + */ +HWTEST_F(PermissionManagerCoverageTest, InitPermissionList001, TestSize.Level4) +{ + PermissionStatus status1; + status1.permissionName = "ohos.permission.READ_MEDIA"; + status1.grantStatus = static_cast(PermissionState::PERMISSION_DENIED); + status1.grantFlag = static_cast(PermissionFlag::PERMISSION_DEFAULT_FLAG); + PermissionStatus status2; + status2.permissionName = "ohos.permission.WRITE_MEDIA"; + status2.grantStatus = static_cast(PermissionState::PERMISSION_DENIED); + status2.grantFlag = static_cast(PermissionFlag::PERMISSION_DEFAULT_FLAG); + PreAuthorizationInfo info; + info.permissionName = "ohos.permission.READ_MEDIA"; + + HapPolicy policy; + policy.apl = ATokenAplEnum::APL_SYSTEM_BASIC; + policy.permStateList.emplace_back(status1); + policy.permStateList.emplace_back(status2); + policy.preAuthorizationInfo.emplace_back(info); + + HapInfoParams param; + param.appDistributionType = "os_integration"; + + HapInitInfo initInfo; + initInfo.installInfo = param; + initInfo.policy = policy; + std::vector initializedList; + HapInfoCheckResult result; + std::vector undefValues; + ASSERT_EQ(true, PermissionManager::GetInstance().InitPermissionList( + initInfo, initializedList, result, undefValues)); + ASSERT_EQ(2, initializedList.size()); + for (const auto& status : initializedList) { + if (status.permissionName == "ohos.permission.READ_MEDIA") { + ASSERT_EQ(static_cast(PermissionFlag::PERMISSION_SYSTEM_FIXED), status.grantFlag); + } + } + ASSERT_EQ(true, undefValues.empty()); +} + /** * @tc.name: FillDelValues001 * @tc.desc: AccessTokenInfoManager::FillDelValues function test @@ -318,6 +365,215 @@ HWTEST_F(PermissionManagerCoverageTest, FillDelValues001, TestSize.Level4) deleteValues4); ASSERT_EQ(5, deleteValues4.size()); } + +/** + * @tc.name: UpdateUndefinedInfo001 + * @tc.desc: AccessTokenManagerService::UpdateUndefinedInfo function test + * @tc.type: FUNC + * @tc.require: + */ +HWTEST_F(PermissionManagerCoverageTest, UpdateUndefinedInfo001, TestSize.Level4) +{ + AccessTokenIDEx tokenIdEx = {0}; + std::vector undefValues; + ASSERT_EQ(RET_SUCCESS, AccessTokenInfoManager::GetInstance().CreateHapTokenInfo(g_info, g_policy, tokenIdEx, + undefValues)); + AccessTokenID tokenId = tokenIdEx.tokenIdExStruct.tokenID; + ASSERT_NE(INVALID_TOKENID, tokenId); + + GenericValues value1; + value1.Put(TokenFiledConst::FIELD_TOKEN_ID, static_cast(tokenId)); // permissionName invalid + value1.Put(TokenFiledConst::FIELD_PERMISSION_NAME, "ohos.permission.INVALID"); + value1.Put(TokenFiledConst::FIELD_ACL, 0); + GenericValues value2; + value2.Put(TokenFiledConst::FIELD_TOKEN_ID, RANDOM_TOKENID); // tokenID invalid + value2.Put(TokenFiledConst::FIELD_PERMISSION_NAME, "ohos.permission.READ_MEDIA"); + value2.Put(TokenFiledConst::FIELD_ACL, 0); + std::vector validValueList; + validValueList.emplace_back(value1); + validValueList.emplace_back(value2); + + PermissionDataBrief::GetInstance().DeleteBriefPermDataByTokenId(RANDOM_TOKENID); + std::shared_ptr atManagerService_ = + DelayedSingleton::GetInstance(); + ASSERT_NE(nullptr, atManagerService_); + + ASSERT_EQ(RET_SUCCESS, atManagerService_->UpdateUndefinedInfo(validValueList)); + ASSERT_EQ(RET_SUCCESS, atManagerService_->DeleteToken(tokenId)); + atManagerService_ = nullptr; +} + +/** + * @tc.name: HandleHapUndefinedInfo001 + * @tc.desc: AccessTokenManagerService::HandleHapUndefinedInfo function test + * @tc.type: FUNC + * @tc.require: + */ +HWTEST_F(PermissionManagerCoverageTest, HandleHapUndefinedInfo001, TestSize.Level4) +{ + GenericValues conditionValue; + std::vector results; + ASSERT_EQ(RET_SUCCESS, AccessTokenDb::GetInstance().Find( + AtmDataType::ACCESSTOKEN_HAP_UNDEFINE_INFO, conditionValue, results)); // store origin data + + GenericValues value; + std::vector deleteDataTypes; + std::vector deleteValues; + deleteDataTypes.emplace_back(AtmDataType::ACCESSTOKEN_HAP_UNDEFINE_INFO); + deleteValues.emplace_back(value); + std::vector addDataTypes; + std::vector> addValues; + ASSERT_EQ(RET_SUCCESS, AccessTokenDb::GetInstance().DeleteAndInsertValues( + deleteDataTypes, deleteValues, addDataTypes, addValues)); // delete all data + + std::shared_ptr atManagerService_ = + DelayedSingleton::GetInstance(); + EXPECT_NE(nullptr, atManagerService_); + + std::map tokenIdAplMap; + atManagerService_->HandleHapUndefinedInfo(tokenIdAplMap); + + addDataTypes.emplace_back(AtmDataType::ACCESSTOKEN_HAP_UNDEFINE_INFO); + addValues.emplace_back(results); + ASSERT_EQ(RET_SUCCESS, AccessTokenDb::GetInstance().DeleteAndInsertValues( + deleteDataTypes, deleteValues, addDataTypes, addValues)); // sotre origin data + + atManagerService_ = nullptr; +} + +/** + * @tc.name: HandleHapUndefinedInfo002 + * @tc.desc: AccessTokenManagerService::HandleHapUndefinedInfo function test + * @tc.type: FUNC + * @tc.require: + */ +HWTEST_F(PermissionManagerCoverageTest, HandleHapUndefinedInfo002, TestSize.Level4) +{ + GenericValues conditionValue; + std::vector results; + ASSERT_EQ(RET_SUCCESS, AccessTokenDb::GetInstance().Find( + AtmDataType::ACCESSTOKEN_HAP_UNDEFINE_INFO, conditionValue, results)); // store origin data + + GenericValues delValue; + std::vector deleteDataTypes; + std::vector deleteValues; + deleteDataTypes.emplace_back(AtmDataType::ACCESSTOKEN_HAP_UNDEFINE_INFO); + deleteValues.emplace_back(delValue); + std::vector addDataTypes; + std::vector> addValues; + ASSERT_EQ(RET_SUCCESS, AccessTokenDb::GetInstance().DeleteAndInsertValues( + deleteDataTypes, deleteValues, addDataTypes, addValues)); // delete all data + + GenericValues value; + value.Put(TokenFiledConst::FIELD_TOKEN_ID, RANDOM_TOKENID); + value.Put(TokenFiledConst::FIELD_PERMISSION_NAME, "ohos.permission.SET_ENTERPRISE_INFO"); // mdm permission + value.Put(TokenFiledConst::FIELD_ACL, 0); + value.Put(TokenFiledConst::FIELD_APP_DISTRIBUTION_TYPE, "os_integration"); + std::vector values; + values.emplace_back(value); + + addDataTypes.emplace_back(AtmDataType::ACCESSTOKEN_HAP_UNDEFINE_INFO); + addValues.emplace_back(values); + EXPECT_EQ(RET_SUCCESS, AccessTokenDb::GetInstance().DeleteAndInsertValues( + deleteDataTypes, deleteValues, addDataTypes, addValues)); // add test data + addValues.clear(); + + std::shared_ptr atManagerService_ = + DelayedSingleton::GetInstance(); + EXPECT_NE(nullptr, atManagerService_); + + std::map tokenIdAplMap; + atManagerService_->HandleHapUndefinedInfo(tokenIdAplMap); + + addValues.emplace_back(results); + ASSERT_EQ(RET_SUCCESS, AccessTokenDb::GetInstance().DeleteAndInsertValues( + deleteDataTypes, deleteValues, addDataTypes, addValues)); // sotre origin data + atManagerService_ = nullptr; +} + +/** + * @tc.name: HandlePermDefUpdate001 + * @tc.desc: AccessTokenManagerService::HandlePermDefUpdate function test + * @tc.type: FUNC + * @tc.require: + */ +HWTEST_F(PermissionManagerCoverageTest, HandlePermDefUpdate001, TestSize.Level4) +{ + GenericValues conditionValue; + std::vector results; + ASSERT_EQ(RET_SUCCESS, AccessTokenDb::GetInstance().Find( + AtmDataType::ACCESSTOKEN_SYSTEM_CONFIG, conditionValue, results)); // store origin data + + GenericValues value; + std::vector deleteDataTypes; + std::vector deleteValues; + deleteDataTypes.emplace_back(AtmDataType::ACCESSTOKEN_SYSTEM_CONFIG); + deleteValues.emplace_back(value); + std::vector addDataTypes; + std::vector> addValues; + ASSERT_EQ(RET_SUCCESS, AccessTokenDb::GetInstance().DeleteAndInsertValues( + deleteDataTypes, deleteValues, addDataTypes, addValues)); // delete all data + + std::shared_ptr atManagerService_ = + DelayedSingleton::GetInstance(); + EXPECT_NE(nullptr, atManagerService_); + + std::map tokenIdAplMap; + atManagerService_->HandlePermDefUpdate(tokenIdAplMap); // dbPermDefVersion is empty + + addDataTypes.emplace_back(AtmDataType::ACCESSTOKEN_SYSTEM_CONFIG); + addValues.emplace_back(results); + ASSERT_EQ(RET_SUCCESS, AccessTokenDb::GetInstance().DeleteAndInsertValues( + deleteDataTypes, deleteValues, addDataTypes, addValues)); // sotre origin data + + atManagerService_ = nullptr; +} + +/** + * @tc.name: HandlePermDefUpdate002 + * @tc.desc: AccessTokenManagerService::HandlePermDefUpdate function test + * @tc.type: FUNC + * @tc.require: + */ +HWTEST_F(PermissionManagerCoverageTest, HandlePermDefUpdate002, TestSize.Level4) +{ + GenericValues conditionValue; + std::vector results; + ASSERT_EQ(RET_SUCCESS, AccessTokenDb::GetInstance().Find( + AtmDataType::ACCESSTOKEN_SYSTEM_CONFIG, conditionValue, results)); // store origin data + + GenericValues value; + GenericValues addValue; + addValue.Put(TokenFiledConst::FIELD_NAME, PERM_DEF_VERSION); + addValue.Put(TokenFiledConst::FIELD_VALUE, "sfdsfdsfsf"); // random input + std::vector values; + values.emplace_back(addValue); + + std::vector deleteDataTypes; + std::vector deleteValues; + deleteDataTypes.emplace_back(AtmDataType::ACCESSTOKEN_SYSTEM_CONFIG); + deleteValues.emplace_back(value); + std::vector addDataTypes; + std::vector> addValues; + addDataTypes.emplace_back(AtmDataType::ACCESSTOKEN_SYSTEM_CONFIG); + addValues.emplace_back(values); + ASSERT_EQ(RET_SUCCESS, AccessTokenDb::GetInstance().DeleteAndInsertValues( + deleteDataTypes, deleteValues, addDataTypes, addValues)); // update permission define version in db + addValues.clear(); + + std::shared_ptr atManagerService_ = + DelayedSingleton::GetInstance(); + EXPECT_NE(nullptr, atManagerService_); + + std::map tokenIdAplMap; + atManagerService_->HandlePermDefUpdate(tokenIdAplMap); // dbPermDefVersion is not empty + + addValues.emplace_back(results); + ASSERT_EQ(RET_SUCCESS, AccessTokenDb::GetInstance().DeleteAndInsertValues( + deleteDataTypes, deleteValues, addDataTypes, addValues)); // sotre origin data + + atManagerService_ = nullptr; +} } // namespace AccessToken } // namespace Security } // namespace OHOS diff --git a/services/accesstokenmanager/test/unittest/accesstoken_info_manager_test.cpp b/services/accesstokenmanager/test/unittest/accesstoken_info_manager_test.cpp index 01cb1666ab59b39a4e397d55cfc8ee2e981a1666..b33618ea4592fff538b1aa188a2592e4fdbb4269 100644 --- a/services/accesstokenmanager/test/unittest/accesstoken_info_manager_test.cpp +++ b/services/accesstokenmanager/test/unittest/accesstoken_info_manager_test.cpp @@ -130,8 +130,8 @@ void AccessTokenInfoManagerTest::SetUpTestCase() uint32_t nativeSize = 0; uint32_t pefDefSize = 0; uint32_t dlpSize = 0; - std::map tokenId2apl; - AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenId2apl); + std::map tokenIdAplMap; + AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenIdAplMap); } void AccessTokenInfoManagerTest::TearDownTestCase() @@ -1595,8 +1595,8 @@ HWTEST_F(AccessTokenInfoManagerTest, AccessTokenInfoManager001, TestSize.Level0) uint32_t nativeSize = 0; uint32_t pefDefSize = 0; uint32_t dlpSize = 0; - std::map tokenId2apl; - AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenId2apl); + std::map tokenIdAplMap; + AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenIdAplMap); AccessTokenInfoManager::GetInstance().hasInited_ = false; ASSERT_EQ(false, AccessTokenInfoManager::GetInstance().hasInited_); } diff --git a/services/accesstokenmanager/test/unittest/accesstoken_manager_service_test.cpp b/services/accesstokenmanager/test/unittest/accesstoken_manager_service_test.cpp index 83253f22c9f648a289fcd7e5e41eee7130d34b3b..9591979c8353abf1848d4c824da43916b1f1645f 100644 --- a/services/accesstokenmanager/test/unittest/accesstoken_manager_service_test.cpp +++ b/services/accesstokenmanager/test/unittest/accesstoken_manager_service_test.cpp @@ -140,7 +140,7 @@ HWTEST_F(AccessTokenManagerServiceTest, DumpTokenInfoFuncTest001, TestSize.Level } void AccessTokenManagerServiceTest::CreateHapToken(const HapInfoParcel& infoParCel, const HapPolicyParcel& policyParcel, - AccessTokenID& tokenId, std::map& tokenId2apl, bool hasInit) + AccessTokenID& tokenId, std::map& tokenIdAplMap, bool hasInit) { if (!hasInit) { atManagerService_->Initialize(); @@ -155,7 +155,7 @@ void AccessTokenManagerServiceTest::CreateHapToken(const HapInfoParcel& infoParC tokenIDEx.tokenIDEx = fullTokenId; tokenId = tokenIDEx.tokenIdExStruct.tokenID; ASSERT_NE(INVALID_TOKENID, tokenId); - tokenId2apl[static_cast(tokenId)] = g_policy.apl; + tokenIdAplMap[static_cast(tokenId)] = g_policy.apl; } /** @@ -164,7 +164,7 @@ void AccessTokenManagerServiceTest::CreateHapToken(const HapInfoParcel& infoParC * @tc.type: FUNC * @tc.require: */ -HWTEST_F(AccessTokenManagerServiceTest, SystemConfigTest001, TestSize.Level1) +HWTEST_F(AccessTokenManagerServiceTest, SystemConfigTest001, TestSize.Level0) { GenericValues conditionValue; conditionValue.Put(TokenFiledConst::FIELD_NAME, PERM_DEF_VERSION); @@ -183,15 +183,15 @@ HWTEST_F(AccessTokenManagerServiceTest, SystemConfigTest001, TestSize.Level1) * @tc.type: FUNC * @tc.require: */ -HWTEST_F(AccessTokenManagerServiceTest, InitHapTokenTest001, TestSize.Level1) +HWTEST_F(AccessTokenManagerServiceTest, InitHapTokenTest001, TestSize.Level0) { HapInfoParcel infoParCel; infoParCel.hapInfoParameter = g_info; HapPolicyParcel policyParcel; policyParcel.hapPolicy = g_policy; // KERNEL_ATM_SELF_USE(hasValue is true) + INVALIDA AccessTokenID tokenId; - std::map tokenId2apl; - CreateHapToken(infoParCel, policyParcel, tokenId, tokenId2apl); + std::map tokenIdAplMap; + CreateHapToken(infoParCel, policyParcel, tokenId, tokenIdAplMap); // query undefine table GenericValues conditionValue; @@ -220,15 +220,15 @@ HWTEST_F(AccessTokenManagerServiceTest, InitHapTokenTest001, TestSize.Level1) * @tc.type: FUNC * @tc.require: */ -HWTEST_F(AccessTokenManagerServiceTest, InitHapTokenTest002, TestSize.Level1) +HWTEST_F(AccessTokenManagerServiceTest, InitHapTokenTest002, TestSize.Level0) { HapInfoParcel infoParCel; infoParCel.hapInfoParameter = g_info; HapPolicyParcel policyParcel; policyParcel.hapPolicy = g_policy; // KERNEL_ATM_SELF_USE + INVALIDA AccessTokenID tokenId; - std::map tokenId2apl; - CreateHapToken(infoParCel, policyParcel, tokenId, tokenId2apl); // create master app + std::map tokenIdAplMap; + CreateHapToken(infoParCel, policyParcel, tokenId, tokenIdAplMap); // create master app HapInfoParcel infoParCel2; infoParCel2.hapInfoParameter = g_info; @@ -238,7 +238,7 @@ HWTEST_F(AccessTokenManagerServiceTest, InitHapTokenTest002, TestSize.Level1) policyParcel2.hapPolicy = g_policy; // KERNEL_ATM_SELF_USE + INVALIDB, INVALIDB diff from INVALIDA in master app policyParcel2.hapPolicy.permStateList = {g_state1, g_state3}; AccessTokenID tokenId2; - CreateHapToken(infoParCel2, policyParcel2, tokenId2, tokenId2apl, true); // create dlp app + CreateHapToken(infoParCel2, policyParcel2, tokenId2, tokenIdAplMap, true); // create dlp app // query undefine table for dlp app GenericValues conditionValue; @@ -261,15 +261,15 @@ HWTEST_F(AccessTokenManagerServiceTest, InitHapTokenTest002, TestSize.Level1) * @tc.type: FUNC * @tc.require: */ -HWTEST_F(AccessTokenManagerServiceTest, UpdateHapTokenTest001, TestSize.Level1) +HWTEST_F(AccessTokenManagerServiceTest, UpdateHapTokenTest001, TestSize.Level0) { HapInfoParcel infoParCel; infoParCel.hapInfoParameter = g_info; HapPolicyParcel policyParcel; policyParcel.hapPolicy = g_policy; // KERNEL_ATM_SELF_USE + INVALIDA AccessTokenID tokenId; - std::map tokenId2apl; - CreateHapToken(infoParCel, policyParcel, tokenId, tokenId2apl); + std::map tokenIdAplMap; + CreateHapToken(infoParCel, policyParcel, tokenId, tokenIdAplMap); // query undefine table GenericValues conditionValue; @@ -307,20 +307,56 @@ HWTEST_F(AccessTokenManagerServiceTest, UpdateHapTokenTest001, TestSize.Level1) } /** - * @tc.name: UpdateHapTokenTest002 + * @tc.name: InitHapTokenTest002 + * @tc.desc: test ota update acl check fail return false + * @tc.type: FUNC + * @tc.require: + */ +HWTEST_F(AccessTokenManagerServiceTest, UpdateHapTokenTest002, TestSize.Level0) +{ + HapInfoParcel infoParCel; + infoParCel.hapInfoParameter = g_info; + HapPolicyParcel policyParcel; + policyParcel.hapPolicy = g_policy; // KERNEL_ATM_SELF_USE + INVALIDA + AccessTokenID tokenId; + std::map tokenIdAplMap; + CreateHapToken(infoParCel, policyParcel, tokenId, tokenIdAplMap); + + // update hap + uint64_t fullTokenId; + AccessTokenIDEx tokenIDEx; + tokenIDEx.tokenIdExStruct.tokenID = tokenId; + fullTokenId = tokenIDEx.tokenIDEx; + policyParcel.hapPolicy.aclExtendedMap = {}; + UpdateHapInfoParamsIdl infoIdl; + infoIdl.appIDDesc = g_info.appIDDesc; + infoIdl.apiVersion = g_info.apiVersion; + infoIdl.isSystemApp = g_info.isSystemApp; + infoIdl.appDistributionType = g_info.appDistributionType; + infoIdl.isAtomicService = g_info.isAtomicService; + infoIdl.dataRefresh = false; + HapInfoCheckResultIdl resultInfoIdl; + ASSERT_EQ(0, atManagerService_->UpdateHapToken(fullTokenId, infoIdl, policyParcel, resultInfoIdl)); + ASSERT_EQ(PermissionRulesEnumIdl::PERMISSION_ACL_RULE, resultInfoIdl.rule); + + ASSERT_EQ(0, atManagerService_->DeleteToken(tokenId)); +} + +/** + * @tc.name: UpdateHapTokenTest003 * @tc.desc: test ota update acl check fail return success and permission store in undefine table * @tc.type: FUNC * @tc.require: */ -HWTEST_F(AccessTokenManagerServiceTest, UpdateHapTokenTest002, TestSize.Level1) +HWTEST_F(AccessTokenManagerServiceTest, UpdateHapTokenTest003, TestSize.Level0) { HapInfoParcel infoParCel; infoParCel.hapInfoParameter = g_info; HapPolicyParcel policyParcel; policyParcel.hapPolicy = g_policy; // KERNEL_ATM_SELF_USE + INVALIDA AccessTokenID tokenId; - std::map tokenId2apl; - CreateHapToken(infoParCel, policyParcel, tokenId, tokenId2apl); + std::map tokenIdAplMap; + CreateHapToken(infoParCel, policyParcel, tokenId, tokenIdAplMap); // query undefine table GenericValues conditionValue; @@ -365,7 +401,7 @@ HWTEST_F(AccessTokenManagerServiceTest, UpdateHapTokenTest002, TestSize.Level1) * @tc.type: FUNC * @tc.require: */ -HWTEST_F(AccessTokenManagerServiceTest, OTATest001, TestSize.Level1) +HWTEST_F(AccessTokenManagerServiceTest, OTATest001, TestSize.Level0) { HapInfoParcel infoParCel; infoParCel.hapInfoParameter = g_info; @@ -374,8 +410,8 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest001, TestSize.Level1) policyParcel.hapPolicy.permStateList = {g_state4}; policyParcel.hapPolicy.aclExtendedMap = {}; AccessTokenID tokenId; - std::map tokenId2apl; - CreateHapToken(infoParCel, policyParcel, tokenId, tokenId2apl); + std::map tokenIdAplMap; + CreateHapToken(infoParCel, policyParcel, tokenId, tokenIdAplMap); GenericValues value; // system grant value.Put(TokenFiledConst::FIELD_TOKEN_ID, RANDOM_TOKENID); @@ -392,7 +428,7 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest001, TestSize.Level1) addValues.emplace_back(values); ASSERT_EQ(0, AccessTokenDb::GetInstance().DeleteAndInsertValues( deleteDataTypes, deleteValues, addDataTypes, addValues)); - atManagerService_->HandleHapUndefinedInfo(tokenId2apl); + atManagerService_->HandleHapUndefinedInfo(tokenIdAplMap); GenericValues conditionValue; conditionValue.Put(TokenFiledConst::FIELD_TOKEN_ID, RANDOM_TOKENID); @@ -420,7 +456,7 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest001, TestSize.Level1) * @tc.type: FUNC * @tc.require: */ -HWTEST_F(AccessTokenManagerServiceTest, OTATest002, TestSize.Level1) +HWTEST_F(AccessTokenManagerServiceTest, OTATest002, TestSize.Level0) { HapInfoParcel infoParCel; infoParCel.hapInfoParameter = g_info; @@ -429,8 +465,8 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest002, TestSize.Level1) policyParcel.hapPolicy.permStateList = {g_state4}; policyParcel.hapPolicy.aclExtendedMap = {}; AccessTokenID tokenId; - std::map tokenId2apl; - CreateHapToken(infoParCel, policyParcel, tokenId, tokenId2apl); + std::map tokenIdAplMap; + CreateHapToken(infoParCel, policyParcel, tokenId, tokenIdAplMap); GenericValues value; // system grant value.Put(TokenFiledConst::FIELD_TOKEN_ID, static_cast(tokenId)); @@ -447,7 +483,7 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest002, TestSize.Level1) addValues.emplace_back(values); ASSERT_EQ(0, AccessTokenDb::GetInstance().DeleteAndInsertValues( deleteDataTypes, deleteValues, addDataTypes, addValues)); - atManagerService_->HandleHapUndefinedInfo(tokenId2apl); + atManagerService_->HandleHapUndefinedInfo(tokenIdAplMap); GenericValues conditionValue; conditionValue.Put(TokenFiledConst::FIELD_TOKEN_ID, static_cast(tokenId)); @@ -477,7 +513,7 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest002, TestSize.Level1) * @tc.type: FUNC * @tc.require: */ -HWTEST_F(AccessTokenManagerServiceTest, OTATest003, TestSize.Level1) +HWTEST_F(AccessTokenManagerServiceTest, OTATest003, TestSize.Level0) { HapInfoParcel infoParCel; infoParCel.hapInfoParameter = g_info; @@ -485,8 +521,8 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest003, TestSize.Level1) policyParcel.hapPolicy = g_policy; policyParcel.hapPolicy.permStateList = {g_state1}; // KERNEL_ATM_SELF_USE AccessTokenID tokenId; - std::map tokenId2apl; - CreateHapToken(infoParCel, policyParcel, tokenId, tokenId2apl); + std::map tokenIdAplMap; + CreateHapToken(infoParCel, policyParcel, tokenId, tokenIdAplMap); GenericValues value1; // user grant value1.Put(TokenFiledConst::FIELD_TOKEN_ID, static_cast(tokenId)); @@ -508,7 +544,7 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest003, TestSize.Level1) addValues.emplace_back(values); ASSERT_EQ(0, AccessTokenDb::GetInstance().DeleteAndInsertValues( deleteDataTypes, deleteValues, addDataTypes, addValues)); - atManagerService_->HandleHapUndefinedInfo(tokenId2apl); + atManagerService_->HandleHapUndefinedInfo(tokenIdAplMap); GenericValues conditionValue; conditionValue.Put(TokenFiledConst::FIELD_TOKEN_ID, static_cast(tokenId)); @@ -541,7 +577,7 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest003, TestSize.Level1) * @tc.type: FUNC * @tc.require: */ -HWTEST_F(AccessTokenManagerServiceTest, OTATest004, TestSize.Level1) +HWTEST_F(AccessTokenManagerServiceTest, OTATest004, TestSize.Level0) { HapInfoParcel infoParCel; infoParCel.hapInfoParameter = g_info; @@ -549,8 +585,8 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest004, TestSize.Level1) policyParcel.hapPolicy = g_policy; policyParcel.hapPolicy.permStateList = {g_state1}; // KERNEL_ATM_SELF_USE AccessTokenID tokenId; - std::map tokenId2apl; - CreateHapToken(infoParCel, policyParcel, tokenId, tokenId2apl); + std::map tokenIdAplMap; + CreateHapToken(infoParCel, policyParcel, tokenId, tokenIdAplMap); GenericValues value; // system grant value.Put(TokenFiledConst::FIELD_TOKEN_ID, static_cast(tokenId)); @@ -567,7 +603,7 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest004, TestSize.Level1) addValues.emplace_back(values); ASSERT_EQ(0, AccessTokenDb::GetInstance().DeleteAndInsertValues( deleteDataTypes, deleteValues, addDataTypes, addValues)); - atManagerService_->HandleHapUndefinedInfo(tokenId2apl); + atManagerService_->HandleHapUndefinedInfo(tokenIdAplMap); GenericValues conditionValue; conditionValue.Put(TokenFiledConst::FIELD_TOKEN_ID, static_cast(tokenId)); @@ -592,7 +628,7 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest004, TestSize.Level1) * @tc.type: FUNC * @tc.require: */ -HWTEST_F(AccessTokenManagerServiceTest, OTATest005, TestSize.Level1) +HWTEST_F(AccessTokenManagerServiceTest, OTATest005, TestSize.Level0) { HapInfoParcel infoParCel; infoParCel.hapInfoParameter = g_info; @@ -601,8 +637,8 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest005, TestSize.Level1) policyParcel.hapPolicy.permStateList = {g_state1}; // KERNEL_ATM_SELF_USE policyParcel.hapPolicy.aclRequestedList = { g_state6.permissionName }; AccessTokenID tokenId; - std::map tokenId2apl; - CreateHapToken(infoParCel, policyParcel, tokenId, tokenId2apl); + std::map tokenIdAplMap; + CreateHapToken(infoParCel, policyParcel, tokenId, tokenIdAplMap); GenericValues value; // system grant value.Put(TokenFiledConst::FIELD_TOKEN_ID, static_cast(tokenId)); @@ -619,7 +655,7 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest005, TestSize.Level1) addValues.emplace_back(values); ASSERT_EQ(0, AccessTokenDb::GetInstance().DeleteAndInsertValues( deleteDataTypes, deleteValues, addDataTypes, addValues)); - atManagerService_->HandleHapUndefinedInfo(tokenId2apl); + atManagerService_->HandleHapUndefinedInfo(tokenIdAplMap); GenericValues conditionValue; conditionValue.Put(TokenFiledConst::FIELD_TOKEN_ID, static_cast(tokenId)); @@ -649,7 +685,7 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest005, TestSize.Level1) * @tc.type: FUNC * @tc.require: */ -HWTEST_F(AccessTokenManagerServiceTest, OTATest006, TestSize.Level1) +HWTEST_F(AccessTokenManagerServiceTest, OTATest006, TestSize.Level0) { HapInfoParcel infoParCel; infoParCel.hapInfoParameter = g_info; @@ -659,8 +695,8 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest006, TestSize.Level1) policyParcel.hapPolicy.aclRequestedList = { g_state6.permissionName }; // POWER_MANAGER, hasValue is false policyParcel.hapPolicy.aclExtendedMap = { std::make_pair(g_state6.permissionName, "test") }; AccessTokenID tokenId; - std::map tokenId2apl; - CreateHapToken(infoParCel, policyParcel, tokenId, tokenId2apl); + std::map tokenIdAplMap; + CreateHapToken(infoParCel, policyParcel, tokenId, tokenIdAplMap); GenericValues value; // system grant value.Put(TokenFiledConst::FIELD_TOKEN_ID, static_cast(tokenId)); @@ -678,7 +714,7 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest006, TestSize.Level1) addValues.emplace_back(values); ASSERT_EQ(0, AccessTokenDb::GetInstance().DeleteAndInsertValues( deleteDataTypes, deleteValues, addDataTypes, addValues)); - atManagerService_->HandleHapUndefinedInfo(tokenId2apl); + atManagerService_->HandleHapUndefinedInfo(tokenIdAplMap); GenericValues conditionValue; conditionValue.Put(TokenFiledConst::FIELD_TOKEN_ID, static_cast(tokenId)); @@ -713,7 +749,7 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest006, TestSize.Level1) * @tc.type: FUNC * @tc.require: */ -HWTEST_F(AccessTokenManagerServiceTest, OTATest007, TestSize.Level1) +HWTEST_F(AccessTokenManagerServiceTest, OTATest007, TestSize.Level0) { HapInfoParcel infoParCel; infoParCel.hapInfoParameter = g_info; @@ -722,8 +758,8 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest007, TestSize.Level1) policyParcel.hapPolicy.permStateList = {g_state4}; policyParcel.hapPolicy.aclExtendedMap = {}; AccessTokenID tokenId; - std::map tokenId2apl; - CreateHapToken(infoParCel, policyParcel, tokenId, tokenId2apl); // KERNEL_ATM_SELF_USE, hasValue is true + std::map tokenIdAplMap; + CreateHapToken(infoParCel, policyParcel, tokenId, tokenIdAplMap); // KERNEL_ATM_SELF_USE, hasValue is true GenericValues value; // system grant value.Put(TokenFiledConst::FIELD_TOKEN_ID, static_cast(tokenId)); @@ -741,7 +777,7 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest007, TestSize.Level1) addValues.emplace_back(values); ASSERT_EQ(0, AccessTokenDb::GetInstance().DeleteAndInsertValues( deleteDataTypes, deleteValues, addDataTypes, addValues)); - atManagerService_->HandleHapUndefinedInfo(tokenId2apl); + atManagerService_->HandleHapUndefinedInfo(tokenIdAplMap); GenericValues conditionValue; conditionValue.Put(TokenFiledConst::FIELD_TOKEN_ID, static_cast(tokenId)); @@ -777,7 +813,7 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest007, TestSize.Level1) * @tc.type: FUNC * @tc.require: */ -HWTEST_F(AccessTokenManagerServiceTest, OTATest008, TestSize.Level1) +HWTEST_F(AccessTokenManagerServiceTest, OTATest008, TestSize.Level0) { HapInfoParcel infoParCel; infoParCel.hapInfoParameter = g_info; @@ -786,8 +822,8 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest008, TestSize.Level1) policyParcel.hapPolicy.permStateList = {g_state4}; policyParcel.hapPolicy.aclExtendedMap = {}; AccessTokenID tokenId; - std::map tokenId2apl; - CreateHapToken(infoParCel, policyParcel, tokenId, tokenId2apl); + std::map tokenIdAplMap; + CreateHapToken(infoParCel, policyParcel, tokenId, tokenIdAplMap); GenericValues value; // system grant value.Put(TokenFiledConst::FIELD_TOKEN_ID, static_cast(tokenId)); @@ -804,7 +840,7 @@ HWTEST_F(AccessTokenManagerServiceTest, OTATest008, TestSize.Level1) addValues.emplace_back(values); ASSERT_EQ(0, AccessTokenDb::GetInstance().DeleteAndInsertValues( deleteDataTypes, deleteValues, addDataTypes, addValues)); - atManagerService_->HandleHapUndefinedInfo(tokenId2apl); + atManagerService_->HandleHapUndefinedInfo(tokenIdAplMap); GenericValues conditionValue; conditionValue.Put(TokenFiledConst::FIELD_TOKEN_ID, static_cast(tokenId)); diff --git a/services/accesstokenmanager/test/unittest/accesstoken_manager_service_test.h b/services/accesstokenmanager/test/unittest/accesstoken_manager_service_test.h index 1169c9c6dae6ae2b212107ede3d97d2276f2150f..f6045fe9f78f366a2aa053f9be0395b74d454a7e 100644 --- a/services/accesstokenmanager/test/unittest/accesstoken_manager_service_test.h +++ b/services/accesstokenmanager/test/unittest/accesstoken_manager_service_test.h @@ -33,7 +33,7 @@ public: void TearDown(); void CreateHapToken(const HapInfoParcel& infoParCel, const HapPolicyParcel& policyParcel, AccessTokenID& tokenId, - std::map& tokenId2apl, bool hasInit = false); + std::map& tokenIdAplMap, bool hasInit = false); std::shared_ptr atManagerService_; }; diff --git a/test/fuzztest/normalize_service/accesstoken/grantpermissionservice_fuzzer/grantpermissionservice_fuzzer.cpp b/test/fuzztest/normalize_service/accesstoken/grantpermissionservice_fuzzer/grantpermissionservice_fuzzer.cpp index 3fdd08d704f62110e95e22510d0bb3fb26e90277..42d0d9a3de66bbe1e27d812ba05c339b11744fe6 100644 --- a/test/fuzztest/normalize_service/accesstoken/grantpermissionservice_fuzzer/grantpermissionservice_fuzzer.cpp +++ b/test/fuzztest/normalize_service/accesstoken/grantpermissionservice_fuzzer/grantpermissionservice_fuzzer.cpp @@ -93,8 +93,8 @@ bool GrantPermissionServiceFuzzTest(const uint8_t* data, size_t size) uint32_t nativeSize = 0; uint32_t pefDefSize = 0; uint32_t dlpSize = 0; - std::map tokenId2apl; - AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenId2apl); + std::map tokenIdAplMap; + AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenIdAplMap); } bool enable = ((fuzzData.GetData() % CONSTANTS_NUMBER_FIVE) == 0); if (enable) { diff --git a/test/fuzztest/services/accesstoken/deleteremotedevicetokensstub_fuzzer/deleteremotedevicetokensstub_fuzzer.cpp b/test/fuzztest/services/accesstoken/deleteremotedevicetokensstub_fuzzer/deleteremotedevicetokensstub_fuzzer.cpp index 3aba8f5d8bc8533592fcde17f7d019483fe0bf25..f224bf4c52e35d319da74c0925a5cc14fcec563a 100644 --- a/test/fuzztest/services/accesstoken/deleteremotedevicetokensstub_fuzzer/deleteremotedevicetokensstub_fuzzer.cpp +++ b/test/fuzztest/services/accesstoken/deleteremotedevicetokensstub_fuzzer/deleteremotedevicetokensstub_fuzzer.cpp @@ -62,8 +62,8 @@ namespace OHOS { uint32_t nativeSize = 0; uint32_t pefDefSize = 0; uint32_t dlpSize = 0; - std::map tokenId2apl; - AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenId2apl); + std::map tokenIdAplMap; + AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenIdAplMap); } DelayedSingleton::GetInstance()->OnRemoteRequest(code, datas, reply, option); AccessTokenID hdcd = AccessTokenKit::GetNativeTokenId("hdcd"); diff --git a/test/fuzztest/services/accesstoken/deleteremotetokenstub_fuzzer/deleteremotetokenstub_fuzzer.cpp b/test/fuzztest/services/accesstoken/deleteremotetokenstub_fuzzer/deleteremotetokenstub_fuzzer.cpp index c5aa8e027e3b8989d474f7fbbd393589c95d9af2..99f54ca3d30f926970dc7be408acbd22ef2c97af 100644 --- a/test/fuzztest/services/accesstoken/deleteremotetokenstub_fuzzer/deleteremotetokenstub_fuzzer.cpp +++ b/test/fuzztest/services/accesstoken/deleteremotetokenstub_fuzzer/deleteremotetokenstub_fuzzer.cpp @@ -66,8 +66,8 @@ namespace OHOS { uint32_t nativeSize = 0; uint32_t pefDefSize = 0; uint32_t dlpSize = 0; - std::map tokenId2apl; - AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenId2apl); + std::map tokenIdAplMap; + AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenIdAplMap); } DelayedSingleton::GetInstance()->OnRemoteRequest(code, datas, reply, option); AccessTokenID hdcd = AccessTokenKit::GetNativeTokenId("hdcd"); diff --git a/test/fuzztest/services/accesstoken/gethaptokeninfofromremotestub_fuzzer/gethaptokeninfofromremotestub_fuzzer.cpp b/test/fuzztest/services/accesstoken/gethaptokeninfofromremotestub_fuzzer/gethaptokeninfofromremotestub_fuzzer.cpp index 38b3795f2bdc5748ad48acf6082a1b741ad0a8d8..7b0570a6901068fe435bd859621b44eb9499289c 100644 --- a/test/fuzztest/services/accesstoken/gethaptokeninfofromremotestub_fuzzer/gethaptokeninfofromremotestub_fuzzer.cpp +++ b/test/fuzztest/services/accesstoken/gethaptokeninfofromremotestub_fuzzer/gethaptokeninfofromremotestub_fuzzer.cpp @@ -61,8 +61,8 @@ namespace OHOS { uint32_t nativeSize = 0; uint32_t pefDefSize = 0; uint32_t dlpSize = 0; - std::map tokenId2apl; - AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenId2apl); + std::map tokenIdAplMap; + AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenIdAplMap); } DelayedSingleton::GetInstance()->OnRemoteRequest(code, datas, reply, option); AccessTokenID hdcd = AccessTokenKit::GetNativeTokenId("hdcd"); diff --git a/test/fuzztest/services/accesstoken/getremotenativetokenidstub_fuzzer/getremotenativetokenidstub_fuzzer.cpp b/test/fuzztest/services/accesstoken/getremotenativetokenidstub_fuzzer/getremotenativetokenidstub_fuzzer.cpp index fe1e3b28fe74e76145529d76965511793a2be68c..c752771ea3ba168fda6d7a3b84bd90a190bf250c 100644 --- a/test/fuzztest/services/accesstoken/getremotenativetokenidstub_fuzzer/getremotenativetokenidstub_fuzzer.cpp +++ b/test/fuzztest/services/accesstoken/getremotenativetokenidstub_fuzzer/getremotenativetokenidstub_fuzzer.cpp @@ -66,8 +66,8 @@ namespace OHOS { uint32_t nativeSize = 0; uint32_t pefDefSize = 0; uint32_t dlpSize = 0; - std::map tokenId2apl; - AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenId2apl); + std::map tokenIdAplMap; + AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenIdAplMap); } DelayedSingleton::GetInstance()->OnRemoteRequest(code, datas, reply, option); AccessTokenID hdcd = AccessTokenKit::GetNativeTokenId("hdcd"); diff --git a/test/fuzztest/services/accesstoken/grantpermissionstub_fuzzer/grantpermissionstub_fuzzer.cpp b/test/fuzztest/services/accesstoken/grantpermissionstub_fuzzer/grantpermissionstub_fuzzer.cpp index 0316bd0ce6951cd22c51907d352fdf0c6e2f236b..2985e0195eff9ef99d5b700881329c1d25ac9ad9 100644 --- a/test/fuzztest/services/accesstoken/grantpermissionstub_fuzzer/grantpermissionstub_fuzzer.cpp +++ b/test/fuzztest/services/accesstoken/grantpermissionstub_fuzzer/grantpermissionstub_fuzzer.cpp @@ -79,8 +79,8 @@ namespace OHOS { uint32_t nativeSize = 0; uint32_t pefDefSize = 0; uint32_t dlpSize = 0; - std::map tokenId2apl; - AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenId2apl); + std::map tokenIdAplMap; + AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenIdAplMap); } bool enable = ((size % CONSTANTS_NUMBER_TWO) == 0); if (enable) { diff --git a/test/fuzztest/services/accesstoken/setremotehaptokeninfostub_fuzzer/setremotehaptokeninfostub_fuzzer.cpp b/test/fuzztest/services/accesstoken/setremotehaptokeninfostub_fuzzer/setremotehaptokeninfostub_fuzzer.cpp index 0ba6f0c6fabf6876f592b98117c6c65cf1d1f029..4f3329119822054807e62610b6fac592b4ece109 100644 --- a/test/fuzztest/services/accesstoken/setremotehaptokeninfostub_fuzzer/setremotehaptokeninfostub_fuzzer.cpp +++ b/test/fuzztest/services/accesstoken/setremotehaptokeninfostub_fuzzer/setremotehaptokeninfostub_fuzzer.cpp @@ -100,8 +100,8 @@ namespace OHOS { uint32_t nativeSize = 0; uint32_t pefDefSize = 0; uint32_t dlpSize = 0; - std::map tokenId2apl; - AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenId2apl); + std::map tokenIdAplMap; + AccessTokenInfoManager::GetInstance().Init(hapSize, nativeSize, pefDefSize, dlpSize, tokenIdAplMap); } DelayedSingleton::GetInstance()->OnRemoteRequest(code, datas, reply, option); AccessTokenID hdcd = AccessTokenKit::GetNativeTokenId("hdcd");