policy: Fix default admin identifier

Signed-off-by: Sangwan Kwon <sangwan.kwon@samsung.com>

diff --git a/CMake/Definition.cmake b/CMake/Definition.cmake
index a6eaa5f..d11b5e9 100644 (file)
--- a/CMake/Definition.cmake
+++ b/CMake/Definition.cmake
@@ -27,7 +27,7 @@ SET(VIST_DB_DIR     "${VIST_RW_DIR}/db")
 SET(VIST_PLUGIN_DIR "${VIST_RO_DIR}/plugin")
 SET(VIST_SCRIPT_DIR "${VIST_RO_DIR}/script")
 
-SET(DEFAULT_ADMIN_PATH "/usr/bin/vist-cli")
+SET(DEFAULT_POLICY_ADMIN "vist-cli")
 SET(DB_INSTALL_DIR     "${VIST_DB_DIR}")
 SET(PLUGIN_INSTALL_DIR "${VIST_PLUGIN_DIR}")
 SET(SCRIPT_INSTALL_DIR "${VIST_SCRIPT_DIR}")

diff --git a/packaging/vist.spec b/packaging/vist.spec
index 2d31756..049c570 100644 (file)
--- a/packaging/vist.spec
+++ b/packaging/vist.spec
@@ -70,7 +70,7 @@ cp %SOURCE1 .
                 -DUSER_NAME=%{user_name} \
                 -DGROUP_NAME=%{group_name} \
                 -DSMACK_LABEL=%{smack_label} \
-                -DDEFAULT_ADMIN_PATH=%{_bindir}/vist-cli \
+                -DDEFAULT_POLICY_ADMIN=vist-cli \
                 -DDB_INSTALL_DIR:PATH=%{vist_db_dir} \
                 -DPLUGIN_INSTALL_DIR:PATH=%{vist_plugin_dir} \
                 -DSCRIPT_INSTALL_DIR:PATH=%{vist_script_dir} \

diff --git a/src/vist/CMakeLists.txt b/src/vist/CMakeLists.txt
index dcecc0d..3f86197 100644 (file)
--- a/src/vist/CMakeLists.txt
+++ b/src/vist/CMakeLists.txt
@@ -33,7 +33,7 @@ ENDIF(DEFINED GBS_BUILD)
 INCLUDE_DIRECTORIES(SYSTEM . common ${VIST_COMMON_DEPS_INCLUDE_DIRS})
 
 ADD_DEFINITIONS(-DDB_PATH="${DB_INSTALL_DIR}/.vist.db"
-                               -DDEFAULT_ADMIN_PATH="${DEFAULT_ADMIN_PATH}"
+                               -DDEFAULT_POLICY_ADMIN="${DEFAULT_POLICY_ADMIN}"
                                -DPLUGIN_INSTALL_DIR="${PLUGIN_INSTALL_DIR}"
                                -DSCRIPT_INSTALL_DIR="${SCRIPT_INSTALL_DIR}")
 

diff --git a/src/vist/policy/policy-manager.cpp b/src/vist/policy/policy-manager.cpp
index 2ab3ca3..89315bc 100644 (file)
--- a/src/vist/policy/policy-manager.cpp
+++ b/src/vist/policy/policy-manager.cpp
@@ -33,7 +33,7 @@ PolicyManager::PolicyManager() : storage(DB_PATH)
        int cnt = loadPolicies();
        INFO(VIST) << std::to_string(cnt) << "-policies loaded";
 
-       this->storage.enroll(DEFAULT_ADMIN_PATH);
+       this->storage.enroll(DEFAULT_POLICY_ADMIN);
 }
 
 std::pair<int, int> PolicyManager::loadProviders(const std::string& path)

diff --git a/src/vist/policy/policy-storage.cpp b/src/vist/policy/policy-storage.cpp
index 3be069d..ac44bf9 100644 (file)
--- a/src/vist/policy/policy-storage.cpp
+++ b/src/vist/policy/policy-storage.cpp
@@ -164,7 +164,7 @@ void PolicyStorage::enroll(const std::string& name)
 
 void PolicyStorage::disenroll(const std::string& name)
 {
-       if (name == DEFAULT_ADMIN_PATH)
+       if (name == DEFAULT_POLICY_ADMIN)
                THROW(ErrCode::RuntimeError) << "Cannot disenroll default admin.";
 
        INFO(VIST) << "Disenroll admin: " << name;

diff --git a/src/vist/policy/tests/storage.cpp b/src/vist/policy/tests/storage.cpp
index 793c112..87c51d0 100644 (file)
--- a/src/vist/policy/tests/storage.cpp
+++ b/src/vist/policy/tests/storage.cpp
@@ -114,7 +114,7 @@ TEST_F(PolicyStorageTests, default_admin)
 
        /// Cannot disenroll default admin
        try {
-               storage->disenroll(DEFAULT_ADMIN_PATH);
+               storage->disenroll(DEFAULT_POLICY_ADMIN);
        } catch (const std::exception& e) {
                isRaised = true;
        }
@@ -125,21 +125,21 @@ TEST_F(PolicyStorageTests, default_admin)
 TEST_F(PolicyStorageTests, activate)
 {
        auto storage = getStorage();
-       EXPECT_FALSE(storage->isActivated(DEFAULT_ADMIN_PATH));
+       EXPECT_FALSE(storage->isActivated(DEFAULT_POLICY_ADMIN));
 
-       storage->activate(DEFAULT_ADMIN_PATH);
-       EXPECT_TRUE(storage->isActivated(DEFAULT_ADMIN_PATH));
+       storage->activate(DEFAULT_POLICY_ADMIN);
+       EXPECT_TRUE(storage->isActivated(DEFAULT_POLICY_ADMIN));
 
-       storage->activate(DEFAULT_ADMIN_PATH, true);
-       EXPECT_TRUE(storage->isActivated(DEFAULT_ADMIN_PATH));
+       storage->activate(DEFAULT_POLICY_ADMIN, true);
+       EXPECT_TRUE(storage->isActivated(DEFAULT_POLICY_ADMIN));
 
-       storage->activate(DEFAULT_ADMIN_PATH, false);
-       EXPECT_FALSE(storage->isActivated(DEFAULT_ADMIN_PATH));
+       storage->activate(DEFAULT_POLICY_ADMIN, false);
+       EXPECT_FALSE(storage->isActivated(DEFAULT_POLICY_ADMIN));
 
-       storage->activate(DEFAULT_ADMIN_PATH);
-       EXPECT_TRUE(storage->isActivated(DEFAULT_ADMIN_PATH));
+       storage->activate(DEFAULT_POLICY_ADMIN);
+       EXPECT_TRUE(storage->isActivated(DEFAULT_POLICY_ADMIN));
 
-       storage->activate(DEFAULT_ADMIN_PATH, false);
+       storage->activate(DEFAULT_POLICY_ADMIN, false);
 }
 
 TEST_F(PolicyStorageTests, activate_failed)