From: Zbigniew Jasinski Date: Fri, 6 Feb 2015 16:36:37 +0000 (+0100) Subject: Tests for new structure of application file paths X-Git-Tag: security-manager_5.5_testing~109^2~24 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e7d7dfbb1a9f7bde6bcea1f35e9e8b85d17045d;p=platform%2Fcore%2Ftest%2Fsecurity-tests.git Tests for new structure of application file paths Change-Id: I47ffaa1524a7044904413d878573ef4b4e9cea89 --- diff --git a/packaging/security-tests.spec b/packaging/security-tests.spec index b663366f..4a1d30dc 100644 --- a/packaging/security-tests.spec +++ b/packaging/security-tests.spec @@ -53,7 +53,7 @@ ln -sf /etc/smack/test_smack_rules %{buildroot}/etc/smack/test_smack_rules_lnk %post find /etc/smack/test_privilege_control_DIR/ -type f -name exec -exec chmod 0755 {} + -find /usr/apps/test_DIR/ -type f -name exec -exec chmod 0755 {} + +find /usr/apps/ -type f -name exec -exec chmod 0755 {} + # Load permissions templates api_feature_loader --verbose @@ -88,7 +88,7 @@ echo "security-tests postinst done ..." /etc/smack/test_smack_rules_lnk /usr/share/privilege-control/* /etc/smack/test_privilege_control_DIR/* -/usr/apps/test_DIR/* +/usr/apps/* /usr/bin/test-app-efl /usr/bin/test-app-osp /usr/bin/test-app-wgt diff --git a/tests/security-manager-tests/CMakeLists.txt b/tests/security-manager-tests/CMakeLists.txt index 447efcec..5b2b2eb8 100644 --- a/tests/security-manager-tests/CMakeLists.txt +++ b/tests/security-manager-tests/CMakeLists.txt @@ -81,6 +81,6 @@ TARGET_LINK_LIBRARIES(${TARGET_SEC_MGR_TESTS} INSTALL(TARGETS ${TARGET_SEC_MGR_TESTS} DESTINATION /usr/bin) INSTALL(DIRECTORY - ${PROJECT_SOURCE_DIR}/tests/security-manager-tests/test_DIR + ${PROJECT_SOURCE_DIR}/tests/security-manager-tests/apps_rw/ DESTINATION /usr/apps/ ) diff --git a/tests/security-manager-tests/apps_rw/app_dir/.level_1/.level_2/exec b/tests/security-manager-tests/apps_rw/app_dir/.level_1/.level_2/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir/.level_1/.level_2/normal b/tests/security-manager-tests/apps_rw/app_dir/.level_1/.level_2/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir/.level_1/exec b/tests/security-manager-tests/apps_rw/app_dir/.level_1/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir/.level_1/level_2/exec b/tests/security-manager-tests/apps_rw/app_dir/.level_1/level_2/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir/.level_1/level_2/normal b/tests/security-manager-tests/apps_rw/app_dir/.level_1/level_2/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir/.level_1/link_to_non_app_exec b/tests/security-manager-tests/apps_rw/app_dir/.level_1/link_to_non_app_exec new file mode 120000 index 00000000..a3a6771e --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir/.level_1/link_to_non_app_exec @@ -0,0 +1 @@ +../../non_app_dir/exec \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir/.level_1/link_to_non_app_normal b/tests/security-manager-tests/apps_rw/app_dir/.level_1/link_to_non_app_normal new file mode 120000 index 00000000..1fdebecc --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir/.level_1/link_to_non_app_normal @@ -0,0 +1 @@ +../../non_app_dir/normal \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir/.level_1/normal b/tests/security-manager-tests/apps_rw/app_dir/.level_1/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir/exec b/tests/security-manager-tests/apps_rw/app_dir/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir/level_1/.level_2/exec b/tests/security-manager-tests/apps_rw/app_dir/level_1/.level_2/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir/level_1/.level_2/normal b/tests/security-manager-tests/apps_rw/app_dir/level_1/.level_2/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir/level_1/exec b/tests/security-manager-tests/apps_rw/app_dir/level_1/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/exec b/tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/link_to_exec b/tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/link_to_exec new file mode 120000 index 00000000..f1b66f37 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/link_to_exec @@ -0,0 +1 @@ +exec \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/link_to_non_exec b/tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/link_to_non_exec new file mode 120000 index 00000000..5ae03463 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/link_to_non_exec @@ -0,0 +1 @@ +normal \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/normal b/tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir/level_1/link_to_exec b/tests/security-manager-tests/apps_rw/app_dir/level_1/link_to_exec new file mode 120000 index 00000000..f1b66f37 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir/level_1/link_to_exec @@ -0,0 +1 @@ +exec \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir/level_1/link_to_non_exec b/tests/security-manager-tests/apps_rw/app_dir/level_1/link_to_non_exec new file mode 120000 index 00000000..5ae03463 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir/level_1/link_to_non_exec @@ -0,0 +1 @@ +normal \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir/level_1/normal b/tests/security-manager-tests/apps_rw/app_dir/level_1/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir/link_to_exec b/tests/security-manager-tests/apps_rw/app_dir/link_to_exec new file mode 120000 index 00000000..f1b66f37 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir/link_to_exec @@ -0,0 +1 @@ +exec \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_dir b/tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_dir new file mode 120000 index 00000000..4c67b099 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_dir @@ -0,0 +1 @@ +../non_app_dir \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_exec b/tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_exec new file mode 120000 index 00000000..94e54050 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_exec @@ -0,0 +1 @@ +../non_app_dir/exec \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_normal b/tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_normal new file mode 120000 index 00000000..f7f5e537 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_normal @@ -0,0 +1 @@ +../non_app_dir/normal \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir/link_to_non_exec b/tests/security-manager-tests/apps_rw/app_dir/link_to_non_exec new file mode 120000 index 00000000..5ae03463 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir/link_to_non_exec @@ -0,0 +1 @@ +normal \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir/normal b/tests/security-manager-tests/apps_rw/app_dir/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/.level_2/exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/.level_2/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/.level_2/normal b/tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/.level_2/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/level_2/exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/level_2/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/level_2/normal b/tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/level_2/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/normal b/tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/.level_2/exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/.level_2/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/.level_2/normal b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/.level_2/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/link_to_exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/link_to_exec new file mode 120000 index 00000000..f1b66f37 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/link_to_exec @@ -0,0 +1 @@ +exec \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/link_to_non_exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/link_to_non_exec new file mode 120000 index 00000000..5ae03463 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/link_to_non_exec @@ -0,0 +1 @@ +normal \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/normal b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/link_to_exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/link_to_exec new file mode 120000 index 00000000..f1b66f37 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/link_to_exec @@ -0,0 +1 @@ +exec \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/link_to_non_exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/link_to_non_exec new file mode 120000 index 00000000..5ae03463 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/link_to_non_exec @@ -0,0 +1 @@ +normal \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/normal b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_exec new file mode 120000 index 00000000..f1b66f37 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_exec @@ -0,0 +1 @@ +exec \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_dir b/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_dir new file mode 120000 index 00000000..4c67b099 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_dir @@ -0,0 +1 @@ +../non_app_dir \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_exec new file mode 120000 index 00000000..94e54050 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_exec @@ -0,0 +1 @@ +../non_app_dir/exec \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_normal b/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_normal new file mode 120000 index 00000000..f7f5e537 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_normal @@ -0,0 +1 @@ +../non_app_dir/normal \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_exec new file mode 120000 index 00000000..5ae03463 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_exec @@ -0,0 +1 @@ +normal \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/app_dir_public_ro/normal b/tests/security-manager-tests/apps_rw/app_dir_public_ro/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/.level_1/.level_2/exec b/tests/security-manager-tests/apps_rw/non_app_dir/.level_1/.level_2/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/.level_1/.level_2/normal b/tests/security-manager-tests/apps_rw/non_app_dir/.level_1/.level_2/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/.level_1/exec b/tests/security-manager-tests/apps_rw/non_app_dir/.level_1/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/.level_1/level_2/exec b/tests/security-manager-tests/apps_rw/non_app_dir/.level_1/level_2/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/.level_1/level_2/normal b/tests/security-manager-tests/apps_rw/non_app_dir/.level_1/level_2/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/.level_1/normal b/tests/security-manager-tests/apps_rw/non_app_dir/.level_1/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/exec b/tests/security-manager-tests/apps_rw/non_app_dir/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/level_1/.level_2/exec b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/.level_2/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/level_1/.level_2/normal b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/.level_2/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/level_1/exec b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/exec b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/exec new file mode 100755 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/link_to_exec b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/link_to_exec new file mode 120000 index 00000000..f1b66f37 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/link_to_exec @@ -0,0 +1 @@ +exec \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/link_to_non_exec b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/link_to_non_exec new file mode 120000 index 00000000..5ae03463 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/link_to_non_exec @@ -0,0 +1 @@ +normal \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/normal b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/level_1/link_to_exec b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/link_to_exec new file mode 120000 index 00000000..f1b66f37 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/link_to_exec @@ -0,0 +1 @@ +exec \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/level_1/link_to_non_exec b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/link_to_non_exec new file mode 120000 index 00000000..5ae03463 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/link_to_non_exec @@ -0,0 +1 @@ +normal \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/level_1/normal b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/link_to_exec b/tests/security-manager-tests/apps_rw/non_app_dir/link_to_exec new file mode 120000 index 00000000..f1b66f37 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/non_app_dir/link_to_exec @@ -0,0 +1 @@ +exec \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/link_to_non_exec b/tests/security-manager-tests/apps_rw/non_app_dir/link_to_non_exec new file mode 120000 index 00000000..5ae03463 --- /dev/null +++ b/tests/security-manager-tests/apps_rw/non_app_dir/link_to_non_exec @@ -0,0 +1 @@ +normal \ No newline at end of file diff --git a/tests/security-manager-tests/apps_rw/non_app_dir/normal b/tests/security-manager-tests/apps_rw/non_app_dir/normal new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/apps_rw/subdir/file b/tests/security-manager-tests/apps_rw/subdir/file new file mode 100644 index 00000000..e69de29b diff --git a/tests/security-manager-tests/security_manager_tests.cpp b/tests/security-manager-tests/security_manager_tests.cpp index b7ca82dd..9234d03b 100644 --- a/tests/security-manager-tests/security_manager_tests.cpp +++ b/tests/security-manager-tests/security_manager_tests.cpp @@ -58,9 +58,10 @@ static const privileges_t SM_NO_PRIVILEGES = { static const std::vector SM_ALLOWED_GROUPS = {"db_browser", "db_alarm"}; -static const char *const SM_RW_PATH = "/usr/apps/test_DIR/app_dir"; -static const char *const SM_RO_PATH = "/usr/apps/test_DIR/app_dir_public_ro"; -static const char *const SM_DENIED_PATH = "/usr/apps/test_DIR/non_app_dir"; +static const char *const SM_RW_PATH = "/usr/apps/app_dir"; +static const char *const SM_RO_PATH = "/usr/apps/app_dir_public_ro"; +static const char *const SM_DENIED_PATH = "/usr/apps/non_app_dir"; + static const char *const ANY_USER_REPRESENTATION = "anyuser";/*this may be actually any string*/ static const std::string EXEC_FILE("exec"); static const std::string NORMAL_FILE("normal"); @@ -831,6 +832,9 @@ RUNNER_CHILD_TEST(security_manager_07_user_add_app_install) test_user.create(); test_user.getUidString(uid_string); + removeTestDirs(test_user); + createTestDirs(test_user); + install_app(sm_app_id, sm_pkg_id, test_user.getUid()); check_app_after_install(sm_app_id, sm_pkg_id); @@ -848,7 +852,7 @@ RUNNER_CHILD_TEST(security_manager_08_user_double_add_double_remove) const char *const sm_app_id = "sm_test_08_app_id_user"; const char *const sm_pkg_id = "sm_test_08_pkg_id_user"; - const char *const new_user_name = "sm_test_08_user_name"; + const std::string new_user_name = "sm_test_08_user_name"; std::string uid_string; // gumd user add @@ -856,6 +860,9 @@ RUNNER_CHILD_TEST(security_manager_08_user_double_add_double_remove) test_user.create(); test_user.getUidString(uid_string); + removeTestDirs(test_user); + createTestDirs(test_user); + addUserRequest.setUid(test_user.getUid()); addUserRequest.setUserType(SM_USER_TYPE_NORMAL); @@ -882,22 +889,25 @@ RUNNER_CHILD_TEST(security_manager_09_add_user_offline) { const char *const app_id = "security_manager_09_add_user_offline_app"; const char *const pkg_id = "security_manager_09_add_user_offline_pkg"; - const std::string username("sm_test_09_user_name"); + const std::string new_user_name("sm_test_09_user_name"); ServiceManager serviceManager("security-manager.service"); serviceManager.maskService(); serviceManager.stopService(); - TemporaryTestUser user(username, GUM_USERTYPE_NORMAL, true); - user.create(); + TemporaryTestUser test_user(new_user_name, GUM_USERTYPE_NORMAL, true); + test_user.create(); + + removeTestDirs(test_user); + createTestDirs(test_user); - install_app(app_id, pkg_id, user.getUid()); + install_app(app_id, pkg_id, test_user.getUid()); check_app_after_install(app_id, pkg_id); serviceManager.unmaskService(); serviceManager.startService(); - user.remove(); + test_user.remove(); check_app_after_uninstall(app_id, pkg_id, true); } diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/exec b/tests/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/normal b/tests/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/exec b/tests/security-manager-tests/test_DIR/app_dir/.level_1/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/level_2/exec b/tests/security-manager-tests/test_DIR/app_dir/.level_1/level_2/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/level_2/normal b/tests/security-manager-tests/test_DIR/app_dir/.level_1/level_2/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_exec b/tests/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_exec deleted file mode 120000 index a3a6771e..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_exec +++ /dev/null @@ -1 +0,0 @@ -../../non_app_dir/exec \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_normal b/tests/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_normal deleted file mode 120000 index 1fdebecc..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_normal +++ /dev/null @@ -1 +0,0 @@ -../../non_app_dir/normal \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/normal b/tests/security-manager-tests/test_DIR/app_dir/.level_1/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir/exec b/tests/security-manager-tests/test_DIR/app_dir/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/.level_2/exec b/tests/security-manager-tests/test_DIR/app_dir/level_1/.level_2/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/.level_2/normal b/tests/security-manager-tests/test_DIR/app_dir/level_1/.level_2/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/exec b/tests/security-manager-tests/test_DIR/app_dir/level_1/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/exec b/tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_exec b/tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_exec deleted file mode 120000 index f1b66f37..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_exec +++ /dev/null @@ -1 +0,0 @@ -exec \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_non_exec b/tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_non_exec deleted file mode 120000 index 5ae03463..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_non_exec +++ /dev/null @@ -1 +0,0 @@ -normal \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/normal b/tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/link_to_exec b/tests/security-manager-tests/test_DIR/app_dir/level_1/link_to_exec deleted file mode 120000 index f1b66f37..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir/level_1/link_to_exec +++ /dev/null @@ -1 +0,0 @@ -exec \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/link_to_non_exec b/tests/security-manager-tests/test_DIR/app_dir/level_1/link_to_non_exec deleted file mode 120000 index 5ae03463..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir/level_1/link_to_non_exec +++ /dev/null @@ -1 +0,0 @@ -normal \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/normal b/tests/security-manager-tests/test_DIR/app_dir/level_1/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir/link_to_exec b/tests/security-manager-tests/test_DIR/app_dir/link_to_exec deleted file mode 120000 index f1b66f37..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir/link_to_exec +++ /dev/null @@ -1 +0,0 @@ -exec \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_dir b/tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_dir deleted file mode 120000 index 4c67b099..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_dir +++ /dev/null @@ -1 +0,0 @@ -../non_app_dir \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_exec b/tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_exec deleted file mode 120000 index 94e54050..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_exec +++ /dev/null @@ -1 +0,0 @@ -../non_app_dir/exec \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_normal b/tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_normal deleted file mode 120000 index f7f5e537..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_normal +++ /dev/null @@ -1 +0,0 @@ -../non_app_dir/normal \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir/link_to_non_exec b/tests/security-manager-tests/test_DIR/app_dir/link_to_non_exec deleted file mode 120000 index 5ae03463..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir/link_to_non_exec +++ /dev/null @@ -1 +0,0 @@ -normal \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir/normal b/tests/security-manager-tests/test_DIR/app_dir/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/exec b/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/normal b/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/exec b/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/exec b/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/normal b/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/normal b/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/exec b/tests/security-manager-tests/test_DIR/app_dir_public_ro/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/exec b/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/normal b/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/exec b/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/exec b/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_exec b/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_exec deleted file mode 120000 index f1b66f37..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_exec +++ /dev/null @@ -1 +0,0 @@ -exec \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_non_exec b/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_non_exec deleted file mode 120000 index 5ae03463..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_non_exec +++ /dev/null @@ -1 +0,0 @@ -normal \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/normal b/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_exec b/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_exec deleted file mode 120000 index f1b66f37..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_exec +++ /dev/null @@ -1 +0,0 @@ -exec \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_non_exec b/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_non_exec deleted file mode 120000 index 5ae03463..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_non_exec +++ /dev/null @@ -1 +0,0 @@ -normal \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/normal b/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_exec b/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_exec deleted file mode 120000 index f1b66f37..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_exec +++ /dev/null @@ -1 +0,0 @@ -exec \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_dir b/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_dir deleted file mode 120000 index 4c67b099..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_dir +++ /dev/null @@ -1 +0,0 @@ -../non_app_dir \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_exec b/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_exec deleted file mode 120000 index 94e54050..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_exec +++ /dev/null @@ -1 +0,0 @@ -../non_app_dir/exec \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_normal b/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_normal deleted file mode 120000 index f7f5e537..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_normal +++ /dev/null @@ -1 +0,0 @@ -../non_app_dir/normal \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_exec b/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_exec deleted file mode 120000 index 5ae03463..00000000 --- a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_exec +++ /dev/null @@ -1 +0,0 @@ -normal \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/normal b/tests/security-manager-tests/test_DIR/app_dir_public_ro/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/exec b/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/normal b/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/exec b/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/exec b/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/normal b/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/normal b/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/exec b/tests/security-manager-tests/test_DIR/non_app_dir/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/exec b/tests/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/normal b/tests/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/exec b/tests/security-manager-tests/test_DIR/non_app_dir/level_1/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/exec b/tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/exec deleted file mode 100755 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_exec b/tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_exec deleted file mode 120000 index f1b66f37..00000000 --- a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_exec +++ /dev/null @@ -1 +0,0 @@ -exec \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_non_exec b/tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_non_exec deleted file mode 120000 index 5ae03463..00000000 --- a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_non_exec +++ /dev/null @@ -1 +0,0 @@ -normal \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/normal b/tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_exec b/tests/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_exec deleted file mode 120000 index f1b66f37..00000000 --- a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_exec +++ /dev/null @@ -1 +0,0 @@ -exec \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_non_exec b/tests/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_non_exec deleted file mode 120000 index 5ae03463..00000000 --- a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_non_exec +++ /dev/null @@ -1 +0,0 @@ -normal \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/normal b/tests/security-manager-tests/test_DIR/non_app_dir/level_1/normal deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/link_to_exec b/tests/security-manager-tests/test_DIR/non_app_dir/link_to_exec deleted file mode 120000 index f1b66f37..00000000 --- a/tests/security-manager-tests/test_DIR/non_app_dir/link_to_exec +++ /dev/null @@ -1 +0,0 @@ -exec \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/link_to_non_exec b/tests/security-manager-tests/test_DIR/non_app_dir/link_to_non_exec deleted file mode 120000 index 5ae03463..00000000 --- a/tests/security-manager-tests/test_DIR/non_app_dir/link_to_non_exec +++ /dev/null @@ -1 +0,0 @@ -normal \ No newline at end of file diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/normal b/tests/security-manager-tests/test_DIR/non_app_dir/normal deleted file mode 100644 index e69de29b..00000000