E2EE: Require e2ee-tests to be ran by default user

Change-Id: I87e1b8b68f91d4410144e4b986022da49e58fe24

diff --git a/src/ckm/ckm-common.cpp b/src/ckm/ckm-common.cpp
index 59c9fc8..01c265c 100644 (file)
--- a/src/ckm/ckm-common.cpp
+++ b/src/ckm/ckm-common.cpp
@@ -18,6 +18,10 @@
  * @author     Krzysztof Jackiewicz (k.jackiewicz@samsung.com)
  * @version    1.0
  */
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <cstdlib>
 #include <string>
 #include <fstream>
 #include <sys/smack.h>
@@ -32,6 +36,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <unordered_map>
+#include <tzplatform_config.h>
 
 const std::string SMACK_USER_APP_PREFIX = "User::Pkg::";
 const char *SYSTEM_LABEL = ckmc_owner_id_system;
@@ -601,3 +606,17 @@ CKM::Policy generate_ckm_policy(int iterator_nr) {
     }
     return CKM::Policy();
 }
+
+void require_default_user(char *argv[])
+{
+    uid_t expected_uid = tzplatform_getuid(TZ_SYS_DEFAULT_USER);
+    if (expected_uid != geteuid()) {
+        std::string userStr("owner");
+        const char* user = tzplatform_getenv(TZ_SYS_DEFAULT_USER);
+        if (user)
+            userStr = user;
+
+        std::cerr << argv[0] << " should be executed as " << userStr << ". Aborting" << std::endl;
+        exit(-1);
+    }
+}

diff --git a/src/ckm/ckm-common.h b/src/ckm/ckm-common.h
index 9e9204d..4d398e5 100644 (file)
--- a/src/ckm/ckm-common.h
+++ b/src/ckm/ckm-common.h
@@ -244,3 +244,5 @@ public:
 private:
     const char* alias;
 };
+
+void require_default_user(char *argv[]);

diff --git a/src/ckm/unprivileged/main.cpp b/src/ckm/unprivileged/main.cpp
index 883a4fe..93ccd11 100644 (file)
--- a/src/ckm/unprivileged/main.cpp
+++ b/src/ckm/unprivileged/main.cpp
@@ -13,8 +13,6 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License
  */
-#include <unistd.h>
-#include <sys/types.h>
 
 #include <fstream>
 #include <iostream>
@@ -38,8 +36,6 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 
-#include <tzplatform_config.h>
-
 namespace {
 const int USER_APP = 5001;
 
@@ -2927,16 +2923,7 @@ RUNNER_TEST(T1905_deinit)
 
 int main(int argc, char *argv[])
 {
-    uid_t expected_uid = tzplatform_getuid(TZ_SYS_DEFAULT_USER);
-    if (expected_uid != geteuid()) {
-        std::string userStr("owner");
-        const char* user = tzplatform_getenv(TZ_SYS_DEFAULT_USER);
-        if (user)
-            userStr = user;
-
-        std::cerr << argv[0] << " should be executed as " << userStr << ". Aborting" << std::endl;
-        return -1;
-    }
+    require_default_user(argv);
 
     int exitCode = DPL::Test::TestRunnerSingleton::Instance().ExecTestRunner(argc, argv);
 

diff --git a/src/e2ee-adaptation-layer/tests.cpp b/src/e2ee-adaptation-layer/tests.cpp
index f10b5c6..2cd6a70 100644 (file)
--- a/src/e2ee-adaptation-layer/tests.cpp
+++ b/src/e2ee-adaptation-layer/tests.cpp
@@ -667,5 +667,7 @@ RUNNER_TEST(TEAL_3000_link_key_agreement_scenario)
 
 int main(int argc, char *argv[])
 {
+    require_default_user(argv);
+
     return DPL::Test::TestRunnerSingleton::Instance().ExecTestRunner(argc, argv);
 }