!1619 capability、dac版本回退

Merge pull request !1619 from zhoudm2021/security_lite_20220119

security_lite/permission_posix/capability/jffs/BUILD.gn

@@ -18,7 +18,8 @@ hcpptest_suite("ActsJFFS2CapabilityTest") {
   suite_name = "acts"
   sources = [
     "../src/ActsCapability.cpp",
-    "../src/CapabilityTestSuite.cpp",
+    "../src/ActsCapabilityTest.cpp",
+    "../src/CapabilityFileSystemTest.cpp",
   ]
 
   include_dirs = [

security_lite/permission_posix/capability/src/CapabilityTestSuite.cpp → security_lite/permission_posix/capability/src/ActsCapabilityTest.cpp

@@ -16,63 +16,16 @@
 #include <dirent.h>
 #include <fcntl.h>
 #include <securec.h>
-#include <unistd.h>
 #include <sys/capability.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include "gtest/gtest.h"
+#include "CapabilityFileSystemTest.h"
 
 using namespace std;
 using namespace testing::ext;
 
-class CapabilityTestSuite : public::testing::Test {
-protected:
-    char *mCurPath;
-    void SetUp();
-    void TearDown();
-};
-
-int main()
-{
-    if (CheckFsMount(TOP_DIR, TOP_DIR_MOUNT_INFO) != 0) {
-        return 1;
-    } else {
-        return RUN_ALL_TESTS();
-    }
-}
-
-void CapabilityTestSuite::SetUp()
-{
-    // Permission mask preset when creating a file
-    umask(ZERO);
-    // Init capabilities
-    CapInit();
-    // Initialize the process and set the uid and gid of the process to zero
-    SetUidGid(UID0, GID0);
-    // Delete the 'TOP_DIR/CAPDIR0' if the directory exists
-    RemoveDir(TOP_DIR "/" CAPDIR0);
-    // Obtain the current working directory of the test code
-    mCurPath = GetCurrentPath();
-    // Modify the current working directory of the test code
-    int ret = chdir(TOP_DIR);
-    if (ret != 0) {
-        LOG("ErrInfo: Failed to chdir to %s, ret=%d, errno=%d", TOP_DIR, ret, errno);
-    }
-}
-
-// Test suite cleanup action, which is executed after the last test case
-void CapabilityTestSuite::TearDown()
-{
-    // Delete the 'TOP_DIR/CAPDIR0' if the directory exists
-    RemoveDir(TOP_DIR "/" CAPDIR0);
-    // Restore the working directory of the test code
-    int ret = chdir(mCurPath);
-    if (ret != 0) {
-        LOG("ErrInfo: Failed to chdir to %s, ret=%d, errno=%d", mCurPath, ret, errno);
-    }
-}
-
 #if defined(LITE_FS_JFFS2)
 static int TestDacOverrideSuccess()
 {

security_lite/permission_posix/capability/src/CapabilityFileSystemTest.cpp

+/*
+ * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "CapabilityFileSystemTest.h"
+#include <unistd.h>
+#include "ActsCapabilityTest.h"
+
+using namespace testing::ext;
+
+// Preset action of the test suite, which is executed before the first test case
+void CapabilityTestSuite::SetUp()
+{
+    // Permission mask preset when creating a file
+    umask(ZERO);
+    // Init capabilities
+    CapInit();
+    // Initialize the process and set the uid and gid of the process to zero
+    SetUidGid(UID0, GID0);
+    // Delete the 'TOP_DIR/CAPDIR0' if the directory exists
+    RemoveDir(TOP_DIR "/" CAPDIR0);
+    // Obtain the current working directory of the test code
+    mCurPath = GetCurrentPath();
+    // Modify the current working directory of the test code
+    int ret = chdir(TOP_DIR);
+    if (ret != 0) {
+        LOG("ErrInfo: Failed to chdir to %s, ret=%d, errno=%d", TOP_DIR, ret, errno);
+    }
+}
+
+// Test suite cleanup action, which is executed after the last test case
+void CapabilityTestSuite::TearDown()
+{
+    // Delete the 'TOP_DIR/CAPDIR0' if the directory exists
+    RemoveDir(TOP_DIR "/" CAPDIR0);
+    // Restore the working directory of the test code
+    int ret = chdir(mCurPath);
+    if (ret != 0) {
+        LOG("ErrInfo: Failed to chdir to %s, ret=%d, errno=%d", mCurPath, ret, errno);
+    }
+}
+
+int main(int argc, char *argv[])
+{
+    testing::GTEST_FLAG(output) = "xml:";
+    testing::InitGoogleTest(&argc, argv);
+    if (CheckFsMount(TOP_DIR, TOP_DIR_MOUNT_INFO) != 0) {
+        return 1;
+    }
+    return RUN_ALL_TESTS();
+}
\ No newline at end of file

security_lite/permission_posix/capability/src/CapabilityFileSystemTest.h

+/*
+ * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef XTS_ACTS_SECURITY_LITE_PERMISSSION_POSIX_CAPABILITY_SRC_CAPABILITYFILESYSTEMTEST_H
+#define XTS_ACTS_SECURITY_LITE_PERMISSSION_POSIX_CAPABILITY_SRC_CAPABILITYFILESYSTEMTEST_H
+
+#include <gtest/gtest.h>
+
+class CapabilityTestSuite : public::testing::Test {
+protected:
+    char *mCurPath;
+    void SetUp();
+    void TearDown();
+};
+
+#endif
\ No newline at end of file

security_lite/permission_posix/capability/vfat/BUILD.gn

@@ -18,7 +18,8 @@ hcpptest_suite("ActsVFATCapabilityTest") {
   suite_name = "acts"
   sources = [
     "../src/ActsCapability.cpp",
-    "../src/CapabilityTestSuite.cpp",
+    "../src/ActsCapabilityTest.cpp",
+    "../src/CapabilityFileSystemTest.cpp",
   ]
 
   include_dirs = [

security_lite/permission_posix/dac/jffs/BUILD.gn

@@ -15,7 +15,13 @@ import("//test/xts/tools/lite/build/suite_lite.gni")
 
 hcpptest_suite("ActsJFFS2DACTest") {
   suite_name = "acts"
-  sources = [ "../src/DacTestSuite.cpp" ]
+  sources = [
+    "../src/ActsDacPreTest.cpp",
+    "../src/ActsDacTest.cpp",
+    "../src/ActsSystemDevDacTest.cpp",
+    "../src/ActsSystemJffsDacTest.cpp",
+    "../src/DACFileSystemTest.cpp",
+  ]
 
   include_dirs = [
     "../src",

security_lite/permission_posix/dac/src/DACFileSystemTest.cpp

+/*
+ * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "DACFileSystemTest.h"
+#include <unistd.h>
+#include "ActsCapabilityTest.h"
+#include "ActsDacTest.h"
+
+using namespace testing::ext;
+
+// Preset action of the test suite, which is executed before the first test case
+void DacTestSuite::SetUp()
+{
+    // Permission mask preset when creating a file
+    umask(ZERO);
+    // Init capabilities
+    CapInit();
+    // Initialize the process and set the uid and gid of the process to zero
+    SetUidGid(UID0, GID0);
+    // Delete the the directory if exists
+    RemoveDir(TOP_DIR "/" DACDIR0);
+    RemoveDir(TOP_DIR "/" DACDIR1);
+    RemoveDir("/storage/" DACDIR0);
+    // Obtain the current working directory of the test code
+    mCurPath = GetCurrentPath();
+    // Modify the current working directory of the test code
+    int ret = chdir(TOP_DIR);
+    if (ret != 0) {
+        LOG("ErrInfo: Failed to chdir to %s, ret=%d, errno=%d", TOP_DIR, ret, errno);
+    }
+}
+
+// Test suite cleanup action, which is executed after the last test case
+void DacTestSuite::TearDown()
+{
+    // Delete the the directory if exists
+    RemoveDir(TOP_DIR "/" DACDIR0);
+    RemoveDir(TOP_DIR "/" DACDIR1);
+    RemoveDir("/storage/" DACDIR0);
+    // Initialize the process and set the uid and gid of the process to zero
+    SetUidGid(UID0, GID0);
+    // Restore the working directory of the test code
+    int ret = chdir(mCurPath);
+    if (ret != 0) {
+        LOG("ErrInfo: Failed to chdir to %s, ret=%d, errno=%d", mCurPath, ret, errno);
+    }
+}
+
+int main(int argc, char *argv[])
+{
+    testing::GTEST_FLAG(output) = "xml:";
+    testing::InitGoogleTest(&argc, argv);
+    if (CheckFsMount(TOP_DIR, TOP_DIR_MOUNT_INFO) != 0) {
+        return 1;
+    }
+    return RUN_ALL_TESTS();
+}
\ No newline at end of file

security_lite/permission_posix/dac/src/DACFileSystemTest.h

+/*
+ * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef XTS_ACTS_SECURITY_LITE_PERMISSSION_POSIX_DAC_SRC_DACTFILESYSTEMTEST_H
+#define XTS_ACTS_SECURITY_LITE_PERMISSSION_POSIX_DAC_SRC_DACTFILESYSTEMTEST_H
+
+#include <gtest/gtest.h>
+
+class DacTestSuite : public::testing::Test {
+protected:
+    char *mCurPath;
+    void SetUp();
+    void TearDown();
+};
+
+#endif
\ No newline at end of file

security_lite/permission_posix/dac/vfat/BUILD.gn

@@ -15,7 +15,13 @@ import("//test/xts/tools/lite/build/suite_lite.gni")
 
 hcpptest_suite("ActsVFATDACTest") {
   suite_name = "acts"
-  sources = [ "../src/DacTestSuite.cpp" ]
+  sources = [
+    "../src/ActsDacPreTest.cpp",
+    "../src/ActsDacTest.cpp",
+    "../src/ActsSystemDevDacTest.cpp",
+    "../src/ActsSystemJffsDacTest.cpp",
+    "../src/DACFileSystemTest.cpp",
+  ]
 
   include_dirs = [
     "../src",