Merge remote-tracking branch 'tizen/tizen' into HEAD

Change-Id: Ie1d708ebbfe9444bcbc17b017bdc8e9b7e2dfcfe

diff --git a/src/security-manager-tests/common/sm_api.cpp b/src/security-manager-tests/common/sm_api.cpp
index a6e5adf..c4a054c 100644 (file)
--- a/src/security-manager-tests/common/sm_api.cpp
+++ b/src/security-manager-tests/common/sm_api.cpp
@@ -269,6 +269,14 @@ void appHasPrivilege(const char *appId, const char *privilege, uid_t user, int &
                           << " Expected result: " << expectedResult);
 }
 
+void getSecurityManagerGroups(char ***groups, size_t *groups_count, lib_retcode expectedResult)
+{
+  int result = security_manager_groups_get(groups, groups_count);
+  RUNNER_ASSERT_MSG(static_cast<lib_retcode>(result) == expectedResult,
+                    "Unexpected result in security_manager_groups_get()" << std::endl
+                    << " Result: " << result << " Expected: " << expectedResult);
+}
+
 } // namespace Api
 
 } // namespace SecurityManagerTest

diff --git a/src/security-manager-tests/common/sm_api.h b/src/security-manager-tests/common/sm_api.h
index f5ec89d..8553303 100644 (file)
--- a/src/security-manager-tests/common/sm_api.h
+++ b/src/security-manager-tests/common/sm_api.h
@@ -46,6 +46,8 @@ void dropSharing(const SharingRequest &req, lib_retcode expectedResult = SECURIT
 void getPkgIdBySocket(int socketFd, std::string *pkgId, std::string *appId, lib_retcode expectedResult = SECURITY_MANAGER_SUCCESS);
 void getPkgIdByPid(pid_t pid, std::string *pkgId, std::string *appId, lib_retcode expectedResult = SECURITY_MANAGER_SUCCESS);
 void appHasPrivilege(const char *appId, const char *privilege, uid_t user, int &value, lib_retcode expectedResult = SECURITY_MANAGER_SUCCESS);
+void getSecurityManagerGroups(char ***groups, size_t *groups_count, lib_retcode expectedResult = SECURITY_MANAGER_SUCCESS);
+
 } // namespace Api
 
 } // namespace SecurityManagerTest

diff --git a/src/security-manager-tests/security_manager_tests.cpp b/src/security-manager-tests/security_manager_tests.cpp
index 74f2578..02ae726 100644 (file)
--- a/src/security-manager-tests/security_manager_tests.cpp
+++ b/src/security-manager-tests/security_manager_tests.cpp
@@ -2,7 +2,6 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <memory.h>
-#include <semaphore.h>
 #include <unistd.h>
 
 #include <attr/xattr.h>
@@ -1128,14 +1127,11 @@ RUNNER_MULTIPROCESS_TEST(security_manager_10_privacy_manager_fetch_whole_policy_
     users2AppsMap.insert(std::pair<std::string, std::map<std::string, std::set<std::string>>>(username, apps2PrivsMap));
     //TEST DATA END
 
-    sem_t *mutex;
-    errno = 0;
-    RUNNER_ASSERT_MSG(((mutex = sem_open("mutex", O_CREAT, 0644, 1)) != SEM_FAILED), "Failure creating mutex, errno: " << errno);
-    errno = 0;
-    RUNNER_ASSERT_MSG(sem_init(mutex, 1, 0) == 0, "failed to setup mutex, errno: " << errno);
+    SynchronizationPipe pipe;
     pid_t pid = fork();
 
     if (pid != 0) { //parent process
+        pipe.claimParentEp();
         TemporaryTestUser tmpUser(username, GUM_USERTYPE_NORMAL, false);
         tmpUser.create();
 
@@ -1160,19 +1156,17 @@ RUNNER_MULTIPROCESS_TEST(security_manager_10_privacy_manager_fetch_whole_policy_
 
             //check_app_after_install(MANY_APPS[i].c_str(), MANY_APPS_PKGS[i].c_str());
         };
+
         //Start child process
-        errno = 0;
-        RUNNER_ASSERT_MSG(sem_post(mutex) ==  0, "Error while opening mutex, errno: " << errno);
+        pipe.post();
 
         int status;
         wait(&status);
 
         tmpUser.remove();
-    };
-
-    if (pid == 0) { //child process
-        errno = 0;
-        RUNNER_ASSERT_MSG(sem_wait(mutex) == 0, "sem_wait in child process failed, errno: " << errno);
+    } else { //child process
+        pipe.claimChildEp();
+        pipe.wait();
         //the above call, registers 1 new privilege for the given user, hence the incrementation of below variable
 
         struct passwd *pw = getUserStruct(username);
@@ -1237,14 +1231,11 @@ RUNNER_MULTIPROCESS_TEST(security_manager_11_privacy_manager_fetch_whole_policy_
     ++privileges_count;
     //TEST DATA END
 
-    sem_t *mutex;
-    errno = 0;
-    RUNNER_ASSERT_MSG(((mutex = sem_open("mutex", O_CREAT, 0644, 1)) != SEM_FAILED), "Failure creating mutex, errno: " << errno);
-    errno = 0;
-    RUNNER_ASSERT_MSG(sem_init(mutex, 1, 0) == 0, "failed to setup mutex, errno: " << errno);
+    SynchronizationPipe pipe;
     pid_t pid = fork();
 
     if (pid != 0) { //parent process
+        pipe.claimParentEp();
         std::vector<TemporaryTestUser> users = {
             TemporaryTestUser(usernames.at(0), GUM_USERTYPE_NORMAL, false),
             TemporaryTestUser(usernames.at(1), GUM_USERTYPE_ADMIN, false)
@@ -1274,21 +1265,20 @@ RUNNER_MULTIPROCESS_TEST(security_manager_11_privacy_manager_fetch_whole_policy_
 
             //check_app_after_install(MANY_APPS[i].c_str(), MANY_APPS_PKGS[i].c_str());
         };
+
         //Start child
-        errno = 0;
-        RUNNER_ASSERT_MSG(sem_post(mutex) ==  0, "Error while opening mutex, errno: " << errno);
+        pipe.post();
 
         int status;
         wait(&status);
 
-        for(auto &user : users) {
+        for (auto &user : users)
             user.remove();
-        };
-    };
 
-    if (pid == 0) {
-        errno = 0;
-        RUNNER_ASSERT_MSG(sem_wait(mutex) == 0, "sem_wait in child failed, errno: " << errno);
+    } else { //child process
+        pipe.claimChildEp();
+        pipe.wait();
+
         struct passwd *pw = getUserStruct(usernames.at(0));
         register_current_process_as_privilege_manager(pw->pw_uid);
 
@@ -1354,14 +1344,11 @@ RUNNER_MULTIPROCESS_TEST(security_manager_12_privacy_manager_fetch_whole_policy_
     privileges_count += 2;
     //TEST DATA END
 
-    sem_t *mutex;
-    errno = 0;
-    RUNNER_ASSERT_MSG(((mutex = sem_open("mutex", O_CREAT, 0644, 1)) != SEM_FAILED), "Failure creating mutex, errno: " << errno);
-    errno = 0;
-    RUNNER_ASSERT_MSG(sem_init(mutex, 1, 0) == 0, "failed to setup mutex, errno: " << errno);
+    SynchronizationPipe pipe;
     pid_t pid = fork();
 
     if (pid != 0) { //parent process
+        pipe.claimParentEp();
         std::vector<TemporaryTestUser> users = {
             TemporaryTestUser(usernames.at(0), GUM_USERTYPE_NORMAL, false),
             TemporaryTestUser(usernames.at(1), GUM_USERTYPE_ADMIN, false)
@@ -1391,22 +1378,19 @@ RUNNER_MULTIPROCESS_TEST(security_manager_12_privacy_manager_fetch_whole_policy_
             //check_app_after_install(MANY_APPS[i].c_str(), MANY_APPS_PKGS[i].c_str());
         };
 
-        //Start child
-        errno = 0;
-        RUNNER_ASSERT_MSG(sem_post(mutex) ==  0, "Error while opening mutex, errno: " << errno);
+        //Start child process
+        pipe.post();
 
         //Wait for child to finish
         int status;
         wait(&status);
 
-        for(auto &user : users) {
+        for (auto &user : users)
             user.remove();
-        };
-    };
 
-    if (pid == 0) { //child process
-        errno = 0;
-        RUNNER_ASSERT_MSG(sem_wait(mutex) == 0, "sem_wait in child failed, errno: " << errno);
+    } else { //child process
+        pipe.claimChildEp();
+        pipe.wait();
 
         struct passwd *pw = getUserStruct(usernames.at(1));
         register_current_process_as_privilege_manager(pw->pw_uid, true);
@@ -1470,21 +1454,15 @@ RUNNER_MULTIPROCESS_TEST(security_manager_13_privacy_manager_fetch_policy_after_
     //TEST DATA END
 
     pid_t pid[2];
-    sem_t *mutex[2];
-    errno = 0;
-    RUNNER_ASSERT_MSG(((mutex[0] = sem_open("mutex_1", O_CREAT, 0644, 1)) != SEM_FAILED), "Failure creating mutex #1, errno: " << errno);
-    errno = 0;
-    RUNNER_ASSERT_MSG(((mutex[1] = sem_open("mutex_2", O_CREAT, 0644, 1)) != SEM_FAILED), "Failure creating mutex #2, errno: " << errno);
-    errno = 0;
-    RUNNER_ASSERT_MSG(sem_init(mutex[0], 1, 0) == 0, "failed to setup mutex #1, errno: " << errno);
-    errno = 0;
-    RUNNER_ASSERT_MSG(sem_init(mutex[1], 1, 0) == 0, "failed to setup mutex #2, errno: " << errno);
+    SynchronizationPipe sync[2];
     std::vector<PolicyEntry> policyEntries;
 
     pid[0] = fork();
 
-    if(pid[0] == 0) { //child #1 process
-        RUNNER_ASSERT_MSG(sem_wait(mutex[0]) == 0, "sem_wait in child #1 failed, errno: " << errno);
+    if (pid[0] == 0) { //child #1 process
+        sync[0].claimChildEp();
+        sync[0].wait();
+
         struct passwd *pw = getUserStruct(usernames.at(0));
         register_current_process_as_privilege_manager(pw->pw_uid);
 
@@ -1520,14 +1498,13 @@ RUNNER_MULTIPROCESS_TEST(security_manager_13_privacy_manager_fetch_policy_after_
 
         RUNNER_ASSERT_MSG(policyEntries.size() == 2, "Number of policies doesn't match - should be: 2 and is " << policyEntries.size());
         exit(0);
-    };
-
-    if (pid[0] != 0) {//parent process
+    } else { //parent process
+        sync[0].claimParentEp();
         pid[1] = fork();
 
         if (pid[1] == 0) { //child #2 process
-            errno = 0;
-            RUNNER_ASSERT_MSG(sem_wait(mutex[1]) == 0, "sem_wait in child #2 failed, errno: " << errno);
+            sync[1].claimChildEp();
+            sync[1].wait();
             struct passwd *pw_target = getUserStruct(usernames.at(0));
             struct passwd *pw = getUserStruct(usernames.at(1));
             register_current_process_as_privilege_manager(pw->pw_uid);
@@ -1558,10 +1535,8 @@ RUNNER_MULTIPROCESS_TEST(security_manager_13_privacy_manager_fetch_policy_after_
             Api::getPolicyForAdmin(filter, policyEntries, SECURITY_MANAGER_ERROR_ACCESS_DENIED);
             RUNNER_ASSERT_MSG(policyEntries.size() == 0, "Policy is not empty");
             exit(0);
-        };
-
-        if (pid[1] != 0) { //parent
-
+        } else { //parent
+            sync[1].claimParentEp();
             std::vector<TemporaryTestUser> users = {
                 TemporaryTestUser(usernames.at(0), GUM_USERTYPE_NORMAL, false),
                 TemporaryTestUser(usernames.at(1), GUM_USERTYPE_ADMIN, false)
@@ -1595,26 +1570,21 @@ RUNNER_MULTIPROCESS_TEST(security_manager_13_privacy_manager_fetch_policy_after_
 
             int status;
             //Start child #1
-            errno = 0;
-            RUNNER_ASSERT_MSG(sem_post(mutex[0]) ==  0, "Error while opening mutex #1, errno: " << errno);
+            sync[0].post();
 
             //Wait until child #1 finishes
             pid_t ret = wait(&status);
             RUNNER_ASSERT_MSG((ret != -1) && WIFEXITED(status), "Updating privileges failed");
 
             //Start child #2
-            errno = 0;
-            RUNNER_ASSERT_MSG(sem_post(mutex[1]) ==  0, "Error while opening mutex #2, errno: " << errno);
+            sync[1].post();
+
             //Wait until child #2 finishes
             ret = wait(&status);
             RUNNER_ASSERT_MSG((ret =-1) && WIFEXITED(status), "Listing privileges failed");
 
-            for(auto &user : users) {
+            for (auto &user : users)
                 user.remove();
-            };
-
-            sem_close(mutex[0]);
-            sem_close(mutex[1]);
         };
     };
 }
@@ -1646,14 +1616,11 @@ RUNNER_MULTIPROCESS_TEST(security_manager_14_privacy_manager_fetch_and_update_po
 
     privileges_count += 2;
     //TEST DATA END
-    sem_t *mutex;
-    errno = 0;
-    RUNNER_ASSERT_MSG(((mutex = sem_open("mutex", O_CREAT, 0644, 1)) != SEM_FAILED), "Failure creating mutex, errno: " << errno);
-    errno = 0;
-    RUNNER_ASSERT_MSG(sem_init(mutex, 1, 0) == 0, "failed to setup mutex, errno: " << errno);
+    SynchronizationPipe pipe;
 
     pid_t pid = fork();
     if (pid != 0) {
+        pipe.claimParentEp();
         std::vector<TemporaryTestUser> users = {
             TemporaryTestUser(usernames.at(0), GUM_USERTYPE_NORMAL, false),
             TemporaryTestUser(usernames.at(1), GUM_USERTYPE_ADMIN, false)
@@ -1682,24 +1649,21 @@ RUNNER_MULTIPROCESS_TEST(security_manager_14_privacy_manager_fetch_and_update_po
                 Api::install(requestInst);
             };
         };
+
         //Start child process
-        errno = 0;
-        RUNNER_ASSERT_MSG(sem_post(mutex) ==  0, "Error while opening mutex, errno: " << errno);
+        pipe.post();
+
         int status;
         //Wait for child process to finish
         wait(&status);
 
         //switch back to root
-        for(auto &user : users) {
+        for (auto &user : users)
             user.remove();
-        };
 
-        sem_close(mutex);
-    }
-
-    if (pid == 0) { //child process
-        errno = 0;
-        RUNNER_ASSERT_MSG(sem_wait(mutex) == 0, "sem_wait in child process failed, errno: " << errno);
+    } else { //child process
+        pipe.claimChildEp();
+        pipe.wait();
 
         struct passwd *pw = getUserStruct(usernames.at(0));
         register_current_process_as_privilege_manager(pw->pw_uid, true);
@@ -2322,11 +2286,11 @@ RUNNER_CHILD_TEST(security_manager_19_security_manager_cmd_install)
             {"security-manager-cmd --i --app=app_id_10 --pkg=pkg_id_10", FAILURE},//no uid
             {installcmd, SUCCESS},
             {"security-manager-cmd -i -a" + app_id + " -g" + pkg_id + uidopt, SUCCESS},
-            {installcmd + " --path " + path1 + " writable", SUCCESS},
+            {installcmd + " --path " + path1 + " rw", SUCCESS},
             {installcmd + " --path " + path1, FAILURE},//no path type
-            {installcmd + " --path " + path1 + " writable" + " --path " + path2 + " readable", SUCCESS},
-            {installcmd + " --path " + path1 + " prie" + " --path " + path2 + " readable", FAILURE},//wrong path type
-            {installcmd + " --path " + path1 + " writable" + " --privilege somepriv --privilege somepriv2" , SUCCESS},
+            {installcmd + " --path " + path1 + " rw" + " --path " + path2 + " ro", SUCCESS},
+            {installcmd + " --path " + path1 + " prie" + " --path " + path2 + " ro", FAILURE},//wrong path type
+            {installcmd + " --path " + path1 + " rw" + " --privilege somepriv --privilege somepriv2" , SUCCESS},
     };
 
     for (auto &op : operations) {
@@ -2845,6 +2809,7 @@ RUNNER_TEST(security_manager_30f_bad_paths)
     Api::applySharing(request, SECURITY_MANAGER_ERROR_APP_NOT_PATH_OWNER);
 
     Api::uninstall(ownerInst);
+    Api::uninstall(targetInst);
 }
 
 RUNNER_TEST(security_manager_31_simple_share)
@@ -3717,6 +3682,40 @@ RUNNER_CHILD_TEST(security_manager_47_app_has_privilege)
     Api::uninstall(requestUninst);
 }
 
+void setupPriviligeGroups(const privileges_t &priviliges, const std::vector<std::string> &groups)
+{
+    TestSecurityManagerDatabase db;
+    for (const auto &privilege : priviliges) {
+        db.setup_privilege_groups(privilege, groups);
+    }
+}
+
+RUNNER_TEST(security_manager_48_groups_get)
+{
+    const auto &groups = SM_ALLOWED_GROUPS;
+    const auto &priviliges = SM_ALLOWED_PRIVILEGES;
+    setupPriviligeGroups(priviliges, groups);
+
+    char ** c_groups;
+    size_t count = 0;
+
+    Api::getSecurityManagerGroups(&c_groups, &count);
+    RUNNER_ASSERT_MSG(count == groups.size(), "security_manager_groups_get should set count to: "
+                      << groups.size() << " but count is: " << count);
+
+    for (const auto &group : groups) {
+        bool found = false;
+        for (size_t i = 0; i < count; ++i) {
+            if (group == c_groups[i]) {
+                found = true;
+                break;
+            }
+        }
+        RUNNER_ASSERT_MSG(found, "PriviligeGroup: " << group << " was not found");
+    }
+    security_manager_groups_free(c_groups, count);
+}
+
 int main(int argc, char *argv[])
 {
     return DPL::Test::TestRunnerSingleton::Instance().ExecTestRunner(argc, argv);