Fix groups issue in tests using perm_app_set_privilege api.
[platform/core/test/security-tests.git] / tests / libprivilege-control-tests / test_cases.cpp
index ac76a5a..1a88592 100644 (file)
  *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
- */
+*/
 
 /*
  * @file        test_cases.cpp
  * @author      Jan Olszak (j.olszak@samsung.com)
  * @author      Rafal Krypa (r.krypa@samsung.com)
+ * @author      Lukasz Wojciechowski (l.wojciechow@partner.samsung.com)
  * @version     1.0
- * @brief       libprivilege-control test runer
+ * @brief       libprivilege-control test runner
  */
 
 #include <string>
-#include <stdio.h>
-#include <fcntl.h>
-#include <stdio.h>
 #include <vector>
-#include <errno.h>
 #include <memory>
-#include <ftw.h>
-#include <dpl/test/test_runner.h>
-#include <dpl/test/test_runner_child.h>
-#include <dpl/log/log.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <sys/xattr.h>
-#include <sys/smack.h>
-#include <privilege-control.h>
 #include <fstream>
+#include <sstream>
+#include <set>
 
+#include <fcntl.h>
+#include <errno.h>
+#include <unistd.h>
 
-#define SMACK_RULES_DIR  "/etc/smack/accesses.d/"
-#define SMACK_LOAD2 "/smack/load2"
-#define TEST_APP_DIR "/etc/smack/test_privilege_control_DIR/app_dir"
-#define TEST_NON_APP_DIR "/etc/smack/test_privilege_control_DIR/non_app_dir"
-#define APPID_DIR  "test_APP_ID_dir"
-#define APPID_SHARED_DIR  "test_APP_ID_shared_dir"
-#define CANARY_LABEL "tiny_yellow_canary"
-
-#define APP_ID  "test_APP"
-#define APP_SET_PRIV_PATH "/etc/smack/test_privilege_control_DIR/test_set_app_privilege/test_APP"
-#define APP_SET_PRIV_PATH_REAL "/etc/smack/test_privilege_control_DIR/test_set_app_privilege/test_APP_REAL"
-
-const char *PRIVS[] = { "WRT", "test_privilege_control_rules", NULL };
-
-#define LIBPRIVILEGE_APP_GROUP_LIST "/usr/share/privilege-control/app_group_list"
-#define LIBPRIVILEGE_TEST_DAC_FILE "/usr/share/privilege-control/test_privilege_control_rules.dac"
-
-#define APP_TEST_APP_1 "test-application1"
-#define APP_TEST_APP_2 "test-application_2"
-#define APP_TEST_APP_3 "test-app-3"
-#define APP_TEST_AV_1 "test-antivirus1"
-#define APP_TEST_AV_2 "test-antivirus_2"
-#define APP_TEST_AV_3 "test-av-3"
-#define SMACK_APPS_LABELS_DATABASE "/opt/dbspace/.privilege_control_all_apps_id.db"
-#define SMACK_AVS_LABELS_DATABASE "/opt/dbspace/.privilege_control_all_avs_id.db"
-
-#define APP_GID 5000
-#define APP_UID 5000
-#define APP_USER_NAME "app"
-#define APP_HOME_DIR "/opt/home/app"
-
-// How many open file descriptors should ftw() function use?
-#define FTW_MAX_FDS 16
-
-// Rules from test_privilege_control_rules.smack
-const std::vector< std::vector<std::string> > rules = {
-        { APP_ID, "test_book_1", "r" },
-        { APP_ID, "test_book_2", "w" },
-        { APP_ID, "test_book_3", "x" },
-        { APP_ID, "test_book_4", "rw" },
-        { APP_ID, "test_book_5", "rx" },
-        { APP_ID, "test_book_6", "wx" },
-        { APP_ID, "test_book_7", "rwx" },
-        { "test_subject_1", APP_ID, "r" },
-        { "test_subject_2", APP_ID, "w" },
-        { "test_subject_3", APP_ID, "x" },
-        { "test_subject_4", APP_ID, "rw" },
-        { "test_subject_5", APP_ID, "rx" },
-        { "test_subject_6", APP_ID, "wx" },
-        { "test_subject_7", APP_ID, "rwx" },
-        { APP_ID, APPID_SHARED_DIR, "rwxat"}};
-
-
-namespace {
-
-const char* OSP_BLAHBLAH = "/usr/share/privilege-control/OSP_blahblah.smack";
-const char* WRT_BLAHBLAH = "/usr/share/privilege-control/WGT_blahblah.smack";
-const char* OTHER_BLAHBLAH = "/usr/share/privilege-control/blahblah.smack";
-const char* OSP_BLAHBLAH_DAC = "/usr/share/privilege-control/OSP_blahblah.dac";
-const char* WRT_BLAHBLAH_DAC = "/usr/share/privilege-control/WGT_blahblah.dac";
-const char* OTHER_BLAHBLAH_DAC = "/usr/share/privilege-control/blahblah.dac";
-const char* BLAHBLAH_FEATURE = "http://feature/blah/blahblah";
-
-/**
- * Check if every rule is true.
- * @return 1 if ALL rules in SMACK, 0 if ANY rule isn't
- */
-int test_have_all_accesses(const std::vector< std::vector<std::string> >& rules){
-    int result;
-    for(uint i =0; i<rules.size();++i ){
-        result = smack_have_access(rules[i][0].c_str(),rules[i][1].c_str(),rules[i][2].c_str());
-        if (result !=1)
-            return result;
-    }
-    return 1;
-}
-
-/**
- * Check if every rule is true.
- * @return 1 if ANY rule in SMACK, 0 if
- */
-int test_have_any_accesses(const std::vector< std::vector<std::string> >& rules){
-    int result;
-    for(uint i =0; i<rules.size();++i ){
-        result = smack_have_access(rules[i][0].c_str(),rules[i][1].c_str(),rules[i][2].c_str());
-        if (result ==1)
-            return 1;
-    }
-    return 0;
-}
-
-RUNNER_TEST_GROUP_INIT(libprivilegecontrol)
-
-int nftw_remove_labels(const char *fpath, const struct stat *sb,
-                               int typeflag, struct FTW *ftwbuf)
-{
-       smack_lsetlabel(fpath, NULL, SMACK_LABEL_ACCESS);
-       smack_lsetlabel(fpath, NULL, SMACK_LABEL_EXEC);
-       smack_lsetlabel(fpath, NULL, SMACK_LABEL_TRANSMUTE);
+#include <sys/types.h>
+#include <sys/stat.h>
 
-       return 0;
-}
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/smack.h>
 
-int nftw_set_labels_non_app_dir(const char *fpath, const struct stat *sb,
-                               int typeflag, struct FTW *ftwbuf)
-{
-       smack_lsetlabel(fpath, CANARY_LABEL, SMACK_LABEL_ACCESS);
-       smack_lsetlabel(fpath, CANARY_LABEL, SMACK_LABEL_EXEC);
-       smack_lsetlabel(fpath, NULL, SMACK_LABEL_TRANSMUTE);
+#include <privilege-control.h>
+#include <dpl/test/test_runner.h>
+#include <dpl/test/test_runner_child.h>
+#include <dpl/test/test_runner_multiprocess.h>
+#include <dpl/log/log.h>
+#include <tests_common.h>
+#include <libprivilege-control_test_common.h>
+#include "common/duplicates.h"
+#include "common/db.h"
+
+// Error codes for test_libprivilege_strerror
+const std::vector<int> error_codes {
+    PC_OPERATION_SUCCESS, PC_ERR_FILE_OPERATION, PC_ERR_MEM_OPERATION, PC_ERR_NOT_PERMITTED,
+    PC_ERR_INVALID_PARAM, PC_ERR_INVALID_OPERATION, PC_ERR_DB_OPERATION, PC_ERR_DB_LABEL_TAKEN,
+    PC_ERR_DB_QUERY_PREP, PC_ERR_DB_QUERY_BIND, PC_ERR_DB_QUERY_STEP, PC_ERR_DB_CONNECTION,
+    PC_ERR_DB_NO_SUCH_APP, PC_ERR_DB_PERM_FORBIDDEN
+};
 
-       return 0;
-}
+namespace {
 
-int nftw_check_labels_non_app_dir(const char *fpath, const struct stat *sb,
-                               int typeflag, struct FTW *ftwbuf)
+std::vector<std::string> gen_names(std::string prefix, std::string suffix, size_t size)
 {
-    int result;
-    char* label;
-
-    /* ACCESS */
-    result = smack_lgetlabel(fpath, &label, SMACK_LABEL_ACCESS);
-    RUNNER_ASSERT_MSG(result == 0, "Could not get label for the path");
-    result = strcmp(CANARY_LABEL, label);
-    RUNNER_ASSERT_MSG(result == 0, "ACCESS label on " << fpath << " is overwritten");
-
-    /* EXEC */
-    result = smack_lgetlabel(fpath, &label, SMACK_LABEL_EXEC);
-    RUNNER_ASSERT_MSG(result == 0, "Could not get label for the path");
-    result = strcmp(CANARY_LABEL, label);
-    RUNNER_ASSERT_MSG(result == 0, "EXEC label on " << fpath << " is overwritten");
-
-    /* TRANSMUTE */
-    result = smack_lgetlabel(fpath, &label, SMACK_LABEL_TRANSMUTE);
-    RUNNER_ASSERT_MSG(result == 0, "Could not get label for the path");
-    RUNNER_ASSERT_MSG(label == NULL, "TRANSMUTE label on " << fpath << " is set");
-
-    return 0;
+    std::vector<std::string> names;
+    for(size_t i = 0; i < size; ++i) {
+        names.push_back(prefix + "_" + std::to_string(i) + suffix);
+    }
+    return names;
 }
 
-int nftw_check_labels_app_dir(const char *fpath, const struct stat *sb,
-                               int typeflag, struct FTW *ftwbuf)
-{
-    int result;
-    char* label;
-
-    /* ACCESS */
-    result = smack_lgetlabel(fpath, &label, SMACK_LABEL_ACCESS);
-    RUNNER_ASSERT_MSG(result == 0, "Could not get label for the path");
-    RUNNER_ASSERT_MSG(label != NULL, "ACCESS label on " << fpath << " is not set");
-    result = strcmp(APPID_DIR, label);
-    RUNNER_ASSERT_MSG(result == 0, "ACCESS label on " << fpath << " is incorrect");
-
-    /* EXEC */
-    result = smack_lgetlabel(fpath, &label, SMACK_LABEL_EXEC);
-    RUNNER_ASSERT_MSG(result == 0, "Could not get label for the path");
-    if (S_ISREG(sb->st_mode) && (sb->st_mode & S_IXUSR)) {
-        RUNNER_ASSERT_MSG(label != NULL, "EXEC label on " << fpath << " is not set");
-        result = strcmp(APPID_DIR, label);
-        RUNNER_ASSERT_MSG(result == 0, "EXEC label on executable file " << fpath << " is incorrect");
-    } else
-        RUNNER_ASSERT_MSG(label == NULL, "EXEC label on " << fpath << " is set");
-
-    /* TRANSMUTE */
-    result = smack_lgetlabel(fpath, &label, SMACK_LABEL_TRANSMUTE);
-    RUNNER_ASSERT_MSG(result == 0, "Could not get label for the path");
-    RUNNER_ASSERT_MSG(label == NULL, "TRANSMUTE label on " << fpath << " is set");
-
-    return 0;
-}
+const char *OSP_BLAHBLAH = "/usr/share/privilege-control/OSP_feature.blah.blahblah.smack";
+const char *WRT_BLAHBLAH  ="/usr/share/privilege-control/WGT_blahblah.smack";
+const char *OTHER_BLAHBLAH  ="/usr/share/privilege-control/blahblah.smack";
+const std::vector<std::string> OSP_BLAHBLAH_DAC = gen_names("/usr/share/privilege-control/OSP_feature.blah.blahblah", ".dac", 16);
+const char *WRT_BLAHBLAH_DAC  ="/usr/share/privilege-control/WGT_blahblah.dac";
+const char *OTHER_BLAHBLAH_DAC = "/usr/share/privilege-control/blahblah.dac";
+const std::vector<std::string> BLAHBLAH_FEATURE = gen_names("http://feature/blah/blahblah", "", 16);
 
 int nftw_check_labels_app_shared_dir(const char *fpath, const struct stat *sb,
-                               int typeflag, struct FTW *ftwbuf)
+                                     int /*typeflag*/, struct FTW* /*ftwbuf*/)
 {
     int result;
-    charlabel;
+    char *label;
 
     /* ACCESS */
     result = smack_lgetlabel(fpath, &label, SMACK_LABEL_ACCESS);
-    RUNNER_ASSERT_MSG(result == 0, "Could not get label for the path");
-    RUNNER_ASSERT_MSG(label != NULL, "ACCESS label on " << fpath << " is not set");
+    RUNNER_ASSERT_MSG_BT(result == 0, "Could not get label for the path");
+    RUNNER_ASSERT_MSG_BT(label != NULL, "ACCESS label on " << fpath << " is not set");
     result = strcmp(APPID_SHARED_DIR, label);
-    RUNNER_ASSERT_MSG(result == 0, "ACCESS label on " << fpath << " is incorrect");
+    RUNNER_ASSERT_MSG_BT(result == 0, "ACCESS label on " << fpath << " is incorrect");
 
+    result = smack_have_access(APP_ID, APPID_SHARED_DIR, "rwxatl");
+    RUNNER_ASSERT_MSG_BT(result == 1,
+        "Error rwxatl access was not given shared dir. Subject: " <<
+        APP_ID << ". Object: " << APPID_SHARED_DIR << ". Result: " << result);
     /* EXEC */
     result = smack_lgetlabel(fpath, &label, SMACK_LABEL_EXEC);
-    RUNNER_ASSERT_MSG(result == 0, "Could not get label for the path");
-    RUNNER_ASSERT_MSG(label == NULL, "EXEC label on " << fpath << " is set");
+    RUNNER_ASSERT_MSG_BT(result == 0, "Could not get label for the path");
+    RUNNER_ASSERT_MSG_BT(label == NULL, "EXEC label on " << fpath << " is set");
 
     /* TRANSMUTE */
     result = smack_lgetlabel(fpath, &label, SMACK_LABEL_TRANSMUTE);
-    RUNNER_ASSERT_MSG(result == 0, "Could not get label for the path");
+    RUNNER_ASSERT_MSG_BT(result == 0, "Could not get label for the path");
     if (S_ISDIR(sb->st_mode)) {
-        RUNNER_ASSERT_MSG(label != NULL, "TRANSMUTE label on " << fpath << " is not set");
+        RUNNER_ASSERT_MSG_BT(label != NULL, "TRANSMUTE label on " << fpath << " is not set");
         result = strcmp("TRUE", label);
-        RUNNER_ASSERT_MSG(result == 0, "TRANSMUTE label on " << fpath << " is not set");
+        RUNNER_ASSERT_MSG_BT(result == 0, "TRANSMUTE label on " << fpath << " is not set");
     } else
-        RUNNER_ASSERT_MSG(label == NULL, "TRANSMUTE label on " << fpath << " is set");
+        RUNNER_ASSERT_MSG_BT(label == NULL, "TRANSMUTE label on " << fpath << " is set");
 
     return 0;
 }
 
-int file_exists(const char* path)
+void osp_blahblah_dac_check(int line_no, const std::vector<unsigned> &gids, std::string dac_file_path)
 {
-    FILE* file = fopen(path, "r");
-    if (file) {
-        fclose(file);
-        return 0;
-    }
-    return -1;
-}
-
-void osp_blahblah_check(int line_no, const std::vector<std::string>& rules)
-{
-    std::ifstream smack_file(OSP_BLAHBLAH);
-    RUNNER_ASSERT_MSG(smack_file, "Line: " << line_no << " Failed to create " << OSP_BLAHBLAH);
+    std::ifstream dac_file(dac_file_path);
+    RUNNER_ASSERT_MSG_BT(dac_file, "Line: " << line_no << " Failed to create " << dac_file_path);
 
-    auto it = rules.begin();
+    auto it = gids.begin();
     std::string line;
-    while(std::getline(smack_file,line)) {
-        RUNNER_ASSERT_MSG(it != rules.end(), "Line: " << line_no << "Additional line in file: " << line);
-        RUNNER_ASSERT_MSG(*it == line, "Line: " << line_no << " " << *it << "!=" << line);
+    while (std::getline(dac_file,line)) {
+        std::istringstream is(line);
+        unsigned gid;
+        is >> gid;
+        RUNNER_ASSERT_MSG_BT(it != gids.end(), "Line: " << line_no << "Additional line in file: " << gid);
+        RUNNER_ASSERT_MSG_BT(*it == gid, "Line: " << line_no << " " << *it << "!=" << gid);
         it++;
     }
 
-    RUNNER_ASSERT_MSG(it == rules.end(), "Line: " << line_no << " Missing line in file: " << *it);
-
-    smack_file.close();
-}
-
-void osp_blahblah_dac_check(int line_no, const std::vector<unsigned>& gids)
-{
-       std::ifstream dac_file(OSP_BLAHBLAH_DAC);
-       RUNNER_ASSERT_MSG(dac_file, "Line: " << line_no << " Failed to create " << OSP_BLAHBLAH_DAC);
-
-       auto it = gids.begin();
-       std::string line;
-       while(std::getline(dac_file,line)) {
-               std::istringstream is(line);
-               unsigned gid;
-               is >> gid;
-               RUNNER_ASSERT_MSG(it != gids.end(), "Line: " << line_no << "Additional line in file: " << gid);
-               RUNNER_ASSERT_MSG(*it == gid, "Line: " << line_no << " " << *it << "!=" << gid);
-               it++;
-       }
+    RUNNER_ASSERT_MSG_BT(it == gids.end(), "Line: " << line_no << " Missing line in file: " << *it);
 
-       RUNNER_ASSERT_MSG(it == gids.end(), "Line: " << line_no << " Missing line in file: " << *it);
-
-       dac_file.close();
+    dac_file.close();
 }
 
 void remove_smack_files()
 {
-       // TODO array
+    // TODO array
     unlink(OSP_BLAHBLAH);
     unlink(WRT_BLAHBLAH);
     unlink(OTHER_BLAHBLAH);
-    unlink(OSP_BLAHBLAH_DAC);
     unlink(WRT_BLAHBLAH_DAC);
     unlink(OTHER_BLAHBLAH_DAC);
-}
-
-int smack_file_name(const char* app_id, char** path)
-{
-    if (asprintf(path, SMACK_RULES_DIR "/%s", app_id) == -1) {
-        RUNNER_ASSERT_MSG(false, "asprint failed");
-        *path = NULL;
-    }
-
-    return 0;
-}
 
-int cleaning_smack_app_files (void)
-{
-    char *path = NULL;
-    int fd = -1;
-
-    smack_file_name(APP_TEST_APP_1, &path);
-    unlink(path);
-    free(path);
-
-    smack_file_name(APP_TEST_APP_2, &path);
-    unlink(path);
-    free(path);
-
-    smack_file_name(APP_TEST_APP_3, &path);
-    unlink(path);
-    free(path);
-
-    smack_file_name(APP_TEST_AV_1, &path);
-    unlink(path);
-    free(path);
-
-    smack_file_name(APP_TEST_AV_2, &path);
-    unlink(path);
-    free(path);
+    for(size_t i=0; i<OSP_BLAHBLAH_DAC.size(); ++i)
+        unlink(OSP_BLAHBLAH_DAC[i].c_str());
 
-    smack_file_name(APP_TEST_AV_3, &path);
-    unlink(path);
-    free(path);
-
-    return 0;
+    for(size_t i=0; i<OSP_BLAHBLAH_DAC.size(); ++i)
+        unlink(OSP_BLAHBLAH_DAC[i].c_str());
 }
 
-int cleaning_smack_database_files (void)
-{
-    int fd = -1;
-
-    //clean app database
-    unlink(SMACK_APPS_LABELS_DATABASE);
-    fd = open(SMACK_APPS_LABELS_DATABASE, O_RDWR | O_EXCL | O_CREAT, 0644);
-    if (fd == -1) {
-        return -1;
-    }
-
-    //clean av database
-    unlink(SMACK_AVS_LABELS_DATABASE);
-    fd = open(SMACK_AVS_LABELS_DATABASE, O_RDWR | O_EXCL | O_CREAT, 0644);
-    if (fd == -1) {
-        return -1;
-    }
-
-    return 0;
-}
 } // namespace
 
+RUNNER_TEST_GROUP_INIT(libprivilegecontrol)
+
 /**
  * Test setting labels for all files and folders in given path.
  */
@@ -374,603 +161,879 @@ RUNNER_TEST(privilege_control02_app_label_dir)
 {
     int result;
 
-    result = app_label_shared_dir(APP_ID, APP_ID, TEST_APP_DIR);
-    RUNNER_ASSERT_MSG(result != 0, "app_label_shared_dir(APP_ADD, APP_ID) == " << result);
-
     result = nftw(TEST_APP_DIR, &nftw_remove_labels, FTW_MAX_FDS, FTW_PHYS);
-    RUNNER_ASSERT_MSG(result == 0, "Unable to clean up Smack labels in " << TEST_APP_DIR);
+    RUNNER_ASSERT_MSG_BT(result == 0, "Unable to clean up Smack labels in " << TEST_APP_DIR);
 
     result = nftw(TEST_NON_APP_DIR, &nftw_set_labels_non_app_dir, FTW_MAX_FDS, FTW_PHYS);
-    RUNNER_ASSERT_MSG(result == 0, "Unable to clean up Smack labels in " << TEST_NON_APP_DIR);
+    RUNNER_ASSERT_MSG_BT(result == 0, "Unable to clean up Smack labels in " << TEST_NON_APP_DIR);
+
+    DB_BEGIN
+
+    result = perm_app_setup_path(APPID_DIR, TEST_APP_DIR, APP_PATH_PRIVATE);
+    RUNNER_ASSERT_MSG_BT(result == 0, "perm_app_setup_path() failed");
 
-    result = app_label_dir(APPID_DIR, TEST_APP_DIR);
-    RUNNER_ASSERT_MSG(result == 0, "app_label_dir() failed");
+    DB_END
 
     result = nftw(TEST_APP_DIR, &nftw_check_labels_app_dir, FTW_MAX_FDS, FTW_PHYS);
-    RUNNER_ASSERT_MSG(result == 0, "Unable to check Smack labels for app dir");
+    RUNNER_ASSERT_MSG_BT(result == 0, "Unable to check Smack labels for app dir");
 
     result = nftw(TEST_NON_APP_DIR, &nftw_check_labels_non_app_dir, FTW_MAX_FDS, FTW_PHYS);
-    RUNNER_ASSERT_MSG(result == 0, "Unable to check Smack labels for non-app dir");
+    RUNNER_ASSERT_MSG_BT(result == 0, "Unable to check Smack labels for non-app dir");
 }
 
-RUNNER_TEST(privilege_control03_app_label_shared_dir)
+RUNNER_TEST_SMACK(privilege_control03_app_label_shared_dir)
 {
     int result;
 
+    DB_BEGIN
+
+    result = perm_app_install(APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == 0, "perm_app_install returned " << result << ". Errno: " << strerror(errno));
+
+    result = perm_app_setup_path(APP_ID, TEST_APP_DIR, APP_PATH_GROUP_RW, APP_ID);
+    RUNNER_ASSERT_MSG_BT(result != 0, "perm_app_setup_path(APP_ID, APP_ID) didn't fail");
+
+    DB_END
+
     result = nftw(TEST_APP_DIR, &nftw_remove_labels, FTW_MAX_FDS, FTW_PHYS);
-    RUNNER_ASSERT_MSG(result == 0, "Unable to clean up Smack labels in " << TEST_APP_DIR);
+    RUNNER_ASSERT_MSG_BT(result == 0, "Unable to clean up Smack labels in " << TEST_APP_DIR);
 
     result = nftw(TEST_NON_APP_DIR, &nftw_set_labels_non_app_dir, FTW_MAX_FDS, FTW_PHYS);
-    RUNNER_ASSERT_MSG(result == 0, "Unable to clean up Smack labels in " << TEST_NON_APP_DIR);
+    RUNNER_ASSERT_MSG_BT(result == 0, "Unable to clean up Smack labels in " << TEST_NON_APP_DIR);
+
+    DB_BEGIN
 
-    result = app_label_shared_dir(APP_ID, APPID_SHARED_DIR, TEST_APP_DIR);
-    RUNNER_ASSERT_MSG(result == 0, "app_label_shared_dir() failed");
+    result = perm_app_setup_path(APP_ID, TEST_APP_DIR, APP_PATH_GROUP_RW, APPID_SHARED_DIR);
+    RUNNER_ASSERT_MSG_BT(result == 0, "perm_app_setup_path() failed");
+
+    DB_END
 
     result = nftw(TEST_APP_DIR, &nftw_check_labels_app_shared_dir, FTW_MAX_FDS, FTW_PHYS);
-    RUNNER_ASSERT_MSG(result == 0, "Unable to check Smack labels for shared app dir");
+    RUNNER_ASSERT_MSG_BT(result == 0, "Unable to check Smack labels for shared app dir");
 
     result = nftw(TEST_NON_APP_DIR, &nftw_check_labels_non_app_dir, FTW_MAX_FDS, FTW_PHYS);
-    RUNNER_ASSERT_MSG(result == 0, "Unable to check Smack labels for non-app dir");
-}
+    RUNNER_ASSERT_MSG_BT(result == 0, "Unable to check Smack labels for non-app dir");
+
+    DB_BEGIN
 
+    result = perm_app_uninstall(APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == 0, "perm_app_uninstall returned " << result << ". Errno: " << strerror(errno));
+
+    DB_END
+}
 
 /**
- * Add permisions from  test_privilege_control_rules template
+ * Revoke permissions from the list. Should be executed as privileged user.
  */
-RUNNER_TEST(privilege_control04_add_permissions)
+RUNNER_CHILD_TEST_SMACK(privilege_control06_revoke_permissions_wgt)
 {
-    int result = app_add_permissions(APP_ID, PRIVS);
-    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
-            " Error adding app permissions. Errno: " << result);
-
-    // Check if the accesses are realy applied..
-    result = test_have_all_accesses(rules);
-    RUNNER_ASSERT_MSG(result==1, "Permissions not added.");
-
-    //// File exists?
-    FILE *pFile = fopen(SMACK_RULES_DIR APP_ID, "rb");
-    RUNNER_ASSERT_MSG(pFile != NULL,
-            "SMACK file NOT created!. Errno: " << errno);
-
-    //// Is it empty?
-    fseek(pFile, 0L, SEEK_END);
-    int smack_file_length = ftell(pFile);
-    RUNNER_ASSERT_MSG(smack_file_length>0,
-            "SMACK file empty, but privileges list was not empty.. Errno: " << errno);
-
-    if (pFile != NULL)
-        fclose(pFile);
-
+    test_revoke_permissions(__LINE__, WGT_APP_ID, rules_wgt, true);
 }
 
 /**
  * Revoke permissions from the list. Should be executed as privileged user.
  */
-RUNNER_CHILD_TEST(privilege_control06_revoke_permissions)
+RUNNER_CHILD_TEST_SMACK(privilege_control06_revoke_permissions_osp)
 {
+    test_revoke_permissions(__LINE__, OSP_APP_ID, rules_osp, true);
+}
+
+void test_set_app_privilege(
+                       const char* app_id, app_type_t APP_TYPE,
+                       const char** privileges, const char* type,
+                       const char* app_path, const char* dac_file,
+                       const rules_t &rules) {
+    check_app_installed(app_path);
+
     int result;
-    char* path = NULL;
-    int fd;
 
-    // Revoke permissions
-    result = app_revoke_permissions(APP_ID);
-    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS,
-            "Error revoking app permissions. Errno: " << result);
+    DB_BEGIN
+
+    result = perm_app_uninstall(app_id);
+    RUNNER_ASSERT_MSG_BT(result == 0,
+            " perm_app_uninstall returned " << result << ". "
+                    "Errno: " << strerror(errno));
+
+    result = perm_app_install(app_id);
+    RUNNER_ASSERT_MSG_BT(result == 0,
+            " perm_app_install returned " << result << ". "
+                    "Errno: " << strerror(errno));
+
+    // TEST:
+    result = perm_app_enable_permissions(app_id, APP_TYPE, privileges, true);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS,
+        " Error registering app permissions. Result: " << result);
+
+    DB_END
 
-    // Are all the permissions revoked?
     result = test_have_all_accesses(rules);
-    RUNNER_ASSERT_MSG(result!=1, "Not all permisions revoked.");
+    RUNNER_ASSERT_MSG_BT(result == 1, "Permissions not added.");
 
-    smack_file_name(APP_ID, &path);
-    fd = open(path, O_RDONLY);
-    RUNNER_ASSERT_MSG(fd >= 0, "SMACK file deleted after app_revoke_permissions");
-    RUNNER_ASSERT_MSG(lseek(fd, 0, SEEK_END) == 0, "SMACK file not empty after app_revoke_permissions");
-    free(path);
-    close(fd);
+    std::set<unsigned> groups_before;
+    read_user_gids(groups_before, APP_UID);
+
+    result = perm_app_set_privilege(app_id, type, app_path);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS,
+            " Error in perm_app_set_privilege. Error: " << result);
+
+    // Check if SMACK label really set
+    char *label;
+    result = smack_new_label_from_self(&label);
+    RUNNER_ASSERT_MSG_BT(result >= 0,
+            " Error getting current process label");
+    RUNNER_ASSERT_MSG_BT(label != NULL,
+            " Process label is not set");
+    result = strcmp(app_id, label);
+    RUNNER_ASSERT_MSG_BT(result == 0,
+            " Process label " << label << " is incorrect");
+
+    check_groups(groups_before, dac_file);
 }
 
-static void read_gids(std::set<unsigned> &set, const char* file_path)
+/**
+ * Set APP privileges. wgt.
+ */
+RUNNER_CHILD_TEST_SMACK(privilege_control05_set_app_privilege_wgt)
 {
-       FILE *f = fopen(file_path, "r");
-       RUNNER_ASSERT_MSG(f != NULL, "Unable to open file " << file_path);
-       unsigned gid;
-       while (fscanf(f, "%u\n", &gid) == 1) {
-               set.insert(gid);
-       }
+    test_set_app_privilege(WGT_APP_ID, APP_TYPE_WGT, PRIVS_WGT, "wgt", WGT_APP_PATH,
+            LIBPRIVILEGE_TEST_DAC_FILE_WGT, rules_wgt);
 }
 
-RUNNER_TEST(privilege_control05_add_shared_dir_readers)
+/**
+ * Set APP privileges. osp app.
+ */
+RUNNER_CHILD_TEST_SMACK(privilege_control05_set_app_privilege_osp)
 {
+    test_set_app_privilege(OSP_APP_ID, APP_TYPE_OSP, PRIVS_OSP, "tpk", OSP_APP_PATH,
+            LIBPRIVILEGE_TEST_DAC_FILE_OSP, rules_osp);
+}
 
-#define  TEST_OBJ "TEST_OBJECT"
-#define  TEST_OBJ_SOME_OTHER "TEST_OBJA"
-#define test_string_01 "TEST_raz TEST_OBJECT r-x-- -----"
-#define test_string_21 "TEST_trzy TEST_OBJA -wx--\n"
-#define test_string_22 "TEST_trzy TEST_OBJECT r-x-- -----\n"
+RUNNER_CHILD_TEST_SMACK(privilege_control05_set_app_privilege_efl)
+{
+    test_set_app_privilege(EFL_APP_ID, APP_TYPE_EFL, PRIVS_EFL,
+            "rpm", EFL_APP_PATH,
+            LIBPRIVILEGE_TEST_DAC_FILE_EFL, rules_efl);
+}
 
+/**
+ * Add new API feature
+ */
+RUNNER_TEST(privilege_control11_add_api_feature)
+{
     int result;
-    int i;
-    int fd = -1;
-    char *path;
-    const char *app_labels[] = {"TEST_raz", "TEST_dwa", "TEST_trzy", ""};
-    const int READ_BUF_SIZE = 1000;
-    char buf[READ_BUF_SIZE];
-    FILE *file = NULL;
-    struct smack_accesses * rules = NULL;
-
-    result = smack_accesses_new(&rules);
-    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in smack_accesses_new. Error: " << result);
-
-    for (i = 0; i < 3; i++) {
-
-        (void)app_uninstall(app_labels[i]);
-        result = app_install(app_labels[i]);
-        RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in app_install.");
-
-        asprintf(&path, SMACK_RULES_DIR "/%s", app_labels[i]);
-        fd = open(path, O_WRONLY, 0644);
-        RUNNER_ASSERT_MSG(fd != -1, "Error in opening file " << path);
-
-        if (i == 1) {
-               result = smack_accesses_add(rules,app_labels[i],TEST_OBJ,"wt");
-               RUNNER_ASSERT_MSG(result == 0, "smack_accesses_add failed");
-        }
-        if (i == 2) {
-               smack_accesses_free(rules);
-               result = smack_accesses_new(&rules);
-               result = smack_accesses_add(rules,app_labels[i],TEST_OBJ_SOME_OTHER,"wx");
-               RUNNER_ASSERT_MSG(result == 0, "smack_accesses_add failed");
-        }
-        result = smack_accesses_apply(rules);
-        RUNNER_ASSERT_MSG(fd != -1, "smack_accesses_apply failed");
 
-        result = smack_accesses_save(rules, fd);
-        RUNNER_ASSERT_MSG(fd != -1, "smack_accesses_apply failed");
+    remove_smack_files();
 
-        free(path);
-        close(fd);
+    DB_BEGIN
 
-    }
+    // argument validation
+    result = perm_add_api_feature(APP_TYPE_OSP, NULL, NULL, NULL, 0);
+    RUNNER_ASSERT_BT(result == PC_ERR_INVALID_PARAM);
+
+    result = perm_add_api_feature(APP_TYPE_OSP,"", NULL, NULL, 0);
+    RUNNER_ASSERT_BT(result == PC_ERR_INVALID_PARAM);
+
+
+    // Already existing feature:
+    // TODO: Database will be malformed. (Rules for these features will be removed.)
+    result = perm_add_api_feature(APP_TYPE_OSP,"http://tizen.org/privilege/messaging.read", NULL, NULL, 0);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "perm_add_api_feature returned: " << result);
+
+    result = perm_add_api_feature(APP_TYPE_WGT,"http://tizen.org/privilege/messaging.sms", NULL, NULL, 0);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "perm_add_api_feature returned: " << result);
+
+    // empty features
+    result = perm_add_api_feature(APP_TYPE_OSP,"blahblah", NULL, NULL, 0);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "perm_add_api_feature returned: " << result);
+
+    result = perm_add_api_feature(APP_TYPE_WGT,"blahblah", NULL, NULL, 0);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "perm_add_api_feature returned: " << result);
+
+    // empty rules
+    const char *test1[] = { NULL };
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE[0].c_str(), test1, NULL, 0);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "perm_add_api_feature returned: " << result);
+
+    const char *test2[] = { "", NULL };
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE[1].c_str(), test2, NULL, 0);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "perm_add_api_feature returned: " << result);
 
-    smack_accesses_free(rules);
+    const char *test3[] = { " \t\n", "\t \n", "\n\t  ", NULL };
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE[2].c_str(), test3, NULL, 0);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "perm_add_api_feature returned: " << result);
 
-    // THE TEST - accesses
+    // malformed rules
+    const char *test4[] = { "malformed", NULL };
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE[3].c_str(), test4, NULL, 0);
+    RUNNER_ASSERT_MSG_BT(result == PC_ERR_INVALID_PARAM, "perm_add_api_feature returned: " << result);
+
+    const char *test5[] = { "malformed malformed", NULL };
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE[4].c_str(), test5, NULL, 0);
+    RUNNER_ASSERT_MSG_BT(result == PC_ERR_INVALID_PARAM, "perm_add_api_feature returned: " << result);
+
+    const char *test6[] = { "-malformed malformed rwxat", NULL };
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE[5].c_str(), test6, NULL, 0);
+    RUNNER_ASSERT_MSG_BT(result == PC_ERR_INVALID_PARAM, "perm_add_api_feature returned: " << result);
 
-    result = add_shared_dir_readers(TEST_OBJ,app_labels);
-    RUNNER_ASSERT_MSG(result == 0, "add_shared_dir_readers failed");
+    const char *test7[] = { "~/\"\\ malformed rwxat", NULL };
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE[6].c_str(), test7, NULL, 0);
+    RUNNER_ASSERT_MSG_BT(result == PC_ERR_INVALID_PARAM, "perm_add_api_feature returned: " << result);
 
-    result = smack_have_access(app_labels[0],TEST_OBJ,"rx");
-    RUNNER_ASSERT_MSG(result == 1, "add_shared_dir_readers ERROR");
+    const char *test8[] = { "subject object rwxat something else", NULL };
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE[7].c_str(), test8, NULL, 0);
+    RUNNER_ASSERT_MSG_BT(result == PC_ERR_INVALID_PARAM, "perm_add_api_feature returned: " << result);
+
+
+    // correct rules
+    const char *test9[] = {
+            "~APP~    object\t rwxatl",
+            " \t \n",
+            "subject2\t~APP~ ltxarw",
+            "",
+            NULL};
 
-    result = smack_have_access(app_labels[1],TEST_OBJ,"rx");
-    RUNNER_ASSERT_MSG(result == 1, "add_shared_dir_readers ERROR");
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE[8].c_str(), test9, NULL, 0);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "perm_add_api_feature returned: " << result);
 
-    result = smack_have_access(app_labels[2],TEST_OBJ,"rx");
-    RUNNER_ASSERT_MSG(result == 1, "add_shared_dir_readers ERROR");
+    const char *test10[] = { "Sub::jE,ct ~APP~ a-rwxl", NULL };
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE[9].c_str(), test10, NULL, 0);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "perm_add_api_feature returned: " << result);
 
-    result = smack_have_access(app_labels[1],TEST_OBJ,"rwxt");
-    RUNNER_ASSERT_MSG(result == 1, "add_shared_dir_readers ERROR");
+    const char *test11[] = { "Sub::sjE,ct ~APP~ a-RwXL", NULL }; // TODO This fails.
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE[10].c_str(), test11, NULL, 0);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "perm_add_api_feature returned: " << result);
 
-    result = smack_have_access(app_labels[2],TEST_OBJ_SOME_OTHER,"wx");
-    RUNNER_ASSERT_MSG(result == 1, "add_shared_dir_readers ERROR");
+
+    // TODO For now identical/complementary rules are not merged.
+    const char *test12[] = {
+            "subject1 ~APP~ rwxatl",
+            " \t \n",
+            "subject2 ~APP~ ltxarw",
+            "",
+            NULL};
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE[11].c_str(), test12, NULL, 0);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "perm_add_api_feature returned: " << result);
+
+    // empty group ids
+    const char *test13[] = { "~APP~ b a", NULL};
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE[12].c_str(), test13,(const gid_t[]) {0,1,2},0);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "perm_add_api_feature returned: " << result);
+    result = file_exists(OSP_BLAHBLAH_DAC[12].c_str());
+    RUNNER_ASSERT_BT(result == -1);
+    remove_smack_files();
 
 
-    //TEST the operations on empty files
+    // valid group ids
+    result = perm_add_api_feature(APP_TYPE_OSP,BLAHBLAH_FEATURE[13].c_str(), test13,(const gid_t[]) {0,1,2},3);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "perm_add_api_feature returned: " << result);
+    osp_blahblah_dac_check(__LINE__, {0,1,2}, OSP_BLAHBLAH_DAC[13]);
+    remove_smack_files();
 
-    asprintf(&path, SMACK_RULES_DIR "/%s", app_labels[0]);
-    file = fopen(path, "r");
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE[14].c_str(), test13,(const gid_t[]) {0,1,2},1);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "perm_add_api_feature returned: " << result);
+    osp_blahblah_dac_check(__LINE__, {0}, OSP_BLAHBLAH_DAC[14]);
+    remove_smack_files();
 
-    RUNNER_ASSERT_MSG(file, "fopen failed, errno:" << errno);
+    result = perm_add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE[15].c_str(), test13,(const gid_t[]) {1,1,1},3);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "perm_add_api_feature returned: " << result);
+    osp_blahblah_dac_check(__LINE__, {1,1,1},OSP_BLAHBLAH_DAC[15]);
+    remove_smack_files();
 
-    fgets(buf, READ_BUF_SIZE, file);
-    result = strcmp(buf, test_string_01);
-    RUNNER_ASSERT_MSG( result!=0, "add_shared_dir_readers ERROR, file not formatted" << path );
+    DB_END
+}
 
-    free(path);
-    fclose(file);
+/*
+ * Check perm_app_uninstall function
+ */
+void check_perm_app_uninstall(const char* pkg_id)
+{
+    int result;
 
-    //TEST the operations on non empty files
-    asprintf(&path, SMACK_RULES_DIR "/%s", app_labels[2]);
-    file = NULL;
-    file = fopen(path, "r");
-    RUNNER_ASSERT_MSG(file, "fopen failed, errno:" << errno);
+    DB_BEGIN
 
-    fgets(buf, READ_BUF_SIZE, file);
-    result = strcmp(buf, test_string_21);
-    RUNNER_ASSERT_MSG( result==0, "add_shared_dir_readers ERROR, file not formatted" );
+    result = perm_app_uninstall(pkg_id);
+    RUNNER_ASSERT_MSG_BT(result == 0, "perm_app_uninstall returned: " << perm_strerror(result));
 
-    fgets(buf, READ_BUF_SIZE, file);
-    result = strcmp(buf, test_string_22);
-    RUNNER_ASSERT_MSG( result==0, "add_shared_dir_readers ERROR, file not formatted" );
+    DB_END
 
-    free(path);
-    fclose(file);
+    TestLibPrivilegeControlDatabase db_test;
+    db_test.test_db_after__perm_app_uninstall(pkg_id);
 }
 
+RUNNER_TEST(privilege_control07_app_uninstall)
+{
+    check_perm_app_uninstall(APP_ID);
+}
 
-/**
- * Set APP privileges.
+/*
+ * Check perm_app_install function
  */
-RUNNER_CHILD_TEST(privilege_control05_set_app_privilege)
+void check_perm_app_install(const char* pkg_id)
 {
     int result;
 
-    // Preset exec label
-    smack_lsetlabel(APP_SET_PRIV_PATH_REAL, APP_ID, SMACK_LABEL_EXEC);
-    smack_lsetlabel(APP_SET_PRIV_PATH, APP_ID "_symlink", SMACK_LABEL_EXEC);
+    DB_BEGIN
 
-    // Set APP privileges
-    result = set_app_privilege(APP_ID, NULL, APP_SET_PRIV_PATH);
-    RUNNER_ASSERT_MSG(result == PC_OPERATION_SUCCESS, "Error in set_app_privilege. Error: " << result);
+    result = perm_app_install(pkg_id);
+    RUNNER_ASSERT_MSG_BT(result == 0, "perm_app_install returned: " << perm_strerror(result));
 
-    // Check if SMACK label really set
-    char * label;
-    result = smack_new_label_from_self(&label);
-    RUNNER_ASSERT_MSG(result == 0, "Error getting current process label");
-    RUNNER_ASSERT_MSG(label != NULL, "Process label is not set");
-    result = strcmp(APP_ID, label);
-    RUNNER_ASSERT_MSG(result == 0, "Process label " << label << " is incorrect");
-
-    // Check if DAC privileges really set
-    RUNNER_ASSERT_MSG(getuid() == APP_UID, "Wrong UID");
-    RUNNER_ASSERT_MSG(getgid() == APP_GID, "Wrong GID");
-
-    result = strcmp(getenv("HOME"), APP_HOME_DIR);
-    RUNNER_ASSERT_MSG(result == 0, "Wrong HOME DIR");
-
-    result = strcmp(getenv("USER"), APP_USER_NAME);
-    RUNNER_ASSERT_MSG(result == 0, "Wrong user USER NAME");
-
-    std::set<unsigned> groups_check;
-    read_gids(groups_check, LIBPRIVILEGE_APP_GROUP_LIST);
-    read_gids(groups_check, LIBPRIVILEGE_TEST_DAC_FILE);
-
-    int groups_cnt = getgroups(0, NULL);
-    RUNNER_ASSERT_MSG(groups_cnt > 0, "Wrong number of supplementary groupsCnt");
-    gid_t *groups_list = (gid_t *) calloc(groups_cnt, sizeof(gid_t));
-    RUNNER_ASSERT_MSG(groups_list != NULL, "Memory allocation failed");
-    getgroups(groups_cnt, groups_list);
-
-    for (int i = 0; i < groups_cnt; ++i) {
-        if (groups_check.erase(groups_list[i]) == 0) {
-            // getgroups() may also return process' main group
-            if (groups_list[i] == getgid())
-                RUNNER_ASSERT_MSG(false, "Application belongs to unknown group (GID=" << groups_list[i] << ")");
-        }
-    }
-    std::string groups_left;
-    for (std::set<unsigned>::iterator it = groups_check.begin(); it != groups_check.end(); it++) {
-        groups_left.append(std::to_string(*it)).append(" ");
-    }
-    RUNNER_ASSERT_MSG(groups_check.empty(), "Application doesn't belong to some required groups: " << groups_left);
+    DB_END
+
+    TestLibPrivilegeControlDatabase db_test;
+    db_test.test_db_after__perm_app_install(pkg_id);
 }
 
-RUNNER_TEST(privilege_control08_app_give_access)
+RUNNER_TEST(privilege_control01_app_install)
 {
-    const char *subject = "lkjq345v34sfa";
-    const char *object = "lk9290f92lkjz";
-    smack_accesses *tmp = NULL;
+    check_perm_app_uninstall(APP_ID);
+    check_perm_app_install(APP_ID);
+    // try install second time app with the same ID - it should pass.
+    check_perm_app_install(APP_ID);
+}
 
-    RUNNER_ASSERT(0 == smack_accesses_new(&tmp));
+/*
+ * Check perm_rollback function
+ */
+RUNNER_TEST(privilege_control07_app_rollback)
+{
+    check_perm_app_uninstall(APP_ID);
+
+    int result;
+
+    DB_BEGIN
+
+    result = perm_app_install(APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == 0, "perm_app_install returned: " << perm_strerror(result));
+
+    // transaction rollback
+    result = perm_rollback();
+    RUNNER_ASSERT_MSG_BT(result == 0, "perm_rollback returned: " << perm_strerror(result));
+
+    DB_END
+
+    TestLibPrivilegeControlDatabase db_test;
+    db_test.test_db_after__perm_app_uninstall(APP_ID);
+
+}
 
-    std::unique_ptr<smack_accesses,std::function<void(smack_accesses*)>>
-        smack(tmp, smack_accesses_free);
+RUNNER_TEST(privilege_control07_app_rollback_2)
+{
+    check_perm_app_uninstall(APP_ID);
+
+    int result;
 
-    RUNNER_ASSERT(0 == smack_accesses_add(smack.get(), subject, object, "r--a-"));
-    RUNNER_ASSERT(0 == smack_accesses_apply(smack.get()));
+    DB_BEGIN
 
-    app_give_access(subject, object, "wt");
+    result = perm_app_install(APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == 0, "perm_app_install returned: " << perm_strerror(result));
 
-    RUNNER_ASSERT(1 == smack_have_access(subject, object, "rwat"));
-    RUNNER_ASSERT(0 == smack_have_access(subject, object, "x"));
+    // transaction rollback
+    result = perm_rollback();
+    RUNNER_ASSERT_MSG_BT(result == 0, "perm_rollback returned: " << perm_strerror(result));
 
-    app_revoke_access(subject, object);
+    // install once again after the rollback
+    result = perm_app_install(APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == 0, "perm_app_install returned: " << perm_strerror(result));
 
-    RUNNER_ASSERT(1 == smack_have_access(subject, object, "ra"));
-    RUNNER_ASSERT(0 == smack_have_access(subject, object, "w"));
-    RUNNER_ASSERT(0 == smack_have_access(subject, object, "x"));
-    RUNNER_ASSERT(0 == smack_have_access(subject, object, "t"));
+    DB_END
 
-    RUNNER_ASSERT(0 == smack_accesses_add(smack.get(), subject, object, "-"));
-    RUNNER_ASSERT(0 == smack_accesses_apply(smack.get()));
+    TestLibPrivilegeControlDatabase db_test;
+    db_test.test_db_after__perm_app_install(APP_ID);
 }
 
 /**
- * Add new API feature
+ * Grant SMACK permissions based on permissions list.
  */
-RUNNER_TEST(privilege_control09_add_api_feature)
+RUNNER_TEST_SMACK(privilege_control11_app_enable_permissions)
 {
     int result;
 
-    remove_smack_files();
+    // Clean up after test:
+    DB_BEGIN
 
+    result = perm_app_uninstall(WGT_APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "perm_app_uninstall returned " << result << ". Errno: " << strerror(errno));
+    result = perm_app_install(WGT_APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "perm_app_install returned " << result << ". Errno: " << strerror(errno));
 
-    // argument validation
-    result = add_api_feature(APP_TYPE_OSP, NULL, NULL, NULL, 0);
-    RUNNER_ASSERT(result == PC_ERR_INVALID_PARAM);
+/**
+ * Test - Enabling all permissions with persistant mode enabled
+ */
+    result = perm_app_revoke_permissions(WGT_APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS,
+        "Error revoking app permissions. Result: " << result);
 
-    result = add_api_feature(APP_TYPE_OSP,"" , NULL, NULL, 0);
-    RUNNER_ASSERT(result == PC_ERR_INVALID_PARAM);
+    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2, true);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS,
+        " Error registering app permissions. Result: " << result);
 
+    DB_END
 
-    // already existing features
-    result = add_api_feature(APP_TYPE_OSP,"messaging" , NULL, NULL, 0);
-    RUNNER_ASSERT(result == PC_ERR_INVALID_PARAM);
+    // Check if the accesses are realy applied..
+    result = test_have_all_accesses(rules2);
+    RUNNER_ASSERT_MSG_BT(result == 1, "Permissions not added.");
 
-    result = add_api_feature(APP_TYPE_OSP,"blahblah/messaging" , NULL, NULL, 0);
-    RUNNER_ASSERT(result == PC_ERR_INVALID_PARAM);
+    DB_BEGIN
 
-    result = add_api_feature(APP_TYPE_WGT,"blahblahblah/messaging" , NULL, NULL, 0);
-    RUNNER_ASSERT(result == PC_ERR_INVALID_PARAM);
+    // Clean up
+    result = perm_app_revoke_permissions(WGT_APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS,
+        "Error revoking app permissions. Result: " << result);
 
-    result = add_api_feature(APP_TYPE_OTHER,"blah/messaging" , NULL, NULL, 0);
-    RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
+    DB_END
 
+/**
+ * Test - Enabling all permissions with persistant mode disabled
+ */
 
-    // empty features
-    result = add_api_feature(APP_TYPE_OSP,"blahblah" , NULL, NULL, 0);
-    RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
+    DB_BEGIN
+    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2, true);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS,
+        " Error registering app permissions. Result: " << result);
 
-    result = add_api_feature(APP_TYPE_WGT,"blahblah" , NULL, NULL, 0);
-    RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
+    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2, 0);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS,
+        " Error enabling app permissions. Result: " << result);
 
-    result = add_api_feature(APP_TYPE_OTHER,"blahblah" , NULL, NULL, 0);
-    RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
+    DB_END
 
+    // Check if the accesses are realy applied..
+    result = test_have_all_accesses(rules2);
+    RUNNER_ASSERT_MSG_BT(result == 1, "Permissions not added.");
 
-    // smack files existence
-    result = file_exists(OSP_BLAHBLAH);
-    RUNNER_ASSERT(result == -1);
+    DB_BEGIN
 
-    result = file_exists(WRT_BLAHBLAH);
-    RUNNER_ASSERT(result == -1);
+    // Clean up
+    result = perm_app_revoke_permissions(WGT_APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS,
+        "Error revoking app permissions. Result: " << result);
 
-    result = file_exists(OTHER_BLAHBLAH);
-    RUNNER_ASSERT(result == -1);
+    DB_END
 
+/**
+ * Test - Registering new permissions in two complementary files
+ */
 
-    // empty rules
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE , { NULL }, NULL, 0);
-    RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
-    result = file_exists(OSP_BLAHBLAH);
-    RUNNER_ASSERT(result == -1);
-
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE , (const char*[]){ "", NULL }, NULL, 0);
-    RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
-    result = file_exists(OSP_BLAHBLAH);
-    RUNNER_ASSERT(result == 0);
-    remove_smack_files();
+    DB_BEGIN
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE , (const char*[]){ " \t\n", "\t \n", "\n\t  ", NULL }, NULL, 0);
-    RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
-    result = file_exists(OSP_BLAHBLAH);
-    RUNNER_ASSERT(result == 0);
-    remove_smack_files();
+    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_R_AND_NO_R, true);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS,
+        " Error registering app permissions. Result: " << result);
 
+    DB_END
 
-    // malformed rules
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE , (const char*[]){ "malformed", NULL }, NULL, 0);
-    RUNNER_ASSERT(result == PC_ERR_INVALID_PARAM);
-    result = file_exists(OSP_BLAHBLAH);
-    RUNNER_ASSERT(result == -1);
+    // Check if the accesses are realy applied..
+    result = test_have_all_accesses(rules2_no_r);
+    RUNNER_ASSERT_MSG_BT(result == 1, "Permissions not added.");
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE , (const char*[]){ "malformed malformed", NULL }, NULL, 0);
-    RUNNER_ASSERT(result == PC_ERR_INVALID_PARAM);
-    result = file_exists(OSP_BLAHBLAH);
-    RUNNER_ASSERT(result == -1);
+    DB_BEGIN
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE , (const char*[]){ "-malformed malformed rwxat", NULL }, NULL, 0);
-    RUNNER_ASSERT(result == PC_ERR_INVALID_PARAM);
-    result = file_exists(OSP_BLAHBLAH);
-    RUNNER_ASSERT(result == -1);
+    // Clean up
+    result = perm_app_revoke_permissions(WGT_APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS,
+        "Error revoking app permissions. Result: " << result);
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE , (const char*[]){ "~/\"\\\ malformed rwxat", NULL }, NULL, 0);
-    RUNNER_ASSERT(result == PC_ERR_INVALID_PARAM);
-    result = file_exists(OSP_BLAHBLAH);
-    RUNNER_ASSERT(result == -1);
+    DB_END
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE , (const char*[]){ "subject object rwxat something else", NULL }, NULL, 0);
-    RUNNER_ASSERT(result == PC_ERR_INVALID_PARAM);
-    result = file_exists(OSP_BLAHBLAH);
-    RUNNER_ASSERT(result == -1);
+/**
+ * Test - Enabling some permissions and then enabling complementary permissions
+ */
 
+    DB_BEGIN
 
-    // correct rules
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE , (const char*[]){ "malformed malformed maaaaaalformed", NULL }, NULL, 0);
-    RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
-    osp_blahblah_check(__LINE__, { "malformed malformed r--a-" });
-    remove_smack_files();
+    // Register permission for rules 2 no r
+    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_NO_R, true);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS,
+        " Error registering app permissions without r. Result: " << result);
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE , (const char*[]){ "subject object foo", NULL }, NULL, 0);
-    RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
-    osp_blahblah_check(__LINE__, { "subject object -----" });
-    remove_smack_files();
+    DB_END
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE , (const char*[]){
-        "subject    object\t rwxat",
-        " \t \n",
-        "subject2\tobject2 txarw",
-        "",
-        NULL }, NULL, 0);
-    RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
-    osp_blahblah_check(__LINE__, { "subject object rwxat", "subject2 object2 rwxat"});
-    remove_smack_files();
+    // Check if the accesses are realy applied..
+    result = test_have_all_accesses(rules2_no_r);
+    RUNNER_ASSERT_MSG_BT(result == 1, "Permissions without r not added.");
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE , (const char*[]){
-        "Sub::jE,ct object a-RwX",
-        NULL }, NULL, 0);
-    RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
-    osp_blahblah_check(__LINE__, { "Sub::jE,ct object rwxa-"});
-    remove_smack_files();
+    DB_BEGIN
 
-    // TODO For now identical/complementary rules are not merged.
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE , (const char*[]){
-        "subject object rwxat",
-        " \t \n",
-        "subject object txarw",
-        "",
-        NULL }, NULL, 0);
-    RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
-    osp_blahblah_check(__LINE__, { "subject object rwxat", "subject object rwxat"});
-    remove_smack_files();
+    // Register permission for rules 2
+    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2, true);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS,
+        " Error registering app all permissions. Result: " << result);
 
+    DB_END
 
-    // empty group ids
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE , (const char*[]){"a a a",NULL},(const gid_t[]){0,1,2},0);
-    RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
-    osp_blahblah_check(__LINE__, { "a a ---a-"});
-    result = file_exists(OSP_BLAHBLAH_DAC);
-    RUNNER_ASSERT(result == -1);
-    remove_smack_files();
+    // Check if the accesses are realy applied..
+    result = test_have_all_accesses(rules2);
+    RUNNER_ASSERT_MSG_BT(result == 1, "Permissions all not added.");
 
+    DB_BEGIN
 
-    // valid group ids
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE , (const char*[]){"a a a",NULL},(const gid_t[]){0,1,2},3);
-    printf("%d \n", result);
-    RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
-    osp_blahblah_check(__LINE__, { "a a ---a-"});
-    osp_blahblah_dac_check(__LINE__, {0,1,2});
-    remove_smack_files();
+    // Clean up
+    result = perm_app_revoke_permissions(WGT_APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS,
+        "Error revoking app permissions. Result: " << result);
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE , (const char*[]){"a a a",NULL},(const gid_t[]){0,1,2},1);
-    RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
-    osp_blahblah_check(__LINE__, { "a a ---a-"});
-    osp_blahblah_dac_check(__LINE__, {0});
-    remove_smack_files();
+/**
+ * Test - Enabling some permissions and then enabling all permissions
+ */
 
-    result = add_api_feature(APP_TYPE_OSP, BLAHBLAH_FEATURE , (const char*[]){"a a a",NULL},(const gid_t[]){1,1,1},3);
-    RUNNER_ASSERT(result == PC_OPERATION_SUCCESS);
-    osp_blahblah_check(__LINE__, { "a a ---a-"});
-    osp_blahblah_dac_check(__LINE__, {1,1,1});
-    remove_smack_files();
+    // Enable permission for rules 2 no r
+    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_NO_R, true);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS,
+        " Error registering app permissions without r. Result: " << result);
+
+    DB_END
+
+    // Check if the accesses are realy applied..
+    result = test_have_all_accesses(rules2_no_r);
+    RUNNER_ASSERT_MSG_BT(result == 1, "Permissions without r not added.");
+
+    DB_BEGIN
+
+    // Enable permission for rules 2
+    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2_R, true);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS,
+        " Error registering app permissions with only r. Result: " << result);
+
+    DB_END
+
+    // Check if the accesses are realy applied..
+    result = test_have_all_accesses(rules2_r);
+    RUNNER_ASSERT_MSG_BT(result == 1, "Permissions with only r not added.");
+
+    DB_BEGIN
+
+    // Clean up
+    result = perm_app_revoke_permissions(WGT_APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS,
+        "Error revoking app permissions. Result: " << result);
+
+
+
+    // Clean up after test:
+    result = perm_app_uninstall(WGT_APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "perm_app_uninstall returned " << result << ". Errno: " << strerror(errno));
+
+    DB_END
+}
+
+RUNNER_CHILD_TEST_SMACK(privilege_control11_app_enable_permissions_efl)
+{
+    test_app_enable_permissions_efl(true);
 }
 
 /*
- * Check app_install function
+ * Check perm_app_install function
  */
-RUNNER_TEST(privilege_control01_app_install)
+RUNNER_CHILD_TEST_SMACK(privilege_control12_app_disable_permissions_efl)
+{
+    test_app_disable_permissions_efl(true);
+}
+
+
+/**
+ * Remove previously granted SMACK permissions based on permissions list.
+ */
+RUNNER_TEST_SMACK(privilege_control12_app_disable_permissions)
+{
+    test_app_disable_permissions(true);
+}
+
+/**
+ * Reset SMACK permissions for an application by revoking all previously
+ * granted rules and enabling them again from a rules file from disk.
+ */
+// TODO: This test is incomplete.
+RUNNER_TEST_SMACK(privilege_control13_app_reset_permissions)
 {
     int result;
-    char *path = NULL;
-    int fd = -1;
 
-    smack_file_name(APP_ID, &path);
-    unlink(path);
+/**
+ * Test - doing reset and checking if rules exist again.
+ */
+
+    DB_BEGIN
 
-    result = app_install(APP_ID);
-    RUNNER_ASSERT_MSG(result == 0, "app_install returned " << result <<". Errno: " << strerror(errno));
+    result = perm_app_install(WGT_APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == 0, "perm_app_install returned " << result << ". Errno: " << strerror(errno));
 
-    // checking if file really exists
-    fd = open(path, O_RDONLY);
-    RUNNER_ASSERT_MSG(fd >= 0, "File open failed: " << path << " : " << result << ". Errno: " << strerror(errno));
-    close(fd);
-    free(path);
+    // Prepare permissions to reset
+    result = perm_app_enable_permissions(WGT_APP_ID, APP_TYPE_WGT, PRIVS2, true);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS,
+        " Error registering app permissions. Result: " << result);
+
+    // Reset permissions
+    result = perm_app_reset_permissions(WGT_APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS,
+        "Error reseting app permissions. Result: " << result);
+
+    DB_END
+
+    // Are all second permissions not disabled?
+    result = test_have_all_accesses(rules2);
+    RUNNER_ASSERT_MSG_BT(result == 1, "Not all permissions added.");
+
+    DB_BEGIN
+
+    // Disable permissions
+    result = perm_app_revoke_permissions(WGT_APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS,
+        "Error disabling app permissions. Result: " << result);
+
+    result = perm_app_uninstall(WGT_APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == 0, "perm_app_uninstall returned " << result << ". Errno: " << strerror(errno));
 
-    // try install second time app with the same ID - it should failed with -1 (Errno: File exists).
-    result = app_install(APP_ID);
-    RUNNER_ASSERT_MSG(result == -1, "app_install returned " << result <<". Errno: " << strerror(errno));
+    DB_END
 }
 
-/*
- * Check app_install function
- */
-RUNNER_TEST(privilege_control07_app_uninstall)
+static void smack_set_random_label_based_on_pid_on_self(void)
 {
     int result;
-    char *path = NULL;
-    int fd = -1;
+    std::stringstream ss;
 
-    smack_file_name(APP_ID, &path);
-    result = app_uninstall(APP_ID);
-    RUNNER_ASSERT_MSG(result == 0, "app_uninstall returned " << result <<". Errno: " << strerror(errno));
+    ss << "s-" << getpid() << "-" << getppid();
+    result = smack_set_label_for_self(ss.str().c_str());
+    RUNNER_ASSERT_MSG_BT(result == 0, "smack_set_label_for_self("
+        << ss.str().c_str() << ") failed");
+}
 
-    // checking if file really exists
-    smack_file_name(APP_ID, &path);
-    fd = open(path, O_RDONLY);
-    RUNNER_ASSERT_MSG(fd == -1, "SMACK file NOT deleted after app_uninstall");
+static void smack_unix_sock_server(int sock)
+{
+    int fd, result;
+    char *smack_label;
+
+    alarm(2);
+    fd = accept(sock, NULL, NULL);
+    alarm(0);
+    if (fd < 0)
+        return;
+    result = smack_new_label_from_self(&smack_label);
+    if (result < 0) {
+        close(fd);
+        close(sock);
+        free(smack_label);
+        RUNNER_ASSERT_MSG_BT(0, "smack_new_label_from_self() failed");
+    }
+    result = write(fd, smack_label, strlen(smack_label));
+    if (result != (int)strlen(smack_label)) {
+        close(fd);
+        close(sock);
+        free(smack_label);
+        RUNNER_ASSERT_MSG_BT(0, "write() failed: " << strerror(errno));
+    }
     close(fd);
-    free(path);
+    free(smack_label);
 }
 
-/*
- * Check app_register_av function
- * Notice that this test case may have no sense if previous would fail (privilege_control06_app_install)
- */
-RUNNER_TEST(privilege_control10_app_register_av)
+RUNNER_MULTIPROCESS_TEST_SMACK(privilege_control15_app_id_from_socket)
 {
+    int pid;
+    struct sockaddr_un sockaddr = {AF_UNIX, SOCK_PATH};
+
+    unlink(SOCK_PATH);
+    pid = fork();
+    RUNNER_ASSERT_MSG_BT(pid >= 0, "Fork failed");
+
+    smack_set_random_label_based_on_pid_on_self();
+
+    if (!pid) { /* child process, server */
+        int sock, result;
+
+        /* Set the process label before creating a socket */
+        sock = socket(AF_UNIX, SOCK_STREAM, 0);
+        RUNNER_ASSERT_MSG_BT(sock >= 0, "socket failed: " << strerror(errno));
+        result = bind(sock,
+            (struct sockaddr*) &sockaddr, sizeof(struct sockaddr_un));
+        if (result != 0) {
+            close(sock);
+            RUNNER_ASSERT_MSG_BT(0, "bind failed: " << strerror(errno));
+        }
+        result = listen(sock, 1);
+        if (result != 0) {
+            close(sock);
+            RUNNER_ASSERT_MSG_BT(0, "listen failed: " << strerror(errno));
+        }
+        smack_unix_sock_server(sock);
+
+        /* Change the process label with listening socket */
+        smack_unix_sock_server(sock);
+
+        pid = fork();
+        RUNNER_ASSERT_MSG_BT(pid >= 0, "Fork failed");
+        /* Now running two concurrent servers.
+           Test if socket label was unaffected by fork() */
+        smack_unix_sock_server(sock);
+        /* Let's give the two servers different labels */
+        smack_unix_sock_server(sock);
+        close(sock);
+
+        exit(0);
+    } else { /* parent process, client */
+        sleep(1); /* Give server some time to setup listening socket */
+        int i;
+        for (i = 0; i < 4; ++i) {
+            int sock;
+            int result;
+            char smack_label1[SMACK_LABEL_LEN + 1];
+            char *smack_label2;
+
+            sock = socket(AF_UNIX, SOCK_STREAM, 0);
+            RUNNER_ASSERT_MSG_BT(sock >= 0,
+                "socket failed: " << strerror(errno));
+            result = connect(sock,
+                (struct sockaddr*) &sockaddr, sizeof(struct sockaddr_un));
+            if (result != 0) {
+                close(sock);
+                RUNNER_ASSERT_MSG_BT(0, "connect failed: " << strerror(errno));
+            }
+
+            alarm(2);
+            result = read(sock, smack_label1, SMACK_LABEL_LEN);
+            alarm(0);
+            if (result < 0) {
+                close(sock);
+                RUNNER_ASSERT_MSG_BT(0, "read failed: " << strerror(errno));
+            }
+            smack_label1[result] = '\0';
+            smack_label2 = perm_app_id_from_socket(sock);
+            if (smack_label2 == NULL) {
+                close(sock);
+                RUNNER_ASSERT_MSG_BT(0, "perm_app_id_from_socket failed");
+            }
+            result = strcmp(smack_label1, smack_label2);
+            if (result != 0) {
+                close(sock);
+                RUNNER_ASSERT_MSG_BT(0, "smack labels differ: '" << smack_label1
+                    << "' != '" << smack_label2 << "-" << random() << "'");
+            }
+            close(sock);
+        }
+    }
+}
+
+RUNNER_TEST(privilege_control16_app_setup_path){
+    const char *path1 = "/usr/share/privilege-control/app_setup_access_test";
+    const char *path2 = "/usr/share/privilege-control/app_setup_access_test/directory";
+    const char *path3 = "/usr/share/privilege-control/app_setup_access_test/one";
+    const char *path4 = "/usr/share/privilege-control/app_setup_access_test/directory/two";
+    const char *label1 = "qwert123456za";
+    const char *label2 = "trewq654123az";
+
+    CStringPtr labelPtr;
+
+    mkdir(path1,0);
+    mkdir(path2,0);
+
+    int fd = creat(path3, S_IRWXU);
+    if (fd >= 0)
+        close(fd);
+    fd = creat(path4, S_IRWXU);
+    if (fd >= 0)
+        close(fd);
+
+    char *label = NULL;
+
+    DB_BEGIN
+
+    RUNNER_ASSERT_BT(PC_OPERATION_SUCCESS == perm_app_setup_path("somepackageid", path1, APP_PATH_ANY_LABEL, label1));
+
+    DB_END
+
+    RUNNER_ASSERT_BT(0 == smack_lgetlabel(path3, &label, SMACK_LABEL_ACCESS));
+    labelPtr.reset(label);
+    label = NULL;
+    RUNNER_ASSERT_BT(0 == strcmp(labelPtr.get(), label1));
+
+    DB_BEGIN
+
+    RUNNER_ASSERT_BT(PC_OPERATION_SUCCESS == perm_app_setup_path("somepackageid", path1, APP_PATH_ANY_LABEL, label2));
+
+    DB_END
+
+    RUNNER_ASSERT_BT(0 == smack_lgetlabel(path4, &label, SMACK_LABEL_EXEC));
+    labelPtr.reset(label);
+    label = NULL;
+    RUNNER_ASSERT_BT(0 == strcmp(labelPtr.get(), label2));
+
+    RUNNER_ASSERT_BT(0 == smack_lgetlabel(path1, &label, SMACK_LABEL_EXEC));
+    labelPtr.reset(label);
+    label = NULL;
+    RUNNER_ASSERT_BT(labelPtr.get() == NULL);
+}
+
+RUNNER_TEST_SMACK(privilege_control17_appsettings_privilege)
+{
+    test_appsettings_privilege(true);
+}
+
+void test_app_setup_path(int line_no, app_path_type_t PATH_TYPE) {
     int result;
-    //FILE* file_av = NULL;
-    //FILE* file_app = NULL;
-    //int fd_app = -1;
-    int fd  = -1;
-    char *path = NULL;
-    char *buff;
-    int len;
-    int i;
-    //char label1[SMACK_LABEL_LEN +1];
-    //char label2[SMACK_LABEL_LEN +1];
-    //char acces_rights[6 +1];
-    //char row[2 * SMACK_LABEL_LEN + 20] //
-    const char* correct_antivirus1_rules = "test-antivirus1 test-application1 rwx--\n"
-                                            "test-antivirus1 test-application_2 rwx--\n"
-                                            "test-antivirus1 test-app-3 rwx--";
-    const char* correct_antivirus2_rules = "test-antivirus_2 test-application1 rwx--\n"
-                                           "test-antivirus_2 test-application_2 rwx--\n"
-                                           "test-antivirus_2 test-app-3 rwx--";
-
-    // cleaning
-    cleaning_smack_app_files();
-    cleaning_smack_database_files();
-
-    result = app_install(APP_TEST_APP_1);
-    RUNNER_ASSERT_MSG(result == 0, "app_install returned " << result <<". Errno: " << strerror(errno));
-
-    result = app_install(APP_TEST_APP_2);
-    RUNNER_ASSERT_MSG(result == 0, "app_install returned " << result <<". Errno: " << strerror(errno));
-
-    result = app_register_av(APP_TEST_AV_1);
-    RUNNER_ASSERT_MSG(result == 0, "app_register_av returned " << result <<". Errno: " << strerror(errno));
-
-    result = app_install(APP_TEST_APP_3);
-    RUNNER_ASSERT_MSG(result == 0, "app_install returned " << result <<". Errno: " << strerror(errno));
-
-    result = app_register_av(APP_TEST_AV_2);
-    RUNNER_ASSERT_MSG(result == 0, "app_register_av returned " << result <<". Errno: " << strerror(errno));
-
-    // checking rules for anti virus 1
-    // compare between file in /etc/smack/access.d/ and correct value (correct_antivirus1_rules).
-    len = strlen(correct_antivirus1_rules);
-    buff = (char *) malloc((len+1) * sizeof(char));
-    smack_file_name(APP_TEST_AV_1, &path);
-    fd = open(path, O_RDONLY);
-    free(path);
-    RUNNER_ASSERT_MSG(fd > -1, "file open failed " << result <<". Errno: " << strerror(errno));
-    result = read(fd, buff, len);
-    close(fd);
-    fd = -1;
-    buff[len] = '\0';
-    RUNNER_ASSERT_MSG(result > -1, "read from file descriptor failed. Errno: " << strerror(errno));
-    result = strncmp(buff, correct_antivirus1_rules, len);
-    RUNNER_ASSERT_MSG(result == 0, "Rules do not match: " << result << "\n\"" << buff << "\"\n\"" << correct_antivirus1_rules << "\"\n" << len);
-    free(buff);
-
-    // checking rules for anti virus 2
-    len = strlen(correct_antivirus2_rules);
-    buff = (char *) malloc((len+1) * sizeof(char));
-    smack_file_name(APP_TEST_AV_2, &path);
-    fd = open(path, O_RDONLY);
-    free (path);
-    RUNNER_ASSERT_MSG(fd > -1, "file open failed " << result <<". Errno: " << strerror(errno));
-    result = read(fd, buff, len);
-    close (fd);
-    fd = -1;
-    buff[len] = '\0';
-    RUNNER_ASSERT_MSG(result > -1, "read from file descriptor failed. Errno: " << strerror(errno));
-    result = strncmp(buff, correct_antivirus2_rules, len);
-    RUNNER_ASSERT_MSG(result == 0, "Rules do not match: " << result << "\n\"" << buff << "\"\n\"" << correct_antivirus1_rules << "\"\n" << len);
-    free(buff);
-
-    // cleaning
-    cleaning_smack_app_files();
-    cleaning_smack_database_files();
+
+    DB_BEGIN
+
+    result = perm_app_uninstall(APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "Line: " << line_no <<
+            " Error in perm_app_uninstall." << result);
+
+    result = perm_app_install(APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "Line: " << line_no <<
+            " Error in perm_app_install." << result);
+
+    DB_END
+
+    result = nftw(TEST_APP_DIR, &nftw_remove_labels, FTW_MAX_FDS, FTW_PHYS);
+    RUNNER_ASSERT_MSG_BT(result == 0, "Line: " << line_no <<
+            " Unable to clean up Smack labels in " << TEST_APP_DIR);
+
+    result = nftw(TEST_NON_APP_DIR, &nftw_set_labels_non_app_dir, FTW_MAX_FDS, FTW_PHYS);
+    RUNNER_ASSERT_MSG_BT(result == 0, "Line: " << line_no <<
+            " Unable to clean up Smack labels in " << TEST_NON_APP_DIR);
+
+    DB_BEGIN
+
+    result = perm_app_setup_path(APP_ID, TEST_APP_DIR, PATH_TYPE);
+    RUNNER_ASSERT_MSG_BT(result == 0, "Line: " << line_no <<
+            " perm_app_setup_path() failed");
+
+    DB_END
+
+    result = nftw(TEST_NON_APP_DIR, &nftw_check_labels_non_app_dir, FTW_MAX_FDS, FTW_PHYS);
+    RUNNER_ASSERT_MSG_BT(result == 0, "Line: " << line_no <<
+            " Unable to check Smack labels for non-app dir");
+
+    DB_BEGIN
+
+    result = perm_app_uninstall(APP_ID);
+    RUNNER_ASSERT_MSG_BT(result == PC_OPERATION_SUCCESS, "Line: " << line_no <<
+            " Error in perm_app_uninstall." << result);
+
+    DB_END
+}
+
+RUNNER_TEST_SMACK(privilege_control18_app_setup_path_public)
+{
+    test_app_setup_path(__LINE__, APP_PATH_PUBLIC_RO);
+}
+
+RUNNER_TEST_SMACK(privilege_control19_app_setup_path_settings)
+{
+    test_app_setup_path(__LINE__, APP_PATH_SETTINGS_RW);
+}
+
+RUNNER_TEST(privilege_control25_test_libprivilege_strerror) {
+    int POSITIVE_ERROR_CODE = 1;
+    int NONEXISTING_ERROR_CODE = -239042;
+    const char *result;
+
+    for (auto itr = error_codes.begin(); itr != error_codes.end(); ++itr) {
+        RUNNER_ASSERT_MSG_BT(strcmp(perm_strerror(*itr), "Unknown error") != 0,
+                "Returned invalid error code description.");
+    }
+
+    result = perm_strerror(POSITIVE_ERROR_CODE);
+    RUNNER_ASSERT_MSG_BT(strcmp(result, "Unknown error") == 0,
+            "Bad message returned for invalid error code: \"" << result << "\"");
+
+    result = perm_strerror(NONEXISTING_ERROR_CODE);
+    RUNNER_ASSERT_MSG_BT(strcmp(result, "Unknown error") == 0,
+            "Bad message returned for invalid error code: \"" << result << "\"");
 }