From ab1262af1495190b59112cada5dc7439fb7e4ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Tue, 15 Jul 2025 21:40:27 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E5=8C=BF=E5=90=8D=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- .../src/dependency/hichain/hichain_auth_connector.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp b/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp index 6f0f8a763..b1f2fd031 100644 --- a/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp +++ b/services/implementation/src/dependency/hichain/hichain_auth_connector.cpp @@ -503,8 +503,8 @@ int32_t HiChainAuthConnector::GetCredential(std::string &localUdid, int32_t osAc int32_t HiChainAuthConnector::ImportCredential(int32_t osAccountId, int32_t peerOsAccountId, std::string deviceId, std::string publicKey) { - LOGI("start, deviceId: %{public}s, peerOsAccountId: %{public}d", - GetAnonyString(deviceId).c_str(), peerOsAccountId); + LOGI("start, deviceId: %{public}s, peerOsAccountId: %{public}s", + GetAnonyString(deviceId).c_str(), GetAnonyInt32(peerOsAccountId).c_str()); JsonObject jsonObj; jsonObj["osAccountId"] = osAccountId; jsonObj["peerOsAccountId"] = peerOsAccountId; -- Gitee From 600260e8383b9aa5f529fcfa74d571ca5674f773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Wed, 16 Jul 2025 10:53:37 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- .../permission/standard/permission_manager.h | 3 + .../standard/permission_manager.cpp | 63 +++++++------------ test/unittest/UTTest_dm_import_auth_code.cpp | 2 +- 3 files changed, 25 insertions(+), 43 deletions(-) diff --git a/services/service/include/permission/standard/permission_manager.h b/services/service/include/permission/standard/permission_manager.h index ca52cd987..4b6d14c0d 100644 --- a/services/service/include/permission/standard/permission_manager.h +++ b/services/service/include/permission/standard/permission_manager.h @@ -39,6 +39,9 @@ public: bool CheckProcessNameValidModifyLocalDeviceName(const std::string &processName); bool CheckProcessNameValidModifyRemoteDeviceName(const std::string &processName); bool CheckProcessNameValidPutDeviceProfileInfoList(const std::string &processName); + +private: + bool VerifyAccessTokenByPermissionName(const std::string& permissionName); }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/service/src/permission/standard/permission_manager.cpp b/services/service/src/permission/standard/permission_manager.cpp index 2934aa391..581d35975 100644 --- a/services/service/src/permission/standard/permission_manager.cpp +++ b/services/service/src/permission/standard/permission_manager.cpp @@ -97,56 +97,17 @@ constexpr int32_t PUT_DEVICE_PROFILE_INFO_LIST_WHITE_LIST_NUM = std::size(PUT_DE bool PermissionManager::CheckPermission(void) { - AccessTokenID tokenCaller = IPCSkeleton::GetCallingTokenID(); - if (tokenCaller == 0) { - LOGE("CheckPermission GetCallingTokenID error."); - return false; - } - ATokenTypeEnum tokenTypeFlag = AccessTokenKit::GetTokenTypeFlag(tokenCaller); - if (tokenTypeFlag == ATokenTypeEnum::TOKEN_HAP || tokenTypeFlag == ATokenTypeEnum::TOKEN_NATIVE) { - if (AccessTokenKit::VerifyAccessToken(tokenCaller, DM_SERVICE_ACCESS_PERMISSION) != - PermissionState::PERMISSION_GRANTED) { - LOGE("DM service access is denied, please apply for corresponding permissions"); - return false; - } - } - return true; + return VerifyAccessTokenByPermissionName(DM_SERVICE_ACCESS_PERMISSION); } bool PermissionManager::CheckNewPermission(void) { - AccessTokenID tokenCaller = IPCSkeleton::GetCallingTokenID(); - if (tokenCaller == 0) { - LOGE("CheckNewPermission GetCallingTokenID error."); - return false; - } - ATokenTypeEnum tokenTypeFlag = AccessTokenKit::GetTokenTypeFlag(tokenCaller); - if (tokenTypeFlag == ATokenTypeEnum::TOKEN_HAP || tokenTypeFlag == ATokenTypeEnum::TOKEN_NATIVE) { - if (AccessTokenKit::VerifyAccessToken(tokenCaller, DM_SERVICE_ACCESS_NEWPERMISSION) != - PermissionState::PERMISSION_GRANTED) { - LOGE("DM service access is denied, please apply for corresponding new permissions"); - return false; - } - } - return true; + return VerifyAccessTokenByPermissionName(DM_SERVICE_ACCESS_NEWPERMISSION); } bool PermissionManager::CheckMonitorPermission(void) { - AccessTokenID tokenCaller = IPCSkeleton::GetCallingTokenID(); - if (tokenCaller == 0) { - LOGE("CheckMonitorPermission GetCallingTokenID error."); - return false; - } - ATokenTypeEnum tokenTypeFlag = AccessTokenKit::GetTokenTypeFlag(tokenCaller); - if (tokenTypeFlag == ATokenTypeEnum::TOKEN_NATIVE) { - if (AccessTokenKit::VerifyAccessToken(tokenCaller, DM_MONITOR_DEVICE_NETWORK_STATE_PERMISSION) != - PermissionState::PERMISSION_GRANTED) { - LOGE("DM service access is denied, please apply for corresponding permissions."); - return false; - } - } - return true; + return VerifyAccessTokenByPermissionName(DM_MONITOR_DEVICE_NETWORK_STATE_PERMISSION); } int32_t PermissionManager::GetCallerProcessName(std::string &processName) @@ -333,5 +294,23 @@ bool PermissionManager::CheckProcessNameValidPutDeviceProfileInfoList(const std: } return false; } + +bool PermissionManager::VerifyAccessTokenByPermissionName(const std::string& permissionName) +{ + AccessTokenID tokenCaller = IPCSkeleton::GetCallingTokenID(); + if (tokenCaller == 0) { + LOGE("GetCallingTokenID error."); + return false; + } + ATokenTypeEnum tokenTypeFlag = AccessTokenKit::GetTokenTypeFlag(tokenCaller); + if (tokenTypeFlag == ATokenTypeEnum::TOKEN_HAP || tokenTypeFlag == ATokenTypeEnum::TOKEN_NATIVE) { + if (AccessTokenKit::VerifyAccessToken(tokenCaller, permissionName) == + PermissionState::PERMISSION_GRANTED) { + return true; + } + } + LOGE("DM service access is denied, please apply for corresponding permissions"); + return false; +} } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/UTTest_dm_import_auth_code.cpp b/test/unittest/UTTest_dm_import_auth_code.cpp index b0f46a1d8..c7ad2bb7c 100644 --- a/test/unittest/UTTest_dm_import_auth_code.cpp +++ b/test/unittest/UTTest_dm_import_auth_code.cpp @@ -44,7 +44,7 @@ void DMImportAuthCodeTest::SetUp() .dcaps = NULL, .perms = perms, .acls = NULL, - .processName = "com.huawei.msdp.hmringgenerator", + .processName = "CollaborationFwk", .aplStr = "system_core", }; tokenId = GetAccessTokenId(&infoInstance); -- Gitee From 2de8183b5d0fd9e124946bcccb15bdbcdb4c5a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Wed, 16 Jul 2025 17:10:44 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9ut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- .../UTTest_permission_manager.cpp | 8 +++--- .../UTTest_ipc_cmd_parser_service.cpp | 24 ++++++++++++++++++ test/unittest/UTTest_mini_tools_kit.cpp | 25 ++++++++++++++++++- 3 files changed, 53 insertions(+), 4 deletions(-) diff --git a/test/commonunittest/UTTest_permission_manager.cpp b/test/commonunittest/UTTest_permission_manager.cpp index 3d1e18fad..e18c37378 100644 --- a/test/commonunittest/UTTest_permission_manager.cpp +++ b/test/commonunittest/UTTest_permission_manager.cpp @@ -25,13 +25,15 @@ namespace OHOS { namespace DistributedHardware { void PermissionManagerTest::SetUp() { - const int32_t permsNum = 2; + const int32_t permsNum = 3; const int32_t indexZero = 0; const int32_t indexOne = 1; + const int32_t indexTwo = 2; uint64_t tokenId; const char *perms[permsNum]; perms[indexZero] = "ohos.permission.ACCESS_SERVICE_DM"; perms[indexOne] = "ohos.permission.DISTRIBUTED_DATASYNC"; + perms[indexTwo] = "ohos.permission.MONITOR_DEVICE_NETWORK_STATE"; NativeTokenInfoParams infoInstance = { .dcapsNum = 0, .permsNum = permsNum, @@ -91,7 +93,7 @@ HWTEST_F(PermissionManagerTest, CheckPermission_001, testing::ext::TestSize.Leve EXPECT_CALL(*ipcSkeletonMock_, GetCallingTokenID()).WillOnce(Return(10)); EXPECT_CALL(*accessTokenKitMock_, GetTokenTypeFlag(_)).WillOnce(Return(ATokenTypeEnum::TOKEN_TYPE_BUTT)); ret = PermissionManager::GetInstance().CheckPermission(); - ASSERT_TRUE(ret); + ASSERT_FALSE(ret); EXPECT_CALL(*ipcSkeletonMock_, GetCallingTokenID()).WillOnce(Return(10)); EXPECT_CALL(*accessTokenKitMock_, GetTokenTypeFlag(_)).WillOnce(Return(ATokenTypeEnum::TOKEN_HAP)); @@ -169,7 +171,7 @@ HWTEST_F(PermissionManagerTest, CheckMonitorPermission_001, testing::ext::TestSi EXPECT_CALL(*ipcSkeletonMock_, GetCallingTokenID()).WillOnce(Return(1001)); EXPECT_CALL(*accessTokenKitMock_, GetTokenTypeFlag(_)).WillOnce(Return(ATokenTypeEnum::TOKEN_TYPE_BUTT)); ret = PermissionManager::GetInstance().CheckMonitorPermission(); - ASSERT_TRUE(ret); + ASSERT_FALSE(ret); EXPECT_CALL(*ipcSkeletonMock_, GetCallingTokenID()).WillOnce(Return(1001)); EXPECT_CALL(*accessTokenKitMock_, GetTokenTypeFlag(_)).WillOnce(Return(ATokenTypeEnum::TOKEN_NATIVE)); diff --git a/test/unittest/UTTest_ipc_cmd_parser_service.cpp b/test/unittest/UTTest_ipc_cmd_parser_service.cpp index bdc61c11e..b5d0f7288 100644 --- a/test/unittest/UTTest_ipc_cmd_parser_service.cpp +++ b/test/unittest/UTTest_ipc_cmd_parser_service.cpp @@ -56,6 +56,30 @@ namespace OHOS { namespace DistributedHardware { void IpcCmdParserServiceTest::SetUp() { + const int32_t permsNum = 4; + const int32_t indexZero = 0; + const int32_t indexOne = 1; + const int32_t indexTwo = 2; + const int32_t indexThree = 3; + uint64_t tokenId; + const char *perms[permsNum]; + perms[indexZero] = "ohos.permission.DISTRIBUTED_SOFTBUS_CENTER"; + perms[indexOne] = "ohos.permission.DISTRIBUTED_DATASYNC"; + perms[indexTwo] = "ohos.permission.ACCESS_SERVICE_DM"; + perms[indexThree] = "ohos.permission.MONITOR_DEVICE_NETWORK_STATE"; + NativeTokenInfoParams infoInstance = { + .dcapsNum = 0, + .permsNum = permsNum, + .aclsNum = 0, + .dcaps = NULL, + .perms = perms, + .acls = NULL, + .processName = "dsoftbus_service", + .aplStr = "system_core", + }; + tokenId = GetAccessTokenId(&infoInstance); + SetSelfTokenID(tokenId); + OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); } void IpcCmdParserServiceTest::TearDown() diff --git a/test/unittest/UTTest_mini_tools_kit.cpp b/test/unittest/UTTest_mini_tools_kit.cpp index 0254139d2..0d2209459 100644 --- a/test/unittest/UTTest_mini_tools_kit.cpp +++ b/test/unittest/UTTest_mini_tools_kit.cpp @@ -24,7 +24,30 @@ namespace { const std::string TEST_SERVICE_NAME = "test_service_name"; } // namespace void MiniToolsKitTest::SetUp() -{} +{ + const int32_t permsNum = 3; + const int32_t indexZero = 0; + const int32_t indexOne = 1; + const int32_t indexTwo = 2; + uint64_t tokenId; + const char *perms[permsNum]; + perms[indexZero] = "ohos.permission.ACCESS_SERVICE_DM"; + perms[indexOne] = "ohos.permission.DISTRIBUTED_DATASYNC"; + perms[indexTwo] = "ohos.permission.MONITOR_DEVICE_NETWORK_STATE"; + NativeTokenInfoParams infoInstance = { + .dcapsNum = 0, + .permsNum = permsNum, + .aclsNum = 0, + .dcaps = NULL, + .perms = perms, + .acls = NULL, + .processName = "dsoftbus_service", + .aplStr = "system_core", + }; + tokenId = GetAccessTokenId(&infoInstance); + SetSelfTokenID(tokenId); + OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); +} void MiniToolsKitTest::TearDown() {} -- Gitee From 60b3e924994814e613d06708c8896eef1eb92d09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Wed, 16 Jul 2025 17:39:58 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9ut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- test/commonunittest/UTTest_permission_manager.cpp | 4 +--- test/unittest/UTTest_ipc_cmd_parser_service.cpp | 8 +++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/test/commonunittest/UTTest_permission_manager.cpp b/test/commonunittest/UTTest_permission_manager.cpp index e18c37378..1cb44f5f9 100644 --- a/test/commonunittest/UTTest_permission_manager.cpp +++ b/test/commonunittest/UTTest_permission_manager.cpp @@ -25,15 +25,13 @@ namespace OHOS { namespace DistributedHardware { void PermissionManagerTest::SetUp() { - const int32_t permsNum = 3; + const int32_t permsNum = 2; const int32_t indexZero = 0; const int32_t indexOne = 1; - const int32_t indexTwo = 2; uint64_t tokenId; const char *perms[permsNum]; perms[indexZero] = "ohos.permission.ACCESS_SERVICE_DM"; perms[indexOne] = "ohos.permission.DISTRIBUTED_DATASYNC"; - perms[indexTwo] = "ohos.permission.MONITOR_DEVICE_NETWORK_STATE"; NativeTokenInfoParams infoInstance = { .dcapsNum = 0, .permsNum = permsNum, diff --git a/test/unittest/UTTest_ipc_cmd_parser_service.cpp b/test/unittest/UTTest_ipc_cmd_parser_service.cpp index b5d0f7288..67de459bb 100644 --- a/test/unittest/UTTest_ipc_cmd_parser_service.cpp +++ b/test/unittest/UTTest_ipc_cmd_parser_service.cpp @@ -56,17 +56,15 @@ namespace OHOS { namespace DistributedHardware { void IpcCmdParserServiceTest::SetUp() { - const int32_t permsNum = 4; + const int32_t permsNum = 3; const int32_t indexZero = 0; const int32_t indexOne = 1; const int32_t indexTwo = 2; - const int32_t indexThree = 3; uint64_t tokenId; const char *perms[permsNum]; - perms[indexZero] = "ohos.permission.DISTRIBUTED_SOFTBUS_CENTER"; + perms[indexZero] = "ohos.permission.ACCESS_SERVICE_DM"; perms[indexOne] = "ohos.permission.DISTRIBUTED_DATASYNC"; - perms[indexTwo] = "ohos.permission.ACCESS_SERVICE_DM"; - perms[indexThree] = "ohos.permission.MONITOR_DEVICE_NETWORK_STATE"; + perms[indexTwo] = "ohos.permission.MONITOR_DEVICE_NETWORK_STATE"; NativeTokenInfoParams infoInstance = { .dcapsNum = 0, .permsNum = permsNum, -- Gitee From 165924cb5534a367c1425cc086c9b5515d0d3ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Wed, 16 Jul 2025 18:45:31 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- test/unittest/BUILD.gn | 6 ++++++ test/unittest/UTTest_ipc_cmd_parser_service.cpp | 4 ++++ test/unittest/UTTest_mini_tools_kit.cpp | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 03fde27c6..43cea0b5f 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -209,6 +209,9 @@ ohos_unittest("UTTest_ipc_cmd_parser_service") { deps = [ ":device_manager_test_common" ] external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", "cJSON:cjson", "data_share:datashare_common", "data_share:datashare_consumer", @@ -2089,6 +2092,9 @@ ohos_unittest("UTTest_mini_tools_kit") { deps = [ ":device_manager_test_common" ] external_deps = [ + "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", "ffrt:libffrt", "googletest:gmock", "googletest:gmock_main", diff --git a/test/unittest/UTTest_ipc_cmd_parser_service.cpp b/test/unittest/UTTest_ipc_cmd_parser_service.cpp index 67de459bb..2c172b875 100644 --- a/test/unittest/UTTest_ipc_cmd_parser_service.cpp +++ b/test/unittest/UTTest_ipc_cmd_parser_service.cpp @@ -17,11 +17,14 @@ #include +#include "accesstoken_kit.h" +#include "access_token.h" #include "device_manager_ipc_interface_code.h" #include "device_manager_notify.h" #include "dm_anonymous.h" #include "dm_constants.h" #include "dm_device_info.h" +#include "nativetoken_kit.h" #include "ipc_client_manager.h" #include "ipc_cmd_register.h" #include "ipc_common_param_req.h" @@ -51,6 +54,7 @@ #include "ipc_unauthenticate_device_req.h" #include "ipc_unpublish_req.h" #include "json_object.h" +#include "token_setproc.h" namespace OHOS { namespace DistributedHardware { diff --git a/test/unittest/UTTest_mini_tools_kit.cpp b/test/unittest/UTTest_mini_tools_kit.cpp index 0d2209459..49a712dd0 100644 --- a/test/unittest/UTTest_mini_tools_kit.cpp +++ b/test/unittest/UTTest_mini_tools_kit.cpp @@ -14,7 +14,12 @@ */ #include "UTTest_mini_tools_kit.h" +#include "accesstoken_kit.h" +#include "access_token.h" #include "dm_constants.h" +#include "nativetoken_kit.h" +#include "token_setproc.h" + namespace OHOS { namespace DistributedHardware { -- Gitee From 11ef3d93be75e93ed52e3b7c978ffbd64317aff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Wed, 16 Jul 2025 18:58:31 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- test/unittest/UTTest_ipc_cmd_parser_service.cpp | 1 - test/unittest/UTTest_mini_tools_kit.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/test/unittest/UTTest_ipc_cmd_parser_service.cpp b/test/unittest/UTTest_ipc_cmd_parser_service.cpp index 2c172b875..f4da020b9 100644 --- a/test/unittest/UTTest_ipc_cmd_parser_service.cpp +++ b/test/unittest/UTTest_ipc_cmd_parser_service.cpp @@ -18,7 +18,6 @@ #include #include "accesstoken_kit.h" -#include "access_token.h" #include "device_manager_ipc_interface_code.h" #include "device_manager_notify.h" #include "dm_anonymous.h" diff --git a/test/unittest/UTTest_mini_tools_kit.cpp b/test/unittest/UTTest_mini_tools_kit.cpp index 49a712dd0..bcb21104e 100644 --- a/test/unittest/UTTest_mini_tools_kit.cpp +++ b/test/unittest/UTTest_mini_tools_kit.cpp @@ -15,7 +15,6 @@ #include "UTTest_mini_tools_kit.h" #include "accesstoken_kit.h" -#include "access_token.h" #include "dm_constants.h" #include "nativetoken_kit.h" #include "token_setproc.h" -- Gitee From b44551dabe9c11b139380f31f5d16e640c8cc5e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Thu, 17 Jul 2025 11:06:16 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- test/unittest/BUILD.gn | 3 --- test/unittest/UTTest_ipc_cmd_parser_service.cpp | 9 +++------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 43cea0b5f..815e5a44e 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -209,9 +209,6 @@ ohos_unittest("UTTest_ipc_cmd_parser_service") { deps = [ ":device_manager_test_common" ] external_deps = [ - "access_token:libaccesstoken_sdk", - "access_token:libnativetoken", - "access_token:libtoken_setproc", "cJSON:cjson", "data_share:datashare_common", "data_share:datashare_consumer", diff --git a/test/unittest/UTTest_ipc_cmd_parser_service.cpp b/test/unittest/UTTest_ipc_cmd_parser_service.cpp index f4da020b9..0e9dfd6f1 100644 --- a/test/unittest/UTTest_ipc_cmd_parser_service.cpp +++ b/test/unittest/UTTest_ipc_cmd_parser_service.cpp @@ -17,13 +17,11 @@ #include -#include "accesstoken_kit.h" #include "device_manager_ipc_interface_code.h" #include "device_manager_notify.h" #include "dm_anonymous.h" #include "dm_constants.h" #include "dm_device_info.h" -#include "nativetoken_kit.h" #include "ipc_client_manager.h" #include "ipc_cmd_register.h" #include "ipc_common_param_req.h" @@ -53,7 +51,6 @@ #include "ipc_unauthenticate_device_req.h" #include "ipc_unpublish_req.h" #include "json_object.h" -#include "token_setproc.h" namespace OHOS { namespace DistributedHardware { @@ -1094,7 +1091,7 @@ HWTEST_F(IpcCmdParserServiceTest, OnIpcCmdFunc_042, testing::ext::TestSize.Level if (ptr) { ret = ptr(data, reply); } - ASSERT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); + ASSERT_EQ(ret, ERR_DM_NO_PERMISSION); } HWTEST_F(IpcCmdParserServiceTest, OnIpcCmdFunc_043, testing::ext::TestSize.Level0) @@ -1194,7 +1191,7 @@ HWTEST_F(IpcCmdParserServiceTest, OnIpcCmdFunc_048, testing::ext::TestSize.Level if (ptr) { ret = ptr(data, reply); } - ASSERT_EQ(ret, DM_OK); + ASSERT_EQ(ret, ERR_DM_NO_PERMISSION); } HWTEST_F(IpcCmdParserServiceTest, OnIpcCmdFunc_049, testing::ext::TestSize.Level0) @@ -1209,7 +1206,7 @@ HWTEST_F(IpcCmdParserServiceTest, OnIpcCmdFunc_049, testing::ext::TestSize.Level if (ptr) { ret = ptr(data, reply); } - ASSERT_EQ(ret, DM_OK); + ASSERT_EQ(ret, ERR_DM_NO_PERMISSION); } HWTEST_F(IpcCmdParserServiceTest, OnIpcCmdFunc_050, testing::ext::TestSize.Level0) -- Gitee From 6085ef36e44ea5debaf5af7d6856268c82807008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Thu, 17 Jul 2025 11:17:08 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- .../UTTest_ipc_cmd_parser_service.cpp | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/test/unittest/UTTest_ipc_cmd_parser_service.cpp b/test/unittest/UTTest_ipc_cmd_parser_service.cpp index 0e9dfd6f1..719df2374 100644 --- a/test/unittest/UTTest_ipc_cmd_parser_service.cpp +++ b/test/unittest/UTTest_ipc_cmd_parser_service.cpp @@ -56,28 +56,6 @@ namespace OHOS { namespace DistributedHardware { void IpcCmdParserServiceTest::SetUp() { - const int32_t permsNum = 3; - const int32_t indexZero = 0; - const int32_t indexOne = 1; - const int32_t indexTwo = 2; - uint64_t tokenId; - const char *perms[permsNum]; - perms[indexZero] = "ohos.permission.ACCESS_SERVICE_DM"; - perms[indexOne] = "ohos.permission.DISTRIBUTED_DATASYNC"; - perms[indexTwo] = "ohos.permission.MONITOR_DEVICE_NETWORK_STATE"; - NativeTokenInfoParams infoInstance = { - .dcapsNum = 0, - .permsNum = permsNum, - .aclsNum = 0, - .dcaps = NULL, - .perms = perms, - .acls = NULL, - .processName = "dsoftbus_service", - .aplStr = "system_core", - }; - tokenId = GetAccessTokenId(&infoInstance); - SetSelfTokenID(tokenId); - OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); } void IpcCmdParserServiceTest::TearDown() -- Gitee From 2b6437c965febb4374568d37073e750703236e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Thu, 17 Jul 2025 11:21:39 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- test/unittest/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 815e5a44e..b405c21c9 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -2095,6 +2095,7 @@ ohos_unittest("UTTest_mini_tools_kit") { "ffrt:libffrt", "googletest:gmock", "googletest:gmock_main", + "selinux_adapter:librestorecon", ] } -- Gitee