From cbe3643ed787203c5a8a2567d93f75e73979f270 Mon Sep 17 00:00:00 2001 From: GengYinzong Date: Sat, 24 Aug 2024 00:48:56 -0700 Subject: [PATCH] fix sandbox tdd Signed-off-by: GengYinzong --- .../unittest/src/sandbox_manager_kit_test.cpp | 74 ++++++++++++++++++- sandbox_manager.gni | 3 + .../unittest/policy_info_manager_test.cpp | 6 ++ 3 files changed, 80 insertions(+), 3 deletions(-) diff --git a/interfaces/innerkits/sandbox_manager/test/unittest/src/sandbox_manager_kit_test.cpp b/interfaces/innerkits/sandbox_manager/test/unittest/src/sandbox_manager_kit_test.cpp index 96275ac..13cd8f8 100644 --- a/interfaces/innerkits/sandbox_manager/test/unittest/src/sandbox_manager_kit_test.cpp +++ b/interfaces/innerkits/sandbox_manager/test/unittest/src/sandbox_manager_kit_test.cpp @@ -49,7 +49,9 @@ const std::string SET_POLICY_PERMISSION = "ohos.permission.SET_SANDBOX_POLICY"; const std::string ACCESS_PERSIST_PERMISSION = "ohos.permission.FILE_ACCESS_PERSIST"; const Security::AccessToken::AccessTokenID INVALID_TOKENID = 0; const uint64_t POLICY_VECTOR_SIZE_LIMIT = 500; +#ifdef MAC_ENABLED const int32_t FOUNDATION_UID = 5523; +#endif const size_t MAX_POLICY_NUM = 8; uint32_t g_selfTokenId; uint32_t g_mockToken; @@ -143,6 +145,7 @@ void SandboxManagerKitTest::TearDown() EXPECT_EQ(0, SetSelfTokenID(g_selfTokenId)); } +#ifdef MAC_ENABLED /** * @tc.name: PersistPolicy003 * @tc.desc: PersistPolicy with permission. @@ -183,7 +186,9 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy003, TestSize.Level1) ASSERT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::CheckPersistPolicy(g_mockToken, policy, checkResult2)); ASSERT_EQ(false, checkResult2[0]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: PersistPolicyByTokenID001 * @tc.desc: PersistPolicyByTokenId with permission. @@ -221,7 +226,9 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicyByTokenID001, TestSize.Level1) ASSERT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::CheckPersistPolicy(tokenId, policy, checkResult2)); ASSERT_EQ(false, checkResult2[0]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: PersistPolicy004 * @tc.desc: PersistPolicy with invalid path. @@ -250,7 +257,9 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy004, TestSize.Level1) EXPECT_EQ(2, result2.size()); EXPECT_EQ(INVALID_MODE, result2[1]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: PersistPolicy005 * @tc.desc: PersistPolicy directory. @@ -295,7 +304,9 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy005, TestSize.Level1) EXPECT_EQ(OPERATE_SUCCESSFULLY, unPersistResult[0]); EXPECT_EQ(OPERATE_SUCCESSFULLY, unPersistResult[1]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: PersistPolicy006 * @tc.desc: PersistPolicy directory. @@ -344,7 +355,9 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy006, TestSize.Level1) EXPECT_EQ(OPERATE_SUCCESSFULLY, unPersistResult[0]); EXPECT_EQ(OPERATE_SUCCESSFULLY, unPersistResult[1]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: PersistPolicy007 * @tc.desc: PersistPolicy directory. @@ -392,7 +405,9 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy007, TestSize.Level1) EXPECT_EQ(1, unPersistResult.size()); EXPECT_EQ(OPERATE_SUCCESSFULLY, unPersistResult[0]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: PersistPolicy008 * @tc.desc: PersistPolicy directory. @@ -433,7 +448,9 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy008, TestSize.Level1) EXPECT_EQ(1, unPersistResult.size()); EXPECT_EQ(OPERATE_SUCCESSFULLY, unPersistResult[0]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: PersistPolicy009 * @tc.desc: PersistPolicy directory. @@ -480,9 +497,11 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy009, TestSize.Level1) EXPECT_EQ(1, unPersistResult.size()); EXPECT_EQ(OPERATE_SUCCESSFULLY, unPersistResult[0]); } +#endif +#ifdef MAC_ENABLED /** - * @tc.name: PersistPolicy009 + * @tc.name: PersistPolicy010 * @tc.desc: PersistPolicy directory. * @tc.type: FUNC * @tc.require: @@ -525,9 +544,11 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy010, TestSize.Level1) EXPECT_EQ(OPERATE_SUCCESSFULLY, unPersistResult[1]); EXPECT_EQ(POLICY_HAS_NOT_BEEN_PERSISTED, unPersistResult[0]); } +#endif +#ifdef MAC_ENABLED /** - * @tc.name: PersistPolicy009 + * @tc.name: PersistPolicy011 * @tc.desc: PersistPolicy directory. * @tc.type: FUNC * @tc.require: @@ -570,7 +591,9 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy011, TestSize.Level1) EXPECT_EQ(OPERATE_SUCCESSFULLY, unPersistResult[0]); EXPECT_EQ(POLICY_HAS_NOT_BEEN_PERSISTED, unPersistResult[1]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: PersistPolicy012 * @tc.desc: PersistPolicy directory. @@ -616,9 +639,11 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy012, TestSize.Level1) EXPECT_EQ(OPERATE_SUCCESSFULLY, unPersistResult[1]); EXPECT_EQ(OPERATE_SUCCESSFULLY, unPersistResult[0]); } +#endif +#ifdef MAC_ENABLED /** - * @tc.name: PersistPolicy009 + * @tc.name: PersistPolicy013 * @tc.desc: PersistPolicy directory. * @tc.type: FUNC * @tc.require: @@ -663,6 +688,7 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy013, TestSize.Level1) EXPECT_EQ(POLICY_HAS_NOT_BEEN_PERSISTED, unPersistResult[1]); EXPECT_EQ(OPERATE_SUCCESSFULLY, unPersistResult[0]); } +#endif /** * @tc.name: PersistPolicy014 @@ -742,6 +768,7 @@ HWTEST_F(SandboxManagerKitTest, PersistPolicy015, TestSize.Level1) EXPECT_EQ(INVALID_PARAMTER, SandboxManagerKit::CheckPolicy(tokenId, policy, flag)); } +#ifdef MAC_ENABLED /** * @tc.name: CheckPolicyTest001 * @tc.desc: Check allowed policy @@ -786,7 +813,9 @@ HWTEST_F(SandboxManagerKitTest, CheckPolicyTest001, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicy(g_mockToken, policyA[0])); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: CheckPolicyTest002 * @tc.desc: Check allowed policy @@ -832,7 +861,9 @@ HWTEST_F(SandboxManagerKitTest, CheckPolicyTest002, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicy(g_mockToken, policyA[0])); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: CheckPolicyTest003 * @tc.desc: Check parent directory policy with r+w @@ -878,7 +909,9 @@ HWTEST_F(SandboxManagerKitTest, CheckPolicyTest003, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicy(g_mockToken, policyA[0])); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: CheckPolicyTest004 * @tc.desc: Check parent directory policy with r @@ -931,7 +964,9 @@ HWTEST_F(SandboxManagerKitTest, CheckPolicyTest004, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicy(g_mockToken, policyA[0])); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: CheckPolicyTest005 * @tc.desc: Check parent directory policy with w @@ -984,7 +1019,9 @@ HWTEST_F(SandboxManagerKitTest, CheckPolicyTest005, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicy(g_mockToken, policyA[0])); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: CheckPolicyTest006 * @tc.desc: Check parent directory policy with w @@ -1026,7 +1063,9 @@ HWTEST_F(SandboxManagerKitTest, CheckPolicyTest006, TestSize.Level1) EXPECT_TRUE(result[1]); EXPECT_FALSE(result[2]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: CheckPolicyTest007 * @tc.desc: Check allowed policy with invalid tokenID @@ -1057,7 +1096,9 @@ HWTEST_F(SandboxManagerKitTest, CheckPolicyTest007, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicy(g_mockToken, policy[0])); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: CheckPolicyTest008 * @tc.desc: Check allowed policy with invalid policy @@ -1108,7 +1149,9 @@ HWTEST_F(SandboxManagerKitTest, CheckPolicyTest008, TestSize.Level1) ASSERT_EQ(1, result.size()); EXPECT_FALSE(result[0]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: UnSetPolicyTest001 * @tc.desc: Unset policy with invalid tokenID @@ -1133,7 +1176,9 @@ HWTEST_F(SandboxManagerKitTest, UnSetPolicyTest001, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicy(g_selfTokenId, policy[0])); EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicy(g_mockToken, policy[0])); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: UnSetPolicyTest002 * @tc.desc: Unset allowed policy @@ -1180,7 +1225,9 @@ HWTEST_F(SandboxManagerKitTest, UnSetPolicyTest002, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicy(g_mockToken, policy[0])); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: UnSetPolicyTest003 * @tc.desc: Unset parent policy @@ -1212,7 +1259,9 @@ HWTEST_F(SandboxManagerKitTest, UnSetPolicyTest003, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicy(g_mockToken, policyB[0])); EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicy(g_mockToken, policyA[0])); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: UnSetPolicyTest004 * @tc.desc: Unset policy without permission @@ -1243,6 +1292,7 @@ HWTEST_F(SandboxManagerKitTest, UnSetPolicyTest004, TestSize.Level1) ASSERT_EQ(0, SetSelfTokenID(g_mockToken)); EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicy(g_mockToken, policy[0])); } +#endif /** * @tc.name: PolicyAsyncTest001 @@ -1269,6 +1319,7 @@ HWTEST_F(SandboxManagerKitTest, PolicyAsyncTest001, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicyAsync(g_selfTokenId, policy[0])); } +#ifdef MAC_ENABLED /** * @tc.name: PolicyAsyncTest002 * @tc.desc: Set/Unset allowed policy @@ -1312,7 +1363,9 @@ HWTEST_F(SandboxManagerKitTest, PolicyAsyncTest002, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicyAsync(g_mockToken, policy[0])); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: PolicyAsyncTest003 * @tc.desc: Set/UnSet parent policy @@ -1340,7 +1393,9 @@ HWTEST_F(SandboxManagerKitTest, PolicyAsyncTest003, TestSize.Level1) policyB.emplace_back(infoParent); EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicyAsync(g_mockToken, policyB[0])); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: PolicyAsyncTest004 * @tc.desc: Set/UnSet policy without permission @@ -1369,7 +1424,9 @@ HWTEST_F(SandboxManagerKitTest, PolicyAsyncTest004, TestSize.Level1) ASSERT_EQ(0, SetSelfTokenID(g_mockToken)); EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::UnSetPolicyAsync(g_mockToken, policy[0])); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: CleanPersistPolicyByPathTest001 * @tc.desc: Clean persist policy by path @@ -1419,7 +1476,9 @@ HWTEST_F(SandboxManagerKitTest, CleanPersistPolicyByPathTest001, TestSize.Level1 ASSERT_EQ(1, result2.size()); EXPECT_FALSE(result2[0]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: CleanPersistPolicyByPathTest002 * @tc.desc: Clean child persist policy by path @@ -1479,7 +1538,9 @@ HWTEST_F(SandboxManagerKitTest, CleanPersistPolicyByPathTest002, TestSize.Level1 ASSERT_EQ(1, result.size()); EXPECT_FALSE(result[0]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: CleanPersistPolicyByPathTest003 * @tc.desc: Clean child persist policy by path @@ -1534,6 +1595,7 @@ HWTEST_F(SandboxManagerKitTest, CleanPersistPolicyByPathTest003, TestSize.Level1 ASSERT_EQ(1, result.size()); EXPECT_FALSE(result[0]); } +#endif /** * @tc.name: CleanPersistPolicyByPathTest004 @@ -1551,6 +1613,7 @@ HWTEST_F(SandboxManagerKitTest, CleanPersistPolicyByPathTest004, TestSize.Level1 EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::CleanPersistPolicyByPath(filePaths)); } +#ifdef MAC_ENABLED /** * @tc.name: CleanPersistPolicyByPathTest005 * @tc.desc: Clean persist policy by path with invalid path @@ -1587,6 +1650,7 @@ HWTEST_F(SandboxManagerKitTest, CleanPersistPolicyByPathTest005, TestSize.Level1 ASSERT_EQ(0, SetSelfTokenID(g_mockToken)); EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::CleanPersistPolicyByPath(filePaths)); } +#endif /** * @tc.name: StartAccessingByTokenIdTest001 @@ -1611,6 +1675,7 @@ HWTEST_F(SandboxManagerKitTest, StartAccessingByTokenIdTest002, TestSize.Level1) EXPECT_EQ(SANDBOX_MANAGER_OK, SandboxManagerKit::StartAccessingByTokenId(g_selfTokenId)); } +#ifdef MAC_ENABLED /** * @tc.name: StartAccessingByTokenIdTest003 * @tc.desc: Start accessing by tokenID @@ -1664,7 +1729,9 @@ HWTEST_F(SandboxManagerKitTest, StartAccessingByTokenIdTest003, TestSize.Level1) ASSERT_EQ(1, result.size()); EXPECT_TRUE(result[0]); } +#endif +#ifdef MAC_ENABLED /** * @tc.name: UnSetAllPolicyByTokenTest001 * @tc.desc: destroy all mac policy in kernel with given tokenid @@ -1696,6 +1763,7 @@ HWTEST_F(SandboxManagerKitTest, UnSetAllPolicyByTokenTest001, TestSize.Level1) ASSERT_EQ(1, result.size()); EXPECT_FALSE(result[0]); } +#endif } // SandboxManager } // AccessControl } // OHOS \ No newline at end of file diff --git a/sandbox_manager.gni b/sandbox_manager.gni index 752b965..06c4bf2 100644 --- a/sandbox_manager.gni +++ b/sandbox_manager.gni @@ -15,3 +15,6 @@ sandbox_manager_path = "//base/accesscontrol/sandbox_manager" module_output_path_interface_sandbox = "sandbox_manager/sandbox_manager/interface/" module_output_path_service_sandbox = "sandbox_manager/sandbox_manager/service/" +if (product_name != "rk3568") { + defined += [ "MAC_ENABLED" ] +} diff --git a/services/sandbox_manager/test/unittest/policy_info_manager_test.cpp b/services/sandbox_manager/test/unittest/policy_info_manager_test.cpp index 3b78683..9ec9431 100644 --- a/services/sandbox_manager/test/unittest/policy_info_manager_test.cpp +++ b/services/sandbox_manager/test/unittest/policy_info_manager_test.cpp @@ -102,6 +102,7 @@ void PrintDbRecords() } } +#ifdef MAC_ENABLED /** * @tc.name: PolicyInfoManagerTest002 * @tc.desc: Test AddPolicy - normal cases @@ -151,7 +152,9 @@ HWTEST_F(PolicyInfoManagerTest, PolicyInfoManagerTest002, TestSize.Level1) PrintDbRecords(); // db should have result9, result10, result11, result13 } +#endif +#ifdef MAC_ENABLED /** * @tc.name: PolicyInfoManagerTest004 * @tc.desc: Test MatchPolicy - normal @@ -197,6 +200,7 @@ HWTEST_F(PolicyInfoManagerTest, PolicyInfoManagerTest004, TestSize.Level1) EXPECT_EQ(sizeLimit, result14.size()); EXPECT_EQ(SandboxRetType::OPERATE_SUCCESSFULLY, result14[0]); } +#endif /** * @tc.name: PolicyInfoManagerTest006 @@ -302,6 +306,7 @@ HWTEST_F(PolicyInfoManagerTest, GenericValuesTest001, TestSize.Level1) EXPECT_EQ(str, variantValue.GetString()); } +#ifdef MAC_ENABLED /** * @tc.name: CleanPersistPolicyByPathTest001 * @tc.desc: Test CleanPersistPolicyByPath @@ -339,6 +344,7 @@ HWTEST_F(PolicyInfoManagerTest, CleanPersistPolicyByPathTest001, TestSize.Level1 EXPECT_EQ(SANDBOX_MANAGER_OK, PolicyInfoManager::GetInstance().MatchSinglePolicy(selfTokenId_, info, matchResult)); EXPECT_EQ(SandboxRetType::POLICY_HAS_NOT_BEEN_PERSISTED, matchResult); } +#endif /** * @tc.name: MacAdapterTest001 -- Gitee