From ab7c46df93079822312703b530d97a109f5224e9 Mon Sep 17 00:00:00 2001 From: chen Date: Thu, 22 Sep 2022 15:29:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chen --- .../cpp/src/token/hap_token_info_inner.cpp | 1 + .../cpp/src/permission_grant_event_test.cpp | 3 +- .../token_sync_service_test.cpp | 46 +++++++++++-------- tools/accesstoken/src/atm_command.cpp | 2 +- 4 files changed, 30 insertions(+), 22 deletions(-) diff --git a/services/accesstokenmanager/main/cpp/src/token/hap_token_info_inner.cpp b/services/accesstokenmanager/main/cpp/src/token/hap_token_info_inner.cpp index e93f1978a..a76248cde 100644 --- a/services/accesstokenmanager/main/cpp/src/token/hap_token_info_inner.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/hap_token_info_inner.cpp @@ -62,6 +62,7 @@ HapTokenInfoInner::HapTokenInfoInner(AccessTokenID id, HapTokenInfoInner::HapTokenInfoInner(AccessTokenID id, const HapTokenInfo &info, const std::vector& permStateList) : isRemote_(false) { + permUpdateTimestamp_ = 0; tokenInfoBasic_ = info; permPolicySet_ = PermissionPolicySet::BuildPermissionPolicySet(id, permStateList); } diff --git a/services/accesstokenmanager/test/unittest/cpp/src/permission_grant_event_test.cpp b/services/accesstokenmanager/test/unittest/cpp/src/permission_grant_event_test.cpp index bd8fa4482..6d3f1af65 100644 --- a/services/accesstokenmanager/test/unittest/cpp/src/permission_grant_event_test.cpp +++ b/services/accesstokenmanager/test/unittest/cpp/src/permission_grant_event_test.cpp @@ -23,7 +23,8 @@ using namespace testing::ext; using namespace OHOS::Security::AccessToken; namespace { -static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = {LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "PermissionGrantEventTest"}; +static constexpr OHOS::HiviewDFX::HiLogLabel LABEL = { + LOG_CORE, SECURITY_DOMAIN_ACCESSTOKEN, "PermissionGrantEventTest"}; } void PermissionGrantEventTest::SetUpTestCase() diff --git a/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.cpp b/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.cpp index 79d4b33a2..4608f18a7 100644 --- a/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.cpp +++ b/services/tokensyncmanager/test/unittest/token_sync_service/token_sync_service_test.cpp @@ -40,13 +40,16 @@ #undef private using namespace std; -using namespace OHOS::Security::AccessToken; using namespace testing::ext; + +namespace OHOS { +namespace Security { +namespace AccessToken { static std::vector threads_; static std::shared_ptr g_ptrDeviceStateCallback = std::make_shared(); static std::string g_networkID = "deviceid-1"; -static std::string g_UDID = "deviceid-1:udid-001"; +static std::string g_udid = "deviceid-1:udid-001"; static DmDeviceInfo g_devInfo = { // udid = deviceid-1:udid-001 uuid = deviceid-1:uuid-001 .deviceId = "deviceid-1", @@ -276,9 +279,9 @@ HWTEST_F(TokenSyncServiceTest, GetRemoteHapTokenInfo003, TestSize.Level1) g_ptrDeviceStateCallback->OnDeviceOnline(g_devInfo); OHOS::DelayedSingleton::GetInstance()->GetRemoteHapTokenInfo( - g_UDID, 0x20100000); + g_udid, 0x20100000); - AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_UDID, 0x20100000); + AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_udid, 0x20100000); ASSERT_EQ(mapID, (AccessTokenID)0); } @@ -309,9 +312,9 @@ HWTEST_F(TokenSyncServiceTest, GetRemoteHapTokenInfo004, TestSize.Level1) g_ptrDeviceStateCallback->OnDeviceOnline(g_devInfo); OHOS::DelayedSingleton::GetInstance()->GetRemoteHapTokenInfo( - g_UDID, 0x20100000); + g_udid, 0x20100000); - AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_UDID, 0x20100000); + AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_udid, 0x20100000); ASSERT_EQ(mapID, (AccessTokenID)0); } @@ -343,9 +346,9 @@ HWTEST_F(TokenSyncServiceTest, GetRemoteHapTokenInfo005, TestSize.Level1) g_ptrDeviceStateCallback->OnDeviceOnline(g_devInfo); OHOS::DelayedSingleton::GetInstance()->GetRemoteHapTokenInfo( - g_UDID, 0x20100000); + g_udid, 0x20100000); - AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_UDID, 0x20100000); + AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_udid, 0x20100000); ASSERT_EQ(mapID, (AccessTokenID)0); } @@ -377,9 +380,9 @@ HWTEST_F(TokenSyncServiceTest, GetRemoteHapTokenInfo006, TestSize.Level1) g_ptrDeviceStateCallback->OnDeviceOnline(g_devInfo); OHOS::DelayedSingleton::GetInstance()->GetRemoteHapTokenInfo( - g_UDID, 0x20100000); + g_udid, 0x20100000); - AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_UDID, 0x20100000); + AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_udid, 0x20100000); ASSERT_EQ(mapID, (AccessTokenID)0); } @@ -412,9 +415,9 @@ HWTEST_F(TokenSyncServiceTest, GetRemoteHapTokenInfo007, TestSize.Level1) g_ptrDeviceStateCallback->OnDeviceOnline(g_devInfo); OHOS::DelayedSingleton::GetInstance()->GetRemoteHapTokenInfo( - g_UDID, 0x20100000); + g_udid, 0x20100000); - AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_UDID, 0x20100000); + AccessTokenID mapID = AccessTokenKit::AllocLocalTokenID(g_udid, 0x20100000); ASSERT_EQ(mapID, (AccessTokenID)0); } @@ -498,14 +501,14 @@ HWTEST_F(TokenSyncServiceTest, SyncNativeTokens001, TestSize.Level1) sleep(6); - AccessTokenID mapID = AccessTokenKit::GetRemoteNativeTokenID(g_UDID, 0x28000000); + AccessTokenID mapID = AccessTokenKit::GetRemoteNativeTokenID(g_udid, 0x28000000); ASSERT_NE(mapID, (AccessTokenID)0); int ret = AccessTokenKit::CheckNativeDCap(mapID, "SYSDCAP"); ASSERT_EQ(ret, RET_SUCCESS); ret = AccessTokenKit::CheckNativeDCap(mapID, "DMSDCAP"); ASSERT_EQ(ret, RET_SUCCESS); - mapID = AccessTokenKit::GetRemoteNativeTokenID(g_UDID, 0x28000001); + mapID = AccessTokenKit::GetRemoteNativeTokenID(g_udid, 0x28000001); ASSERT_NE(mapID, (AccessTokenID)0); ret = AccessTokenKit::CheckNativeDCap(mapID, "SYSDCAP"); ASSERT_EQ(ret, RET_SUCCESS); @@ -544,14 +547,14 @@ HWTEST_F(TokenSyncServiceTest, SyncNativeTokens002, TestSize.Level1) sleep(6); - AccessTokenID mapID = AccessTokenKit::GetRemoteNativeTokenID(g_UDID, 0x28000000); + AccessTokenID mapID = AccessTokenKit::GetRemoteNativeTokenID(g_udid, 0x28000000); ASSERT_NE(mapID, (AccessTokenID)0); int ret = AccessTokenKit::CheckNativeDCap(mapID, "SYSDCAP"); ASSERT_EQ(ret, RET_SUCCESS); ret = AccessTokenKit::CheckNativeDCap(mapID, "DMSDCAP"); ASSERT_EQ(ret, RET_SUCCESS); - mapID = AccessTokenKit::GetRemoteNativeTokenID(g_UDID, 0x28000001); + mapID = AccessTokenKit::GetRemoteNativeTokenID(g_udid, 0x28000001); ASSERT_EQ(mapID, (AccessTokenID)0); } @@ -584,10 +587,10 @@ HWTEST_F(TokenSyncServiceTest, SyncNativeTokens003, TestSize.Level1) sleep(6); - AccessTokenID mapID = AccessTokenKit::GetRemoteNativeTokenID(g_UDID, 0x28000000); + AccessTokenID mapID = AccessTokenKit::GetRemoteNativeTokenID(g_udid, 0x28000000); ASSERT_EQ(mapID, (AccessTokenID)0); - mapID = AccessTokenKit::GetRemoteNativeTokenID(g_UDID, 0x28000001); + mapID = AccessTokenKit::GetRemoteNativeTokenID(g_udid, 0x28000001); ASSERT_EQ(mapID, (AccessTokenID)0); } @@ -621,10 +624,10 @@ HWTEST_F(TokenSyncServiceTest, SyncNativeTokens004, TestSize.Level1) sleep(6); - AccessTokenID mapID = AccessTokenKit::GetRemoteNativeTokenID(g_UDID, 0x28000000); + AccessTokenID mapID = AccessTokenKit::GetRemoteNativeTokenID(g_udid, 0x28000000); ASSERT_EQ(mapID, (AccessTokenID)0); - mapID = AccessTokenKit::GetRemoteNativeTokenID(g_UDID, 0x28000001); + mapID = AccessTokenKit::GetRemoteNativeTokenID(g_udid, 0x28000001); ASSERT_EQ(mapID, (AccessTokenID)0); } @@ -725,3 +728,6 @@ HapTokenInfoForSync g_remoteHapInfo = { .permStateList = {g_infoManagerTestUpdateState1, g_infoManagerTestUpdateState2} }; } +} // namespace AccessToken +} // namespace Security +} // namespace OHOS \ No newline at end of file diff --git a/tools/accesstoken/src/atm_command.cpp b/tools/accesstoken/src/atm_command.cpp index ac0690541..daaece643 100644 --- a/tools/accesstoken/src/atm_command.cpp +++ b/tools/accesstoken/src/atm_command.cpp @@ -279,7 +279,7 @@ ErrCode AtmCommand::RunAsCommandExistentOptionArgument( break; case 'i': if (optarg != nullptr) { - tokenId = std::atoi(optarg); + tokenId = static_cast(std::atoi(optarg)); } break; case 'p': -- Gitee From e56a09cea48507f8f2e96664489a5bf5bcac2749 Mon Sep 17 00:00:00 2001 From: chen Date: Thu, 22 Sep 2022 19:16:02 +0800 Subject: [PATCH 2/2] change Signed-off-by: chen --- .../src/sensitive/sensitive_resource_manager.cpp | 4 ++-- tools/accesstoken/src/atm_command.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/privacymanager/src/sensitive/sensitive_resource_manager.cpp b/services/privacymanager/src/sensitive/sensitive_resource_manager.cpp index 46aea1b19..5e7bce3dc 100644 --- a/services/privacymanager/src/sensitive/sensitive_resource_manager.cpp +++ b/services/privacymanager/src/sensitive/sensitive_resource_manager.cpp @@ -105,7 +105,7 @@ bool SensitiveResourceManager::GetAppStatus(const std::string& pkgName, int32_t& status = PERM_ACTIVE_IN_BACKGROUND; if (std::any_of(foreGroundAppList.begin(), foreGroundAppList.end(), [pkgName](const auto& foreGroundApp) { return foreGroundApp.bundleName == pkgName; })) { - status = PERM_ACTIVE_IN_FOREGROUND; + status = PERM_ACTIVE_IN_FOREGROUND; } return true; } @@ -210,4 +210,4 @@ bool SensitiveResourceManager::UnRegisterAppStatusChangeCallback(uint32_t tokenI } } // namespace AccessToken } // namespace Security -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/tools/accesstoken/src/atm_command.cpp b/tools/accesstoken/src/atm_command.cpp index daaece643..f217a8e85 100644 --- a/tools/accesstoken/src/atm_command.cpp +++ b/tools/accesstoken/src/atm_command.cpp @@ -279,7 +279,7 @@ ErrCode AtmCommand::RunAsCommandExistentOptionArgument( break; case 'i': if (optarg != nullptr) { - tokenId = static_cast(std::atoi(optarg)); + tokenId = static_cast(std::atoi(optarg)); } break; case 'p': -- Gitee