From 391d75bef493ef4fa6b0f76b39cf69242400c4b1 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 22:47:57 +0800 Subject: [PATCH 01/16] Signed-off-by: y1585740638 Change-Id: Ic90a5c96afdfcd8dbeaeabd6643d540a1ccfc4ab --- .../include/i_accesstoken_manager.h | 2 ++ .../accesstoken/include/accesstoken_kit.h | 1 + .../accesstoken/src/accesstoken_kit.cpp | 9 +++++ .../src/accesstoken_manager_client.cpp | 10 ++++++ .../src/accesstoken_manager_client.h | 1 + .../src/accesstoken_manager_proxy.cpp | 34 +++++++++++++++++++ .../src/accesstoken_manager_proxy.h | 3 +- .../unittest/src/accesstoken_kit_test.cpp | 30 ++++++++++++++++ .../service/accesstoken_manager_service.h | 1 + .../service/accesstoken_manager_stub.h | 3 +- .../include/token/accesstoken_info_manager.h | 1 + .../service/accesstoken_manager_service.cpp | 5 +++ .../src/service/accesstoken_manager_stub.cpp | 18 ++++++++++ .../src/token/accesstoken_info_manager.cpp | 11 ++++++ 14 files changed, 127 insertions(+), 2 deletions(-) diff --git a/frameworks/accesstoken/include/i_accesstoken_manager.h b/frameworks/accesstoken/include/i_accesstoken_manager.h index c06b98b6a..53609ef7b 100644 --- a/frameworks/accesstoken/include/i_accesstoken_manager.h +++ b/frameworks/accesstoken/include/i_accesstoken_manager.h @@ -67,6 +67,7 @@ public: const PermStateChangeScopeParcel& scope, const sptr& callback) = 0; virtual int32_t UnRegisterPermStateChangeCallback(const sptr& callback) = 0; virtual int32_t ReloadNativeTokenInfo() = 0; + virtual AccessTokenID GetNativeTokenId(const std::string& processName) = 0; #ifdef TOKEN_SYNC_ENABLE virtual int GetHapTokenInfoFromRemote(AccessTokenID tokenID, @@ -116,6 +117,7 @@ public: REGISTER_PERM_STATE_CHANGE_CALLBACK, UNREGISTER_PERM_STATE_CHANGE_CALLBACK, RELOAD_NATIVE_TOKEN_INFO, + GET_NATIVE_TOKEN_ID, }; }; } // namespace AccessToken diff --git a/interfaces/innerkits/accesstoken/include/accesstoken_kit.h b/interfaces/innerkits/accesstoken/include/accesstoken_kit.h index b5fef3e72..ff0632e34 100644 --- a/interfaces/innerkits/accesstoken/include/accesstoken_kit.h +++ b/interfaces/innerkits/accesstoken/include/accesstoken_kit.h @@ -63,6 +63,7 @@ public: static int32_t UnRegisterPermStateChangeCallback(const std::shared_ptr& callback); static int32_t GetHapDlpFlag(AccessTokenID tokenID); static int32_t ReloadNativeTokenInfo(); + static AccessTokenID GetNativeTokenId(const std::string& processName); #ifdef TOKEN_SYNC_ENABLE static int GetHapTokenInfoFromRemote(AccessTokenID tokenID, HapTokenInfoForSync& hapSync); diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp index f18c0837b..8f5e316f5 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp +++ b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp @@ -317,6 +317,15 @@ int32_t AccessTokenKit::ReloadNativeTokenInfo() return AccessTokenManagerClient::GetInstance().ReloadNativeTokenInfo(); } +AccessTokenID AccessTokenKit::GetNativeTokenId(const std::string& processName) +{ + if (!DataValidator::IsProcessNameValid(processName)) { + ACCESSTOKEN_LOG_ERROR(LABEL, "processName is invalid"); + return TOKEN_INVALID; + } + return AccessTokenManagerClient::GetInstance().GetNativeTokenId(processName); +} + #ifdef TOKEN_SYNC_ENABLE int AccessTokenKit::GetHapTokenInfoFromRemote(AccessTokenID tokenID, HapTokenInfoForSync& hapSync) { diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp index 5b4d29a63..4f7f2a950 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp +++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp @@ -370,6 +370,16 @@ int32_t AccessTokenManagerClient::ReloadNativeTokenInfo() return proxy->ReloadNativeTokenInfo(); } +AccessTokenID AccessTokenManagerClient::GetNativeTokenId(const std::string& processName) +{ + auto proxy = GetProxy(); + if (proxy == nullptr) { + ACCESSTOKEN_LOG_ERROR(LABEL, "proxy is null"); + return TOKEN_INVALID; + } + return proxy->GetNativeTokenId(processName); +} + #ifdef TOKEN_SYNC_ENABLE int AccessTokenManagerClient::GetHapTokenInfoFromRemote(AccessTokenID tokenID, HapTokenInfoForSync& hapSync) { diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h index 442d0c8b6..7d5a2d44f 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h +++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h @@ -64,6 +64,7 @@ public: int GetHapTokenInfo(AccessTokenID tokenID, HapTokenInfo& hapTokenInfoRes); int GetNativeTokenInfo(AccessTokenID tokenID, NativeTokenInfo& nativeTokenInfoRes); int32_t ReloadNativeTokenInfo(); + AccessTokenID GetNativeTokenId(const std::string& processName); int32_t RegisterPermStateChangeCallback( const std::shared_ptr& customizedCallback); int32_t UnRegisterPermStateChangeCallback( diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp index ab6abd857..d3941b412 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp +++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp @@ -768,6 +768,40 @@ int32_t AccessTokenManagerProxy::ReloadNativeTokenInfo() return result; } +AccessTokenID AccessTokenManagerProxy::GetNativeTokenId(const std::string& processName) +{ + MessageParcel data; + if (!data.WriteInterfaceToken(IAccessTokenManager::GetDescriptor())) { + ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write WriteInterfaceToken."); + return TOKEN_INVALID; + } + + if (!data.WriteString(processName)) { + ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write processName"); + return TOKEN_INVALID; + } + MessageParcel reply; + MessageOption option(MessageOption::TF_SYNC); + sptr remote = Remote(); + if (remote == nullptr) { + ACCESSTOKEN_LOG_ERROR(LABEL, "remote service null."); + return TOKEN_INVALID; + } + int32_t requestResult = remote->SendRequest( + static_cast(IAccessTokenManager::InterfaceCode::GET_NATIVE_TOKEN_ID), data, reply, option); + if (requestResult != NO_ERROR) { + ACCESSTOKEN_LOG_ERROR(LABEL, "request fail, result: %{public}d", requestResult); + return TOKEN_INVALID; + } + AccessTokenID result; + if (!reply.ReadInt32(result)) { + ACCESSTOKEN_LOG_INFO(LABEL, "readInt32 failed, result: %{public}d", result); + return TOKEN_INVALID; + } + ACCESSTOKEN_LOG_INFO(LABEL, "result from server data = %{public}d", result); + return result; +} + #ifdef TOKEN_SYNC_ENABLE int AccessTokenManagerProxy::GetHapTokenInfoFromRemote(AccessTokenID tokenID, HapTokenInfoForSyncParcel& hapSyncParcel) diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h index 55dc477fb..a5b53e08c 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h +++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h @@ -64,7 +64,8 @@ public: int32_t RegisterPermStateChangeCallback( const PermStateChangeScopeParcel& scope, const sptr& callback) override; int32_t UnRegisterPermStateChangeCallback(const sptr& callback) override; - + AccessTokenID GetNativeTokenId(const std::string& processName) override; + #ifdef TOKEN_SYNC_ENABLE int GetHapTokenInfoFromRemote(AccessTokenID tokenID, HapTokenInfoForSyncParcel& hapSyncParcel) override; int GetAllNativeTokenInfo(std::vector& nativeTokenInfoRes) override; diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp index 87e7c8a56..549418a8a 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp @@ -1341,6 +1341,36 @@ HWTEST_F(AccessTokenKitTest, ReloadNativeTokenInfo001, TestSize.Level1) ASSERT_EQ(RET_SUCCESS, ret); } +/** + * @tc.name: GetNativeTokenId001 + * @tc.desc: cannot get native tokenid with invalid processName. + * @tc.type: FUNC + * @tc.require:AR000GK6TH + */ +HWTEST_F(AccessTokenKitTest, GetNativeTokenId001, TestSize.Level1) +{ + std::string processName = "invalid processName"; + AccessTokenID tokenID = AccessTokenKit::GetNativeTokenId(processName); + ASSERT_EQ(0, tokenID); +} + +/** + * @tc.name: GetNativeTokenId002 + * @tc.desc: get native tokenid with processName. + * @tc.type: FUNC + * @tc.require:AR000GK6TH + */ +HWTEST_F(AccessTokenKitTest, GetNativeTokenId002, TestSize.Level1) +{ + std::string processName = "hdcd"; + AccessTokenID tokenID = AccessTokenKit::GetNativeTokenId(processName); + NativeTokenInfo tokenInfo; + int ret = AccessTokenKit::GetNativeTokenInfo(tokenID, tokenInfo); + ASSERT_EQ(RET_SUCCESS, ret); + + ASSERT_EQ(true, tokenInfo->GetProcessName() == processName); +} + /** * @tc.name: AllocHapToken001 * @tc.desc: alloc a tokenId successfully, delete it successfully the first time and fail to delte it again. 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 927cad747..939b6ecc7 100644 --- a/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h +++ b/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_service.h @@ -65,6 +65,7 @@ public: const PermStateChangeScopeParcel& scope, const sptr& callback) override; int32_t UnRegisterPermStateChangeCallback(const sptr& callback) override; int32_t ReloadNativeTokenInfo() override; + AccessTokenID GetNativeTokenId(const std::string& processName) override; #ifdef TOKEN_SYNC_ENABLE int GetHapTokenInfoFromRemote(AccessTokenID tokenID, HapTokenInfoForSyncParcel& hapSyncParcel) override; diff --git a/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_stub.h b/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_stub.h index 5ed1dfffc..6fb115250 100644 --- a/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_stub.h +++ b/services/accesstokenmanager/main/cpp/include/service/accesstoken_manager_stub.h @@ -56,7 +56,8 @@ private: void RegisterPermStateChangeCallbackInner(MessageParcel& data, MessageParcel& reply); void UnRegisterPermStateChangeCallbackInner(MessageParcel& data, MessageParcel& reply); void ReloadNativeTokenInfoInner(MessageParcel& data, MessageParcel& reply); - + void GetNativeTokenIdInner(MessageParcel& data, MessageParcel& reply); + #ifdef TOKEN_SYNC_ENABLE void GetHapTokenInfoFromRemoteInner(MessageParcel& data, MessageParcel& reply); void GetAllNativeTokenInfoInner(MessageParcel& data, MessageParcel& reply); 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 e48ec35a5..3ce822d82 100644 --- a/services/accesstokenmanager/main/cpp/include/token/accesstoken_info_manager.h +++ b/services/accesstokenmanager/main/cpp/include/token/accesstoken_info_manager.h @@ -58,6 +58,7 @@ public: void DumpTokenInfo(AccessTokenID tokenID, std::string& dumpInfo); void RefreshTokenInfoIfNeeded(); bool IsTokenIdExist(AccessTokenID id); + AccessTokenID GetNativeTokenId(const std::string& processName); #ifdef TOKEN_SYNC_ENABLE /* tokensync needed */ 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 192c9de55..f51a99ec3 100644 --- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp +++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp @@ -327,6 +327,11 @@ int32_t AccessTokenManagerService::ReloadNativeTokenInfo() return NativeTokenReceptor::GetInstance().Init(); } +AccessTokenID AccessTokenManagerService::GetNativeTokenId(const std::string& processName) +{ + return AccessTokenInfoManager::GetInstance().GetNativeTokenId(processName); +} + #ifdef TOKEN_SYNC_ENABLE int AccessTokenManagerService::GetHapTokenInfoFromRemote(AccessTokenID tokenID, HapTokenInfoForSyncParcel& hapSyncParcel) diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp index c86358030..125cfcc19 100644 --- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp +++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp @@ -371,6 +371,22 @@ void AccessTokenManagerStub::ReloadNativeTokenInfoInner(MessageParcel& data, Mes reply.WriteInt32(result); } +void AccessTokenManagerStub::GetNativeTokenIdInner(MessageParcel& data, MessageParcel& reply) +{ + if (!IsNativeProcessCalling()) { + ACCESSTOKEN_LOG_ERROR(LABEL, "%{public}s called, permission denied", __func__); + reply.WriteInt32(RET_FAILED); + return; + } + std::string processName; + if (!data.ReadString(processName)) { + ACCESSTOKEN_LOG_ERROR(LABEL, "readString fail, processName=%{public}s", processName.c_str()); + return; + } + AccessTokenID result = this->GetNativeTokenId(processName); + reply.WriteInt32(result); +} + #ifdef TOKEN_SYNC_ENABLE void AccessTokenManagerStub::GetHapTokenInfoFromRemoteInner(MessageParcel& data, MessageParcel& reply) { @@ -568,6 +584,8 @@ AccessTokenManagerStub::AccessTokenManagerStub() &AccessTokenManagerStub::UpdateHapTokenInner; requestFuncMap_[static_cast(IAccessTokenManager::InterfaceCode::RELOAD_NATIVE_TOKEN_INFO)] = &AccessTokenManagerStub::ReloadNativeTokenInfoInner; + requestFuncMap_[static_cast(IAccessTokenManager::InterfaceCode::GET_NATIVE_TOKEN_ID)] = + &AccessTokenManagerStub::GetNativeTokenIdInner; #ifdef TOKEN_SYNC_ENABLE requestFuncMap_[static_cast(IAccessTokenManager::InterfaceCode::GET_HAP_TOKEN_FROM_REMOTE)] = &AccessTokenManagerStub::GetHapTokenInfoFromRemoteInner; 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 6ead35427..7b4337fc6 100644 --- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp @@ -1007,6 +1007,17 @@ void AccessTokenInfoManager::RefreshTokenInfoIfNeeded() }); } +AccessTokenID AccessTokenInfoManager::GetNativeTokenId(const std::string& processName) +{ + AccessTokenID tokenID = TOKEN_INVALID; + for (auto iter = nativeTokenInfoMap_.begin(); iter != nativeTokenInfoMap_.end(); iter++) { + if (iter->second != nullptr && iter->second->GetProcessName() == processName) { + tokenID = iter->first; + } + } + return tokenID; +} + void AccessTokenInfoManager::DumpTokenInfo(AccessTokenID tokenID, std::string& dumpInfo) { ACCESSTOKEN_LOG_INFO(LABEL, "get hapTokenInfo"); -- Gitee From 09dd567d013675e67e747ce00cd56cc97fba6b94 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 15:14:47 +0000 Subject: [PATCH 02/16] update interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp. Signed-off-by: y1585740638 --- .../innerkits/accesstoken/src/accesstoken_manager_proxy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp index d3941b412..a32341828 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp +++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp @@ -794,7 +794,7 @@ AccessTokenID AccessTokenManagerProxy::GetNativeTokenId(const std::string& proce return TOKEN_INVALID; } AccessTokenID result; - if (!reply.ReadInt32(result)) { + if (!reply.ReadUint32(result)) { ACCESSTOKEN_LOG_INFO(LABEL, "readInt32 failed, result: %{public}d", result); return TOKEN_INVALID; } -- Gitee From df5165378f0d31a2196d5b63d821b218139f6a72 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 15:15:53 +0000 Subject: [PATCH 03/16] update services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp. Signed-off-by: y1585740638 --- .../main/cpp/src/service/accesstoken_manager_stub.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp index 125cfcc19..129eb8f42 100644 --- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp +++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp @@ -505,7 +505,7 @@ void AccessTokenManagerStub::DeleteRemoteDeviceTokensInner(MessageParcel& data, std::string deviceID = data.ReadString(); int result = this->DeleteRemoteDeviceTokens(deviceID); - reply.WriteInt32(result); + reply.WriteUint32(result); } #endif -- Gitee From 8c7d9046a6645e3f8d9ede5d1e0c62c0383e0500 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 15:35:40 +0000 Subject: [PATCH 04/16] update interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp. Signed-off-by: y1585740638 --- .../accesstoken/test/unittest/src/accesstoken_kit_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp index 549418a8a..1f6845408 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp @@ -1368,7 +1368,7 @@ HWTEST_F(AccessTokenKitTest, GetNativeTokenId002, TestSize.Level1) int ret = AccessTokenKit::GetNativeTokenInfo(tokenID, tokenInfo); ASSERT_EQ(RET_SUCCESS, ret); - ASSERT_EQ(true, tokenInfo->GetProcessName() == processName); + ASSERT_EQ(true, tokenInfo.GetProcessName() == processName); } /** -- Gitee From 37befb6b5c83f65c8c6f26c8bcf622b359680d42 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 16:00:20 +0000 Subject: [PATCH 05/16] update interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp. Signed-off-by: y1585740638 --- .../accesstoken/test/unittest/src/accesstoken_kit_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp index 1f6845408..319972a86 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp @@ -1368,7 +1368,7 @@ HWTEST_F(AccessTokenKitTest, GetNativeTokenId002, TestSize.Level1) int ret = AccessTokenKit::GetNativeTokenInfo(tokenID, tokenInfo); ASSERT_EQ(RET_SUCCESS, ret); - ASSERT_EQ(true, tokenInfo.GetProcessName() == processName); + ASSERT_EQ(true, tokenInfo.processName == processName); } /** -- Gitee From 0f4131972900e1be865c241fc8d3baa2bbb3a6ac Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Thu, 8 Sep 2022 16:06:39 +0000 Subject: [PATCH 06/16] update interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp. Signed-off-by: y1585740638 --- .../accesstoken/test/unittest/src/accesstoken_kit_test.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp index 319972a86..9dde54515 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp @@ -1367,7 +1367,6 @@ HWTEST_F(AccessTokenKitTest, GetNativeTokenId002, TestSize.Level1) NativeTokenInfo tokenInfo; int ret = AccessTokenKit::GetNativeTokenInfo(tokenID, tokenInfo); ASSERT_EQ(RET_SUCCESS, ret); - ASSERT_EQ(true, tokenInfo.processName == processName); } -- Gitee From cfce23574e5512e91b910db281256b25d3214254 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Fri, 9 Sep 2022 04:47:53 +0000 Subject: [PATCH 07/16] update interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp. Signed-off-by: y1585740638 --- .../accesstoken/test/unittest/src/accesstoken_kit_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp index 9dde54515..82e2118c9 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp @@ -500,7 +500,7 @@ HWTEST_F(AccessTokenKitTest, GetDefPermission003, TestSize.Level0) HWTEST_F(AccessTokenKitTest, GetDefPermissions001, TestSize.Level1) { AccessTokenID tokenID = GetAccessTokenID(TEST_USER_ID, TEST_BUNDLE_NAME, 0); - ASSERT_NE(0, tokenID); + ASSERT_NE(TOKEN_INVALID, tokenID); std::vector permDefList; int ret = AccessTokenKit::GetDefPermissions(tokenID, permDefList); ASSERT_EQ(RET_SUCCESS, ret); -- Gitee From 05ed56940430d62df2aafc3a22881f700480b893 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Fri, 9 Sep 2022 04:55:05 +0000 Subject: [PATCH 08/16] update interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp. Signed-off-by: y1585740638 --- interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp index 8f5e316f5..6736123e1 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp +++ b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp @@ -321,7 +321,7 @@ AccessTokenID AccessTokenKit::GetNativeTokenId(const std::string& processName) { if (!DataValidator::IsProcessNameValid(processName)) { ACCESSTOKEN_LOG_ERROR(LABEL, "processName is invalid"); - return TOKEN_INVALID; + return INVALID_TOKENID; } return AccessTokenManagerClient::GetInstance().GetNativeTokenId(processName); } -- Gitee From 5a9a1e5247f08541b5aeb9736c78de99d072a91b Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Fri, 9 Sep 2022 05:01:34 +0000 Subject: [PATCH 09/16] update interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp. Signed-off-by: y1585740638 --- .../innerkits/accesstoken/src/accesstoken_manager_client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp index 4f7f2a950..4b2bbb3e4 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp +++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp @@ -375,7 +375,7 @@ AccessTokenID AccessTokenManagerClient::GetNativeTokenId(const std::string& proc auto proxy = GetProxy(); if (proxy == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "proxy is null"); - return TOKEN_INVALID; + return INVALID_TOKENID; } return proxy->GetNativeTokenId(processName); } -- Gitee From cd7e15a8f5443799aa3128f1e04d5d8195653885 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Fri, 9 Sep 2022 05:02:22 +0000 Subject: [PATCH 10/16] update interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp. Signed-off-by: y1585740638 --- .../accesstoken/src/accesstoken_manager_proxy.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp index a32341828..2ae0493b6 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp +++ b/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp @@ -773,30 +773,30 @@ AccessTokenID AccessTokenManagerProxy::GetNativeTokenId(const std::string& proce MessageParcel data; if (!data.WriteInterfaceToken(IAccessTokenManager::GetDescriptor())) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write WriteInterfaceToken."); - return TOKEN_INVALID; + return INVALID_TOKENID; } if (!data.WriteString(processName)) { ACCESSTOKEN_LOG_ERROR(LABEL, "Failed to write processName"); - return TOKEN_INVALID; + return INVALID_TOKENID; } MessageParcel reply; MessageOption option(MessageOption::TF_SYNC); sptr remote = Remote(); if (remote == nullptr) { ACCESSTOKEN_LOG_ERROR(LABEL, "remote service null."); - return TOKEN_INVALID; + return INVALID_TOKENID; } int32_t requestResult = remote->SendRequest( static_cast(IAccessTokenManager::InterfaceCode::GET_NATIVE_TOKEN_ID), data, reply, option); if (requestResult != NO_ERROR) { ACCESSTOKEN_LOG_ERROR(LABEL, "request fail, result: %{public}d", requestResult); - return TOKEN_INVALID; + return INVALID_TOKENID; } AccessTokenID result; if (!reply.ReadUint32(result)) { ACCESSTOKEN_LOG_INFO(LABEL, "readInt32 failed, result: %{public}d", result); - return TOKEN_INVALID; + return INVALID_TOKENID; } ACCESSTOKEN_LOG_INFO(LABEL, "result from server data = %{public}d", result); return result; -- Gitee From 2e4bd6ad3d496e531c56e8b8f960d16b664d9108 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Fri, 9 Sep 2022 05:02:43 +0000 Subject: [PATCH 11/16] update services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp. Signed-off-by: y1585740638 --- .../main/cpp/src/token/accesstoken_info_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7b4337fc6..9a4c9bb54 100644 --- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp @@ -1009,7 +1009,7 @@ void AccessTokenInfoManager::RefreshTokenInfoIfNeeded() AccessTokenID AccessTokenInfoManager::GetNativeTokenId(const std::string& processName) { - AccessTokenID tokenID = TOKEN_INVALID; + AccessTokenID tokenID = INVALID_TOKENID; for (auto iter = nativeTokenInfoMap_.begin(); iter != nativeTokenInfoMap_.end(); iter++) { if (iter->second != nullptr && iter->second->GetProcessName() == processName) { tokenID = iter->first; -- Gitee From c22295c472a061d1bea3196e2985241850c6b595 Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Fri, 9 Sep 2022 05:04:22 +0000 Subject: [PATCH 12/16] update interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp. Signed-off-by: y1585740638 --- .../accesstoken/test/unittest/src/accesstoken_kit_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp index 82e2118c9..9dde54515 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp @@ -500,7 +500,7 @@ HWTEST_F(AccessTokenKitTest, GetDefPermission003, TestSize.Level0) HWTEST_F(AccessTokenKitTest, GetDefPermissions001, TestSize.Level1) { AccessTokenID tokenID = GetAccessTokenID(TEST_USER_ID, TEST_BUNDLE_NAME, 0); - ASSERT_NE(TOKEN_INVALID, tokenID); + ASSERT_NE(0, tokenID); std::vector permDefList; int ret = AccessTokenKit::GetDefPermissions(tokenID, permDefList); ASSERT_EQ(RET_SUCCESS, ret); -- Gitee From 8a2751c6752f59f3b7812200d17ab911a5c0548c Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Fri, 9 Sep 2022 11:35:44 +0000 Subject: [PATCH 13/16] update services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp. Signed-off-by: y1585740638 --- .../main/cpp/src/service/accesstoken_manager_stub.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp index 129eb8f42..3ca442245 100644 --- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp +++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp @@ -375,7 +375,7 @@ void AccessTokenManagerStub::GetNativeTokenIdInner(MessageParcel& data, MessageP { if (!IsNativeProcessCalling()) { ACCESSTOKEN_LOG_ERROR(LABEL, "%{public}s called, permission denied", __func__); - reply.WriteInt32(RET_FAILED); + reply.WriteInt32(INVALID_TOKENID); return; } std::string processName; -- Gitee From 83b2ddf3864e8a31fbf07ad8e4b627b4fb5b349a Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Fri, 9 Sep 2022 11:36:49 +0000 Subject: [PATCH 14/16] update interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp. Signed-off-by: y1585740638 --- .../accesstoken/test/unittest/src/accesstoken_kit_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp index 9dde54515..7882c871f 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp @@ -1365,7 +1365,7 @@ HWTEST_F(AccessTokenKitTest, GetNativeTokenId002, TestSize.Level1) std::string processName = "hdcd"; AccessTokenID tokenID = AccessTokenKit::GetNativeTokenId(processName); NativeTokenInfo tokenInfo; - int ret = AccessTokenKit::GetNativeTokenInfo(tokenID, tokenInfo); + AccessTokenID ret = AccessTokenKit::GetNativeTokenInfo(tokenID, tokenInfo); ASSERT_EQ(RET_SUCCESS, ret); ASSERT_EQ(true, tokenInfo.processName == processName); } -- Gitee From 81cdbd186fbd6c7d9eddc206500b2b8b6e236fdc Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Fri, 9 Sep 2022 12:59:30 +0000 Subject: [PATCH 15/16] update services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp. Signed-off-by: y1585740638 --- .../main/cpp/src/service/accesstoken_manager_stub.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp index 3ca442245..a678b5782 100644 --- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp +++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_stub.cpp @@ -375,7 +375,7 @@ void AccessTokenManagerStub::GetNativeTokenIdInner(MessageParcel& data, MessageP { if (!IsNativeProcessCalling()) { ACCESSTOKEN_LOG_ERROR(LABEL, "%{public}s called, permission denied", __func__); - reply.WriteInt32(INVALID_TOKENID); + reply.WriteUint32(INVALID_TOKENID); return; } std::string processName; @@ -384,7 +384,7 @@ void AccessTokenManagerStub::GetNativeTokenIdInner(MessageParcel& data, MessageP return; } AccessTokenID result = this->GetNativeTokenId(processName); - reply.WriteInt32(result); + reply.WriteUint32(result); } #ifdef TOKEN_SYNC_ENABLE @@ -505,7 +505,7 @@ void AccessTokenManagerStub::DeleteRemoteDeviceTokensInner(MessageParcel& data, std::string deviceID = data.ReadString(); int result = this->DeleteRemoteDeviceTokens(deviceID); - reply.WriteUint32(result); + reply.WriteInt32(result); } #endif -- Gitee From 2997aa6dba58b3008c28de9d16a655da9e7f731e Mon Sep 17 00:00:00 2001 From: y1585740638 Date: Fri, 9 Sep 2022 13:26:58 +0000 Subject: [PATCH 16/16] update services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp. Signed-off-by: y1585740638 --- .../main/cpp/src/token/accesstoken_info_manager.cpp | 1 + 1 file changed, 1 insertion(+) 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 9a4c9bb54..bc11ee317 100644 --- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_info_manager.cpp @@ -1013,6 +1013,7 @@ AccessTokenID AccessTokenInfoManager::GetNativeTokenId(const std::string& proces for (auto iter = nativeTokenInfoMap_.begin(); iter != nativeTokenInfoMap_.end(); iter++) { if (iter->second != nullptr && iter->second->GetProcessName() == processName) { tokenID = iter->first; + break; } } return tokenID; -- Gitee