Removed use of pid_cycle file and ENVIRONMENT macros

[platform/core/test/security-tests.git] / tests / security-server-tests / security_server_tests_client_smack.cpp

diff --git a/tests/security-server-tests/security_server_tests_client_smack.cpp b/tests/security-server-tests/security_server_tests_client_smack.cpp
index 1fdedfd..9a9c783 100644 (file)
--- a/tests/security-server-tests/security_server_tests_client_smack.cpp
+++ b/tests/security-server-tests/security_server_tests_client_smack.cpp
@@ -36,37 +36,6 @@
 
 #define PROPER_COOKIE_SIZE 20
 
-#define ENVIRONMENT                                                       \
-    do {                                                                  \
-        const char *subject_label = "mylabel";                            \
-        RUNNER_ASSERT_MSG_BT(-1 != system("touch /opt/home/root/pid_cycle"), \
-            "Cannot prepare environment for test.");                      \
-        RUNNER_ASSERT_MSG_BT(0 == smack_set_label_for_self(subject_label),   \
-            "Cannot prepare environment for test.");                      \
-        RUNNER_ASSERT_MSG_BT(-1 != setgid(1),                                \
-            "Cannot prepare environment for test.");                      \
-        RUNNER_ASSERT_MSG_BT(-1 != setuid(1),                                \
-            "Cannot prepare environment for test");                       \
-    } while (0)
-
-
-/**
- * Environment preparation should only differ in setting label. On NOSMACK system
- * smack_set_label_for_self returns error because of no access to /proc/self/attr/current.
- */
-#define ENVIRONMENT_NOSMACK                                               \
-    do {                                                                  \
-        int fd = open("/opt/home/root/pid_cycle", O_CREAT|O_APPEND, 0444);\
-        RUNNER_ASSERT_MSG_BT(fd >= 0,                                        \
-            "Couldn't create pid_cycle file. errno: " << strerror(errno));\
-        close(fd);                                                        \
-        RUNNER_ASSERT_MSG_BT(-1 != setgid(1),                                \
-            "Cannot prepare environment for test.");                      \
-        RUNNER_ASSERT_MSG_BT(-1 != setuid(1),                                \
-            "Cannot prepare environment for test");                       \
-    } while (0)
-
-
 /**
  * Unique_ptr typedef for NOSMACK version of tc06 test
  */
@@ -79,54 +48,6 @@ typedef std::unique_ptr<int, std::function<void(int*)> > SockFDUniquePtr;
 RUNNER_TEST_GROUP_INIT(SECURITY_SERVER_TESTS_CLIENT_SMACK)
 
 /*
- * test: Check cookie size returned by security_server_get_cookie_size.
- * description: Cookie used by security-server is 20 bytes long.
- * Any other size of cookies should be treated as error.
- * expected: Function security_server_get_cookie_size returns 20.
- */
-RUNNER_CHILD_TEST_SMACK(tc01_security_server_get_cookie_size)
-{
-    ENVIRONMENT;
-
-    int ret = security_server_get_cookie_size();
-    RUNNER_ASSERT_MSG_BT(20 == ret, "ret = " << ret);
-}
-
-/*
- * test: security_server_request_cookie
- * description: Function security_server_request_cookie will return
- * 20 bytes long cookie.
- * expected: function will set up cookie in the array and return
- * SECURITY_SERVER_API_SUCCESS.
- */
-RUNNER_CHILD_TEST_SMACK(tc02_security_server_request_cookie_normal_case)
-{
-    ENVIRONMENT;
-
-    char cookie[20];
-    int ret = security_server_request_cookie(cookie, 20);
-    LogDebug("ret = " << ret);
-    RUNNER_ASSERT_BT(SECURITY_SERVER_API_SUCCESS == ret);
-}
-
-/*
- * test: security_server_request_cookie
- * description: Function security_server_request_cookie will return
- * 20 bytes long cookie.
- * expected: function will set up cookie in the array and return
- * SECURITY_SERVER_API_SUCCESS.
- */
-RUNNER_CHILD_TEST_SMACK(tc03_security_server_request_cookie_too_small_buffer_size)
-{
-    ENVIRONMENT;
-
-    char cookie[20];
-    int ret = security_server_request_cookie(cookie, 10);
-    LogDebug("ret = " << ret);
-    RUNNER_ASSERT_BT(SECURITY_SERVER_API_ERROR_BUFFER_TOO_SMALL == ret);
-}
-
-/*
  * test: tc04_security_server_get_gid
  * description: Checking for security_server_get_gid
  *              with nonexisting gid and existing one
@@ -357,41 +278,15 @@ RUNNER_MULTIPROCESS_TEST_SMACK(tc07_check_privilege_by_sockfd)
 /////NOSMACK ENV TESTS/////
 ///////////////////////////
 
-/**
- * First four test cases are the same as their SMACK versions. The only difference is environment
- * preparation (described near ENVIRONMENT_NOSMACK macro).
- */
-RUNNER_CHILD_TEST_NOSMACK(tc01_security_server_get_cookie_size_nosmack)
-{
-    ENVIRONMENT_NOSMACK;
-
-    int ret = security_server_get_cookie_size();
-    RUNNER_ASSERT_MSG_BT(ret == 20, "ret = " << ret);
-}
-
-RUNNER_CHILD_TEST_NOSMACK(tc02_security_server_request_cookie_normal_case_nosmack)
-{
-    ENVIRONMENT_NOSMACK;
-
-    char cookie[20];
-    int ret = security_server_request_cookie(cookie, 20);
-    RUNNER_ASSERT_MSG_BT(ret == SECURITY_SERVER_API_SUCCESS, "ret = " << ret);
-}
-
-RUNNER_CHILD_TEST_NOSMACK(tc03_security_server_request_cookie_too_small_buffer_size_nosmack)
-{
-    ENVIRONMENT_NOSMACK;
-
-    char cookie[20];
-    int ret = security_server_request_cookie(cookie, 10);
-    RUNNER_ASSERT_MSG_BT(ret == SECURITY_SERVER_API_ERROR_BUFFER_TOO_SMALL, "ret = " << ret);
-}
-
 RUNNER_CHILD_TEST_NOSMACK(tc04_security_server_get_gid_nosmack)
 {
-    ENVIRONMENT_NOSMACK;
+    int ret;
+
+    ret = drop_root_privileges();
+    RUNNER_ASSERT_MSG_BT(ret == 0,
+            "Failed to drop root privileges. Result: " << ret << "uid = " << getuid());
 
-    int ret = security_server_get_gid("definitely_not_existing_object");
+    ret = security_server_get_gid("definitely_not_existing_object");
     RUNNER_ASSERT_MSG_BT(ret == SECURITY_SERVER_API_ERROR_NO_SUCH_OBJECT, "ret = " << ret);
     ret = security_server_get_gid("root");
     RUNNER_ASSERT_MSG_BT(ret == 0, "ret = " << ret);