SM : Adjust to new path handling

Error returned when path is outside legal paths application
has changed. Also minor changes in logic resulted in different
error value when wrong uid is passed.

Change-Id: I24db386013cf8c82d511a4311c47701f70349bf6

diff --git a/src/security-manager-tests/test_cases.cpp b/src/security-manager-tests/test_cases.cpp
index 406d303613b8b74c407f2c9e74c1f3c24aec1520..c87399d31d6d7a83c2329fbd62bb037df66dbc03 100644 (file)
--- a/src/security-manager-tests/test_cases.cpp
+++ b/src/security-manager-tests/test_cases.cpp
@@ -833,7 +833,7 @@ RUNNER_CHILD_TEST(security_manager_25h_local_path_global_install)
     invalidReq.setPkgId(app.getPkgId());
     invalidReq.addPath(app.getPrivateDir(), SECURITY_MANAGER_PATH_RW);
     invalidReq.setInstallType(SM_APP_INSTALL_GLOBAL);
-    Api::install(invalidReq, (lib_retcode)SECURITY_MANAGER_ERROR_AUTHENTICATION_FAILED);
+    Api::install(invalidReq, (lib_retcode)SECURITY_MANAGER_ERROR_NOT_PATH_OWNER);
 }
 
 RUNNER_CHILD_TEST(security_manager_25i_local_path_preloaded_install)
@@ -849,7 +849,7 @@ RUNNER_CHILD_TEST(security_manager_25i_local_path_preloaded_install)
     invalidReq.setPkgId(app.getPkgId());
     invalidReq.addPath(app.getPrivateDir(), SECURITY_MANAGER_PATH_RW);
     invalidReq.setInstallType(SM_APP_INSTALL_PRELOADED);
-    Api::install(invalidReq, (lib_retcode)SECURITY_MANAGER_ERROR_AUTHENTICATION_FAILED);
+    Api::install(invalidReq, (lib_retcode)SECURITY_MANAGER_ERROR_NOT_PATH_OWNER);
 }
 
 RUNNER_CHILD_TEST(security_manager_25j_global_path_local_install)
@@ -871,6 +871,6 @@ RUNNER_CHILD_TEST(security_manager_25j_global_path_local_install)
     invalidReq.addPath(appGlobal.getPrivateDir(), SECURITY_MANAGER_PATH_RW);
     invalidReq.setInstallType(SM_APP_INSTALL_LOCAL);
 
-    Api::install(invalidReq, SECURITY_MANAGER_ERROR_AUTHENTICATION_FAILED);
+    Api::install(invalidReq, SECURITY_MANAGER_ERROR_NOT_PATH_OWNER);
 }
 

diff --git a/src/security-manager-tests/test_cases_public_sharing.cpp b/src/security-manager-tests/test_cases_public_sharing.cpp
index 05d9e82c36a0190ee7249d986bb81c466ec89f2a..d882c0fa9ac95d4c5531e357113049508a25edcc 100644 (file)
--- a/src/security-manager-tests/test_cases_public_sharing.cpp
+++ b/src/security-manager-tests/test_cases_public_sharing.cpp
@@ -248,7 +248,7 @@ RUNNER_CHILD_TEST(security_manager_82_add_invalid_path_to_app_and_check_all)
         sharedRORequest.setPkgId(nonSharedApp.getPkgId());
         sharedRORequest.addPath(sharedApp.getSharedRODir(), SECURITY_MANAGER_PATH_OWNER_RW_OTHER_RO);
         sharedRORequest.setUid(nonSharedApp.getUID());
-        Api::registerPaths(sharedRORequest, SECURITY_MANAGER_ERROR_AUTHENTICATION_FAILED);
+        Api::registerPaths(sharedRORequest, SECURITY_MANAGER_ERROR_NOT_PATH_OWNER);
     }
 }
 

diff --git a/src/security-manager-tests/test_cases_register_paths.cpp b/src/security-manager-tests/test_cases_register_paths.cpp
index 88e0896327c006b2998f98ad113a6f1893938ab1..cc98ac6700622ce008c9ed4c7533a60ddde876bc 100644 (file)
--- a/src/security-manager-tests/test_cases_register_paths.cpp
+++ b/src/security-manager-tests/test_cases_register_paths.cpp
@@ -85,7 +85,8 @@ RUNNER_TEST(security_manager_57_path_req_wrong_uid)
     preq.setInstallType(SM_APP_INSTALL_LOCAL);
     preq.addPath(app.getPrivateDir(), SECURITY_MANAGER_PATH_RW);
 
-    Api::registerPaths(preq, (lib_retcode)SECURITY_MANAGER_ERROR_SERVER_ERROR);
+    // Not sure why this shouldn't be invalid param
+    Api::registerPaths(preq, (lib_retcode)SECURITY_MANAGER_ERROR_UNKNOWN);
 }
 
 RUNNER_TEST(security_manager_58_path_req_empty_paths)
@@ -172,7 +173,7 @@ static void checkOutsidePath(const std::string& pkgId, uid_t uid, const std::str
     preq.setUid(uid);
     preq.addPath(path, SECURITY_MANAGER_PATH_RW);
 
-    Api::registerPaths(preq, (lib_retcode)SECURITY_MANAGER_ERROR_AUTHENTICATION_FAILED);
+    Api::registerPaths(preq, (lib_retcode)SECURITY_MANAGER_ERROR_NOT_PATH_OWNER);
 }
 
 RUNNER_TEST(security_manager_62_path_req_path_outside)
@@ -212,7 +213,7 @@ RUNNER_CHILD_TEST(security_manager_63a_path_req_as_user)
     preq.setInstallType(SM_APP_INSTALL_GLOBAL);
     preq.addPath(app.getPrivateDir(), SECURITY_MANAGER_PATH_RW);
 
-    Api::registerPaths(preq, SECURITY_MANAGER_ERROR_AUTHENTICATION_FAILED);
+    Api::registerPaths(preq, SECURITY_MANAGER_ERROR_NOT_PATH_OWNER);
 }
 
 RUNNER_CHILD_TEST(security_manager_63b_path_req_preloaded_as_user)
@@ -234,7 +235,7 @@ RUNNER_CHILD_TEST(security_manager_63b_path_req_preloaded_as_user)
     preq.setInstallType(SM_APP_INSTALL_PRELOADED);
     preq.addPath(app.getPrivateDir(), SECURITY_MANAGER_PATH_RW);
 
-    Api::registerPaths(preq, SECURITY_MANAGER_ERROR_AUTHENTICATION_FAILED);
+    Api::registerPaths(preq, SECURITY_MANAGER_ERROR_NOT_PATH_OWNER);
 }
 
 RUNNER_TEST(security_manager_64a_path_req_as_local_as_root)