From 3535906a6f7f1a5d235ba0e266df5e9a4409a263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Wed, 11 Jun 2025 10:22:02 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AF=BC=E5=85=A5authCode=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=99=BD=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- .../service/src/permission/standard/permission_manager.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/service/src/permission/standard/permission_manager.cpp b/services/service/src/permission/standard/permission_manager.cpp index c88b33ba8..77deb9284 100644 --- a/services/service/src/permission/standard/permission_manager.cpp +++ b/services/service/src/permission/standard/permission_manager.cpp @@ -32,7 +32,7 @@ namespace { constexpr const char* DM_SERVICE_ACCESS_PERMISSION = "ohos.permission.ACCESS_SERVICE_DM"; constexpr const char* DM_SERVICE_ACCESS_NEWPERMISSION = "ohos.permission.DISTRIBUTED_DATASYNC"; constexpr const char* DM_MONITOR_DEVICE_NETWORK_STATE_PERMISSION = "ohos.permission.MONITOR_DEVICE_NETWORK_STATE"; -constexpr int32_t AUTH_CODE_WHITE_LIST_NUM = 6; +constexpr int32_t AUTH_CODE_WHITE_LIST_NUM = 8; constexpr const static char* g_authCodeWhiteList[AUTH_CODE_WHITE_LIST_NUM] = { "com.huawei.msdp.hmringgenerator", "com.huawei.msdp.hmringdiscriminator", @@ -40,6 +40,8 @@ constexpr const static char* g_authCodeWhiteList[AUTH_CODE_WHITE_LIST_NUM] = { "wear_link_service", "watch_system_service", "cast_engine_service", + "xr_glass_app_service", + "glasses_system_service", }; constexpr int32_t PIN_HOLDER_WHITE_LIST_NUM = 1; -- Gitee From eada50df7e8f13a8095061cbc69c890077783992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Tue, 17 Jun 2025 09:41:12 +0800 Subject: [PATCH 2/6] =?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: 史晓晓 --- .../service/src/permission/standard/permission_manager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/service/src/permission/standard/permission_manager.cpp b/services/service/src/permission/standard/permission_manager.cpp index 77deb9284..0ffd1ddd6 100644 --- a/services/service/src/permission/standard/permission_manager.cpp +++ b/services/service/src/permission/standard/permission_manager.cpp @@ -63,12 +63,13 @@ constexpr const static char* SYSTEM_SA_WHITE_LIST[SYSTEM_SA_WHITE_LIST_NUM] = { "hmos.collaborationfwk.deviceDetect", }; -constexpr uint32_t SETDNPOLICY_WHITE_LIST_NUM = 4; +constexpr uint32_t SETDNPOLICY_WHITE_LIST_NUM = 5; constexpr const static char* g_setDnPolicyWhiteList[SETDNPOLICY_WHITE_LIST_NUM] = { "collaboration_service", "watch_system_service", "com.huawei.hmos.walletservice", "com.ohos.distributedjstest", + "glasses_system_service", }; constexpr uint32_t GETDEVICEINFO_WHITE_LIST_NUM = 3; -- Gitee From 18ac609522a9bbc098e6673b8ca915035d9b2913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Wed, 18 Jun 2025 17:39:04 +0800 Subject: [PATCH 3/6] =?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: 史晓晓 --- .../service/src/permission/standard/permission_manager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/service/src/permission/standard/permission_manager.cpp b/services/service/src/permission/standard/permission_manager.cpp index 0ffd1ddd6..2d0ca0e8b 100644 --- a/services/service/src/permission/standard/permission_manager.cpp +++ b/services/service/src/permission/standard/permission_manager.cpp @@ -41,7 +41,7 @@ constexpr const static char* g_authCodeWhiteList[AUTH_CODE_WHITE_LIST_NUM] = { "watch_system_service", "cast_engine_service", "xr_glass_app_service", - "glasses_system_service", + "glasses_link_service", }; constexpr int32_t PIN_HOLDER_WHITE_LIST_NUM = 1; @@ -69,7 +69,7 @@ constexpr const static char* g_setDnPolicyWhiteList[SETDNPOLICY_WHITE_LIST_NUM] "watch_system_service", "com.huawei.hmos.walletservice", "com.ohos.distributedjstest", - "glasses_system_service", + "glasses_link_service", }; constexpr uint32_t GETDEVICEINFO_WHITE_LIST_NUM = 3; -- Gitee From 578025832b018d46fdc21684ffcdb9072ce7b597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Thu, 19 Jun 2025 11:09:48 +0800 Subject: [PATCH 4/6] =?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_permission_manager.cpp | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/test/commonunittest/UTTest_permission_manager.cpp b/test/commonunittest/UTTest_permission_manager.cpp index 3d1e18fad..2372cfd01 100644 --- a/test/commonunittest/UTTest_permission_manager.cpp +++ b/test/commonunittest/UTTest_permission_manager.cpp @@ -261,6 +261,44 @@ HWTEST_F(PermissionManagerTest, CheckProcessNameValidOnGetDeviceInfo_001, testin ret = PermissionManager::GetInstance().CheckProcessNameValidOnGetDeviceInfo(processName); ASSERT_TRUE(ret); } + +HWTEST_F(PermissionManagerTest, CheckProcessNameValidOnAuthCode_001, testing::ext::TestSize.Level1) +{ + std::string processName = ""; + auto ret = PermissionManager::GetInstance().CheckProcessNameValidOnAuthCode(processName); + ASSERT_FALSE(ret); + + processName = "processName"; + ret = PermissionManager::GetInstance().CheckProcessNameValidOnAuthCode(processName); + ASSERT_FALSE(ret); + + processName = "xr_glass_app_service"; + ret = PermissionManager::GetInstance().CheckProcessNameValidOnAuthCode(processName); + ASSERT_TRUE(ret); + + processName = "glasses_link_service"; + ret = PermissionManager::GetInstance().CheckProcessNameValidOnAuthCode(processName); + ASSERT_TRUE(ret); +} + +HWTEST_F(PermissionManagerTest, CheckProcessNameValidOnSetDnPolicy_001, testing::ext::TestSize.Level1) +{ + std::string processName = ""; + auto ret = PermissionManager::GetInstance().CheckProcessNameValidOnSetDnPolicy(processName); + ASSERT_FALSE(ret); + + processName = "processName"; + ret = PermissionManager::GetInstance().CheckProcessNameValidOnSetDnPolicy(processName); + ASSERT_FALSE(ret); + + processName = "xr_glass_app_service"; + ret = PermissionManager::GetInstance().CheckProcessNameValidOnSetDnPolicy(processName); + ASSERT_FALSE(ret); + + processName = "glasses_link_service"; + ret = PermissionManager::GetInstance().CheckProcessNameValidOnSetDnPolicy(processName); + ASSERT_TRUE(ret); +} } } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file -- Gitee From ceeacffd89f9013d15461332efeecf389a74d865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Thu, 19 Jun 2025 11:27:44 +0800 Subject: [PATCH 5/6] =?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/commonunittest/UTTest_permission_manager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/commonunittest/UTTest_permission_manager.cpp b/test/commonunittest/UTTest_permission_manager.cpp index 2372cfd01..6b4fd689a 100644 --- a/test/commonunittest/UTTest_permission_manager.cpp +++ b/test/commonunittest/UTTest_permission_manager.cpp @@ -262,7 +262,7 @@ HWTEST_F(PermissionManagerTest, CheckProcessNameValidOnGetDeviceInfo_001, testin ASSERT_TRUE(ret); } -HWTEST_F(PermissionManagerTest, CheckProcessNameValidOnAuthCode_001, testing::ext::TestSize.Level1) +HWTEST_F(PermissionManagerTest, CheckProcessNameValidOnAuthCode_002, testing::ext::TestSize.Level1) { std::string processName = ""; auto ret = PermissionManager::GetInstance().CheckProcessNameValidOnAuthCode(processName); @@ -281,7 +281,7 @@ HWTEST_F(PermissionManagerTest, CheckProcessNameValidOnAuthCode_001, testing::ex ASSERT_TRUE(ret); } -HWTEST_F(PermissionManagerTest, CheckProcessNameValidOnSetDnPolicy_001, testing::ext::TestSize.Level1) +HWTEST_F(PermissionManagerTest, CheckProcessNameValidOnSetDnPolicy_002, testing::ext::TestSize.Level1) { std::string processName = ""; auto ret = PermissionManager::GetInstance().CheckProcessNameValidOnSetDnPolicy(processName); -- Gitee From 5232bf4de58ea215114aeb90e1b5654a59506492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Thu, 19 Jun 2025 14:18:31 +0800 Subject: [PATCH 6/6] =?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_permission_manager.cpp | 38 ------------------- 1 file changed, 38 deletions(-) diff --git a/test/commonunittest/UTTest_permission_manager.cpp b/test/commonunittest/UTTest_permission_manager.cpp index 6b4fd689a..3d1e18fad 100644 --- a/test/commonunittest/UTTest_permission_manager.cpp +++ b/test/commonunittest/UTTest_permission_manager.cpp @@ -261,44 +261,6 @@ HWTEST_F(PermissionManagerTest, CheckProcessNameValidOnGetDeviceInfo_001, testin ret = PermissionManager::GetInstance().CheckProcessNameValidOnGetDeviceInfo(processName); ASSERT_TRUE(ret); } - -HWTEST_F(PermissionManagerTest, CheckProcessNameValidOnAuthCode_002, testing::ext::TestSize.Level1) -{ - std::string processName = ""; - auto ret = PermissionManager::GetInstance().CheckProcessNameValidOnAuthCode(processName); - ASSERT_FALSE(ret); - - processName = "processName"; - ret = PermissionManager::GetInstance().CheckProcessNameValidOnAuthCode(processName); - ASSERT_FALSE(ret); - - processName = "xr_glass_app_service"; - ret = PermissionManager::GetInstance().CheckProcessNameValidOnAuthCode(processName); - ASSERT_TRUE(ret); - - processName = "glasses_link_service"; - ret = PermissionManager::GetInstance().CheckProcessNameValidOnAuthCode(processName); - ASSERT_TRUE(ret); -} - -HWTEST_F(PermissionManagerTest, CheckProcessNameValidOnSetDnPolicy_002, testing::ext::TestSize.Level1) -{ - std::string processName = ""; - auto ret = PermissionManager::GetInstance().CheckProcessNameValidOnSetDnPolicy(processName); - ASSERT_FALSE(ret); - - processName = "processName"; - ret = PermissionManager::GetInstance().CheckProcessNameValidOnSetDnPolicy(processName); - ASSERT_FALSE(ret); - - processName = "xr_glass_app_service"; - ret = PermissionManager::GetInstance().CheckProcessNameValidOnSetDnPolicy(processName); - ASSERT_FALSE(ret); - - processName = "glasses_link_service"; - ret = PermissionManager::GetInstance().CheckProcessNameValidOnSetDnPolicy(processName); - ASSERT_TRUE(ret); -} } } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file -- Gitee