security-manager: adapt tests to new application labeling schema 36/47336/3
authorRafal Krypa <r.krypa@samsung.com>
Thu, 3 Sep 2015 15:59:28 +0000 (17:59 +0200)
committerRafal Krypa <r.krypa@samsung.com>
Wed, 9 Sep 2015 12:33:50 +0000 (14:33 +0200)
Security-manager labeling of application files has been changed
in patch https://review.tizen.org/gerrit/46841.
Adapting tests accordingly.

Change-Id: Ie3bcbaa385845544610bfd83817a71079c99fb8e
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>
102 files changed:
packaging/security-tests.spec
src/security-manager-tests/CMakeLists.txt
src/security-manager-tests/app_files/non_app_dir/.level_1/.level_2/exec [moved from src/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/exec with 100% similarity]
src/security-manager-tests/app_files/non_app_dir/.level_1/.level_2/normal [moved from src/security-manager-tests/apps_rw/non_app_dir/normal with 100% similarity]
src/security-manager-tests/app_files/non_app_dir/.level_1/exec [moved from src/security-manager-tests/apps_rw/non_app_dir/level_1/exec with 100% similarity]
src/security-manager-tests/app_files/non_app_dir/.level_1/level_2/exec [moved from src/security-manager-tests/apps_rw/non_app_dir/level_1/.level_2/exec with 100% similarity]
src/security-manager-tests/app_files/non_app_dir/.level_1/level_2/normal [moved from src/security-manager-tests/apps_rw/non_app_dir/level_1/normal with 100% similarity]
src/security-manager-tests/app_files/non_app_dir/.level_1/normal [moved from src/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/normal with 100% similarity]
src/security-manager-tests/app_files/non_app_dir/exec [moved from src/security-manager-tests/apps_rw/non_app_dir/exec with 100% similarity]
src/security-manager-tests/app_files/non_app_dir/level_1/.level_2/exec [moved from src/security-manager-tests/apps_rw/non_app_dir/.level_1/level_2/exec with 100% similarity]
src/security-manager-tests/app_files/non_app_dir/level_1/.level_2/normal [moved from src/security-manager-tests/apps_rw/non_app_dir/level_1/.level_2/normal with 100% similarity]
src/security-manager-tests/app_files/non_app_dir/level_1/exec [moved from src/security-manager-tests/apps_rw/non_app_dir/.level_1/exec with 100% similarity]
src/security-manager-tests/app_files/non_app_dir/level_1/level_2/exec [moved from src/security-manager-tests/apps_rw/non_app_dir/.level_1/.level_2/exec with 100% similarity]
src/security-manager-tests/app_files/non_app_dir/level_1/level_2/link_to_exec [moved from src/security-manager-tests/apps_rw/non_app_dir/link_to_exec with 100% similarity]
src/security-manager-tests/app_files/non_app_dir/level_1/level_2/link_to_non_exec [moved from src/security-manager-tests/apps_rw/non_app_dir/link_to_non_exec with 100% similarity]
src/security-manager-tests/app_files/non_app_dir/level_1/level_2/normal [moved from src/security-manager-tests/apps_rw/non_app_dir/.level_1/normal with 100% similarity]
src/security-manager-tests/app_files/non_app_dir/level_1/link_to_exec [moved from src/security-manager-tests/apps_rw/non_app_dir/level_1/link_to_exec with 100% similarity]
src/security-manager-tests/app_files/non_app_dir/level_1/link_to_non_exec [moved from src/security-manager-tests/apps_rw/non_app_dir/level_1/link_to_non_exec with 100% similarity]
src/security-manager-tests/app_files/non_app_dir/level_1/normal [moved from src/security-manager-tests/apps_rw/non_app_dir/.level_1/level_2/normal with 100% similarity]
src/security-manager-tests/app_files/non_app_dir/link_to_exec [moved from src/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/link_to_exec with 100% similarity]
src/security-manager-tests/app_files/non_app_dir/link_to_non_exec [moved from src/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/link_to_non_exec with 100% similarity]
src/security-manager-tests/app_files/non_app_dir/normal [moved from src/security-manager-tests/apps_rw/non_app_dir/.level_1/.level_2/normal with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/.level_1/.level_2/exec [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/.level_1/.level_2/normal [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/normal with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/.level_1/exec [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/.level_1/level_2/exec [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/.level_2/exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/.level_1/level_2/normal [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/normal with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/.level_1/link_to_non_app_exec [moved from src/security-manager-tests/apps_rw/app_dir/.level_1/link_to_non_app_exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/.level_1/link_to_non_app_normal [moved from src/security-manager-tests/apps_rw/app_dir/.level_1/link_to_non_app_normal with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/.level_1/normal [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/normal with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/exec [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/level_1/.level_2/exec [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/level_2/exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/level_1/.level_2/normal [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/.level_2/normal with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/level_1/exec [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/level_1/level_2/exec [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/.level_2/exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/level_1/level_2/link_to_exec [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/link_to_exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/level_1/level_2/link_to_non_exec [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/level_1/level_2/normal [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/normal with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/level_1/link_to_exec [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/link_to_exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/level_1/link_to_non_exec [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/link_to_non_exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/level_1/normal [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/level_2/normal with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/link_to_exec [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/link_to_exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/link_to_non_app_dir [new symlink]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/link_to_non_app_exec [new symlink]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/link_to_non_app_normal [new symlink]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/link_to_non_exec [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/link_to_non_exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/normal [moved from src/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/.level_2/normal with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/.level_1/.level_2/exec [moved from src/security-manager-tests/apps_rw/app_dir/level_1/level_2/exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/.level_1/.level_2/normal [moved from src/security-manager-tests/apps_rw/app_dir/normal with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/.level_1/exec [moved from src/security-manager-tests/apps_rw/app_dir/level_1/exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/.level_1/level_2/exec [moved from src/security-manager-tests/apps_rw/app_dir/level_1/.level_2/exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/.level_1/level_2/normal [moved from src/security-manager-tests/apps_rw/app_dir/level_1/normal with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/.level_1/normal [moved from src/security-manager-tests/apps_rw/app_dir/level_1/level_2/normal with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/exec [moved from src/security-manager-tests/apps_rw/app_dir/exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/level_1/.level_2/exec [moved from src/security-manager-tests/apps_rw/app_dir/.level_1/level_2/exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/level_1/.level_2/normal [moved from src/security-manager-tests/apps_rw/app_dir/level_1/.level_2/normal with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/level_1/exec [moved from src/security-manager-tests/apps_rw/app_dir/.level_1/exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/level_1/level_2/exec [moved from src/security-manager-tests/apps_rw/app_dir/.level_1/.level_2/exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/level_1/level_2/link_to_exec [moved from src/security-manager-tests/apps_rw/app_dir/link_to_exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/level_1/level_2/link_to_non_exec [moved from src/security-manager-tests/apps_rw/app_dir/link_to_non_exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/level_1/level_2/normal [moved from src/security-manager-tests/apps_rw/app_dir/.level_1/normal with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/level_1/link_to_exec [moved from src/security-manager-tests/apps_rw/app_dir/level_1/link_to_exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/level_1/link_to_non_exec [moved from src/security-manager-tests/apps_rw/app_dir/level_1/link_to_non_exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/level_1/normal [moved from src/security-manager-tests/apps_rw/app_dir/.level_1/level_2/normal with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/link_to_exec [moved from src/security-manager-tests/apps_rw/app_dir/level_1/level_2/link_to_exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/link_to_non_app_dir [new symlink]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/link_to_non_app_exec [new symlink]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/link_to_non_app_normal [new symlink]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/link_to_non_exec [moved from src/security-manager-tests/apps_rw/app_dir/level_1/level_2/link_to_non_exec with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/normal [moved from src/security-manager-tests/apps_rw/app_dir/.level_1/.level_2/normal with 100% similarity]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/.level_2/exec [moved from src/security-manager-tests/apps_rw/subdir/file with 100% similarity, mode: 0755]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/.level_2/normal [new file with mode: 0644]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/exec [new file with mode: 0755]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/level_2/exec [new file with mode: 0755]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/level_2/normal [new file with mode: 0644]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/link_to_non_app_exec [new symlink]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/link_to_non_app_normal [new symlink]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/normal [new file with mode: 0644]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/exec [new file with mode: 0755]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/.level_2/exec [new file with mode: 0755]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/.level_2/normal [new file with mode: 0644]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/exec [new file with mode: 0755]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/level_2/exec [new file with mode: 0755]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/level_2/link_to_exec [new symlink]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/level_2/link_to_non_exec [new symlink]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/level_2/normal [new file with mode: 0644]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/link_to_exec [new symlink]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/link_to_non_exec [new symlink]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/normal [new file with mode: 0644]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/link_to_exec [new symlink]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/link_to_non_app_dir [new symlink]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/link_to_non_app_exec [new symlink]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/link_to_non_app_normal [new symlink]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/link_to_non_exec [new symlink]
src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/normal [new file with mode: 0644]
src/security-manager-tests/apps_rw/app_dir/link_to_non_app_dir [deleted symlink]
src/security-manager-tests/apps_rw/app_dir/link_to_non_app_exec [deleted symlink]
src/security-manager-tests/apps_rw/app_dir/link_to_non_app_normal [deleted symlink]
src/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_dir [deleted symlink]
src/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_exec [deleted symlink]
src/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_normal [deleted symlink]
src/security-manager-tests/security_manager_tests.cpp

index a3d222e..934cd96 100644 (file)
@@ -58,7 +58,6 @@ 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/ -type f -name exec -exec chmod 0755 {} +
 
 # Load permissions templates
 api_feature_loader --verbose
index 7f1d234..20bca23 100644 (file)
@@ -79,6 +79,6 @@ TARGET_LINK_LIBRARIES(${TARGET_SEC_MGR_TESTS}
 INSTALL(TARGETS ${TARGET_SEC_MGR_TESTS} DESTINATION /usr/bin)
 
 INSTALL(DIRECTORY
-    ${PROJECT_SOURCE_DIR}/src/security-manager-tests/apps_rw/
+    ${PROJECT_SOURCE_DIR}/src/security-manager-tests/app_files/
     DESTINATION /usr/apps/
 )
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/link_to_non_app_dir b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/link_to_non_app_dir
new file mode 120000 (symlink)
index 0000000..45083fb
--- /dev/null
@@ -0,0 +1 @@
+../../non_app_dir
\ No newline at end of file
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/link_to_non_app_exec b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/link_to_non_app_exec
new file mode 120000 (symlink)
index 0000000..a3a6771
--- /dev/null
@@ -0,0 +1 @@
+../../non_app_dir/exec
\ No newline at end of file
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/link_to_non_app_normal b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir/link_to_non_app_normal
new file mode 120000 (symlink)
index 0000000..1fdebec
--- /dev/null
@@ -0,0 +1 @@
+../../non_app_dir/normal
\ No newline at end of file
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/link_to_non_app_dir b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/link_to_non_app_dir
new file mode 120000 (symlink)
index 0000000..45083fb
--- /dev/null
@@ -0,0 +1 @@
+../../non_app_dir
\ No newline at end of file
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/link_to_non_app_exec b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/link_to_non_app_exec
new file mode 120000 (symlink)
index 0000000..a3a6771
--- /dev/null
@@ -0,0 +1 @@
+../../non_app_dir/exec
\ No newline at end of file
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/link_to_non_app_normal b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_public_ro/link_to_non_app_normal
new file mode 120000 (symlink)
index 0000000..1fdebec
--- /dev/null
@@ -0,0 +1 @@
+../../non_app_dir/normal
\ No newline at end of file
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/.level_2/normal b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/.level_2/normal
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/exec b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/exec
new file mode 100755 (executable)
index 0000000..e69de29
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/level_2/exec b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/level_2/exec
new file mode 100755 (executable)
index 0000000..e69de29
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/level_2/normal b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/level_2/normal
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/link_to_non_app_exec b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/link_to_non_app_exec
new file mode 120000 (symlink)
index 0000000..a3a6771
--- /dev/null
@@ -0,0 +1 @@
+../../non_app_dir/exec
\ No newline at end of file
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/link_to_non_app_normal b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/link_to_non_app_normal
new file mode 120000 (symlink)
index 0000000..1fdebec
--- /dev/null
@@ -0,0 +1 @@
+../../non_app_dir/normal
\ No newline at end of file
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/normal b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/.level_1/normal
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/exec b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/exec
new file mode 100755 (executable)
index 0000000..e69de29
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/.level_2/exec b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/.level_2/exec
new file mode 100755 (executable)
index 0000000..e69de29
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/.level_2/normal b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/.level_2/normal
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/exec b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/exec
new file mode 100755 (executable)
index 0000000..e69de29
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/level_2/exec b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/level_2/exec
new file mode 100755 (executable)
index 0000000..e69de29
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/level_2/link_to_exec b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/level_2/link_to_exec
new file mode 120000 (symlink)
index 0000000..f1b66f3
--- /dev/null
@@ -0,0 +1 @@
+exec
\ No newline at end of file
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/level_2/link_to_non_exec b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/level_2/link_to_non_exec
new file mode 120000 (symlink)
index 0000000..5ae0346
--- /dev/null
@@ -0,0 +1 @@
+normal
\ No newline at end of file
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/level_2/normal b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/level_2/normal
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/link_to_exec b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/link_to_exec
new file mode 120000 (symlink)
index 0000000..f1b66f3
--- /dev/null
@@ -0,0 +1 @@
+exec
\ No newline at end of file
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/link_to_non_exec b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/link_to_non_exec
new file mode 120000 (symlink)
index 0000000..5ae0346
--- /dev/null
@@ -0,0 +1 @@
+normal
\ No newline at end of file
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/normal b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/level_1/normal
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/link_to_exec b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/link_to_exec
new file mode 120000 (symlink)
index 0000000..f1b66f3
--- /dev/null
@@ -0,0 +1 @@
+exec
\ No newline at end of file
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/link_to_non_app_dir b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/link_to_non_app_dir
new file mode 120000 (symlink)
index 0000000..45083fb
--- /dev/null
@@ -0,0 +1 @@
+../../non_app_dir
\ No newline at end of file
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/link_to_non_app_exec b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/link_to_non_app_exec
new file mode 120000 (symlink)
index 0000000..a3a6771
--- /dev/null
@@ -0,0 +1 @@
+../../non_app_dir/exec
\ No newline at end of file
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/link_to_non_app_normal b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/link_to_non_app_normal
new file mode 120000 (symlink)
index 0000000..1fdebec
--- /dev/null
@@ -0,0 +1 @@
+../../non_app_dir/normal
\ No newline at end of file
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/link_to_non_exec b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/link_to_non_exec
new file mode 120000 (symlink)
index 0000000..5ae0346
--- /dev/null
@@ -0,0 +1 @@
+normal
\ No newline at end of file
diff --git a/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/normal b/src/security-manager-tests/app_files/sm_test_02_pkg_id_full/app_dir_ro/normal
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/src/security-manager-tests/apps_rw/app_dir/link_to_non_app_dir b/src/security-manager-tests/apps_rw/app_dir/link_to_non_app_dir
deleted file mode 120000 (symlink)
index 4c67b09..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../non_app_dir
\ No newline at end of file
diff --git a/src/security-manager-tests/apps_rw/app_dir/link_to_non_app_exec b/src/security-manager-tests/apps_rw/app_dir/link_to_non_app_exec
deleted file mode 120000 (symlink)
index 94e5405..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../non_app_dir/exec
\ No newline at end of file
diff --git a/src/security-manager-tests/apps_rw/app_dir/link_to_non_app_normal b/src/security-manager-tests/apps_rw/app_dir/link_to_non_app_normal
deleted file mode 120000 (symlink)
index f7f5e53..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../non_app_dir/normal
\ No newline at end of file
diff --git a/src/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_dir b/src/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_dir
deleted file mode 120000 (symlink)
index 4c67b09..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../non_app_dir
\ No newline at end of file
diff --git a/src/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_exec b/src/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_exec
deleted file mode 120000 (symlink)
index 94e5405..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../non_app_dir/exec
\ No newline at end of file
diff --git a/src/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_normal b/src/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_normal
deleted file mode 120000 (symlink)
index f7f5e53..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../non_app_dir/normal
\ No newline at end of file
index 0a4e75a..f504f99 100644 (file)
@@ -58,8 +58,9 @@ static const privileges_t SM_NO_PRIVILEGES  = {
 
 static const std::vector<std::string> SM_ALLOWED_GROUPS = {"db_browser", "db_alarm"};
 
-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_RW_PATH = "/usr/apps/sm_test_02_pkg_id_full/app_dir";
+static const char *const SM_RO_PATH = "/usr/apps/sm_test_02_pkg_id_full/app_dir_ro";
+static const char *const SM_PUBLIC_RO_PATH = "/usr/apps/sm_test_02_pkg_id_full/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*/
@@ -142,6 +143,11 @@ static std::string generateAppLabel(const std::string &appId)
     return "User::App::" + appId;
 }
 
+static std::string generatePkgLabel(const std::string &pkgId)
+{
+    return "User::Pkg::" + pkgId;
+}
+
 static int nftw_check_sm_labels_app_dir(const char *fpath, const struct stat *sb,
                               const char* correctLabel, bool transmute_test, bool exec_test)
 {
@@ -210,6 +216,9 @@ static void prepare_app_path()
     result = nftw(SM_RO_PATH, &nftw_remove_labels, FTW_MAX_FDS, FTW_PHYS);
     RUNNER_ASSERT_MSG(result == 0, "Unable to clean Smack labels in " << SM_RO_PATH);
 
+    result = nftw(SM_PUBLIC_RO_PATH, &nftw_remove_labels, FTW_MAX_FDS, FTW_PHYS);
+    RUNNER_ASSERT_MSG(result == 0, "Unable to clean Smack labels in " << SM_PUBLIC_RO_PATH);
+
     result = nftw(SM_DENIED_PATH, &nftw_set_labels_non_app_dir, FTW_MAX_FDS, FTW_PHYS);
     RUNNER_ASSERT_MSG(result == 0, "Unable to set Smack labels in " << SM_DENIED_PATH);
 }
@@ -219,24 +228,31 @@ static void prepare_app_env()
     prepare_app_path();
 }
 
-static void check_app_path_after_install(const char *appId)
+static void check_app_path_after_install(const char *pkgId)
 {
     int result;
 
-    nftw_expected_label = generateAppLabel(appId);
-    nftw_expected_transmute = false;
-    nftw_expected_exec = true;
+    nftw_expected_label = generatePkgLabel(pkgId);
+    nftw_expected_transmute = true;
+    nftw_expected_exec = false;
 
     result = nftw(SM_RW_PATH, &nftw_check_sm_labels, FTW_MAX_FDS, FTW_PHYS);
     RUNNER_ASSERT_MSG(result == 0, "Unable to check Smack labels for " << SM_RW_PATH);
 
-    nftw_expected_label = "User::Home";
-    nftw_expected_transmute = true;
+    nftw_expected_label = generatePkgLabel(pkgId) + "::RO";
+    nftw_expected_transmute = false;
     nftw_expected_exec = false;
 
     result = nftw(SM_RO_PATH, &nftw_check_sm_labels, FTW_MAX_FDS, FTW_PHYS);
     RUNNER_ASSERT_MSG(result == 0, "Unable to check Smack labels for " << SM_RO_PATH);
 
+    nftw_expected_label = "User::Home";
+    nftw_expected_transmute = true;
+    nftw_expected_exec = false;
+
+    result = nftw(SM_PUBLIC_RO_PATH, &nftw_check_sm_labels, FTW_MAX_FDS, FTW_PHYS);
+    RUNNER_ASSERT_MSG(result == 0, "Unable to check Smack labels for " << SM_PUBLIC_RO_PATH);
+
     result = nftw(SM_DENIED_PATH, &nftw_check_labels_non_app_dir, FTW_MAX_FDS, FTW_PHYS);
     RUNNER_ASSERT_MSG(result == 0, "Unable to check Smack labels for " << SM_DENIED_PATH);
 }
@@ -499,6 +515,7 @@ RUNNER_TEST(security_manager_02_app_install_uninstall_full)
     requestInst.addPrivilege(SM_ALLOWED_PRIVILEGES[1].c_str());
     requestInst.addPath(SM_RW_PATH, SECURITY_MANAGER_PATH_RW);
     requestInst.addPath(SM_RO_PATH, SECURITY_MANAGER_PATH_RO);
+    requestInst.addPath(SM_PUBLIC_RO_PATH, SECURITY_MANAGER_PATH_PUBLIC_RO);
 
     Api::install(requestInst);
 
@@ -507,7 +524,7 @@ RUNNER_TEST(security_manager_02_app_install_uninstall_full)
                             SM_ALLOWED_PRIVILEGES, SM_DENIED_PRIVILEGES, SM_ALLOWED_GROUPS);
 
     /* TODO: add parameters to this function */
-    check_app_path_after_install(sm_app_id);
+    check_app_path_after_install(sm_pkg_id);
 
     InstallRequest requestUninst;
     requestUninst.setAppId(sm_app_id);
@@ -650,15 +667,6 @@ static void install_and_check(const char *const sm_app_id,
                               const std::string &appDir,
                               bool requestUid)
 {
-    InstallRequest requestPublic;
-
-    //install app for non-root user and try to register public path (should fail)
-    prepare_request(requestPublic, sm_app_id, sm_pkg_id,
-                    SECURITY_MANAGER_PATH_PUBLIC, appDir.c_str(),
-                    requestUid ? user.getUid() : 0);
-
-    Api::install(requestPublic, SECURITY_MANAGER_ERROR_AUTHENTICATION_FAILED);
-
     InstallRequest requestPrivate;
 
     //install app for non-root user