CKM: AccessProvider2 takes owner id instead smack label.

Change-Id: I9d75c180c06336faca33459645b189a64dc287f2

diff --git a/src/ckm/access_provider2.cpp b/src/ckm/access_provider2.cpp
index 018454f..31f67ba 100644 (file)
--- a/src/ckm/access_provider2.cpp
+++ b/src/ckm/access_provider2.cpp
@@ -27,15 +27,32 @@
 
 #include <tests_common.h>
 
-AccessProvider::AccessProvider(const std::string &mySubject)
-  : m_mySubject(mySubject), m_inSwitchContext(false)
+namespace {
+
+std::string toSmackLabel(const std::string &ownerId) {
+    if (ownerId.empty())
+        return ownerId;
+
+    if (ownerId[0] == '/') {
+        return ownerId.substr(1, std::string::npos);
+    }
+
+    return "User::App::" + ownerId;
+}
+
+} // anonymous namespace
+
+AccessProvider::AccessProvider(const std::string &ownerId)
+  : m_mySubject(toSmackLabel(ownerId))
+  , m_inSwitchContext(false)
 {
     RUNNER_ASSERT_MSG(m_mySubject.size() > 0, "No smack label provided to AccessProvider!");
     allowJournaldLogs();
 }
 
-AccessProvider::AccessProvider(const std::string &mySubject, int uid, int gid)
-  : m_mySubject(mySubject), m_inSwitchContext(false)
+AccessProvider::AccessProvider(const std::string &ownerId, int uid, int gid)
+  : m_mySubject(toSmackLabel(ownerId))
+  , m_inSwitchContext(false)
 {
     RUNNER_ASSERT_MSG(m_mySubject.size() > 0, "No smack label provided to AccessProvider!");
     allowJournaldLogs();

diff --git a/src/ckm/access_provider2.h b/src/ckm/access_provider2.h
index b7c714b..30631be 100644 (file)
--- a/src/ckm/access_provider2.h
+++ b/src/ckm/access_provider2.h
@@ -28,8 +28,8 @@
 
 class AccessProvider {
 public:
-    explicit AccessProvider(const std::string &mySubject);
-    AccessProvider(const std::string &mySubject, int uid, int gid);
+    explicit AccessProvider(const std::string &ownerId);
+    AccessProvider(const std::string &ownerId, int uid, int gid);
     virtual ~AccessProvider() {}
 
     AccessProvider(const AccessProvider &second) = delete;