From 2f3d6d5a4471458cb0e342e66a783dbeb755948e Mon Sep 17 00:00:00 2001 From: Krzysztof Jackiewicz Date: Thu, 23 Apr 2020 11:48:12 +0200 Subject: [PATCH] Add rule file path getters to PolicyConfiguration Change-Id: If06e8ac749aeec23006ae5bd6d78b1658f13031e --- src/security-manager-tests/common/policy_configuration.cpp | 7 +++++++ src/security-manager-tests/common/policy_configuration.h | 4 +++- src/security-manager-tests/common/sm_commons.cpp | 5 ++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/security-manager-tests/common/policy_configuration.cpp b/src/security-manager-tests/common/policy_configuration.cpp index 208155b..156d6bb 100644 --- a/src/security-manager-tests/common/policy_configuration.cpp +++ b/src/security-manager-tests/common/policy_configuration.cpp @@ -187,5 +187,12 @@ void PolicyConfiguration::loadPrivGroupMap(void) { } } +std::string PolicyConfiguration::getPkgRulesFilePath() { + return CONF_DIR "pkg-rules-template.smack"; +} +std::string PolicyConfiguration::getAppRulesFilePath() { + return CONF_DIR "app-rules-template.smack"; +} + } // namespace SecurityManagerTest diff --git a/src/security-manager-tests/common/policy_configuration.h b/src/security-manager-tests/common/policy_configuration.h index bce5faf..f807411 100644 --- a/src/security-manager-tests/common/policy_configuration.h +++ b/src/security-manager-tests/common/policy_configuration.h @@ -54,7 +54,9 @@ public: GroupVector privToGroup(const PrivVector &privVector); GidVector groupToGid(const GroupVector &groupVector); -static bool getIsAskuserEnabled(); + static bool getIsAskuserEnabled(); + static std::string getPkgRulesFilePath(); + static std::string getAppRulesFilePath(); private: UserDescription loadUserDescription(UserType userType); diff --git a/src/security-manager-tests/common/sm_commons.cpp b/src/security-manager-tests/common/sm_commons.cpp index 7e5f52a..e14f142 100644 --- a/src/security-manager-tests/common/sm_commons.cpp +++ b/src/security-manager-tests/common/sm_commons.cpp @@ -55,7 +55,6 @@ using namespace SecurityManagerTest; -#define CONF_DIR "/usr/share/security-manager/policy/" #define SMACK_RULES_PATH "/sys/fs/smackfs/load2" #define ALLOW 0 @@ -196,8 +195,8 @@ static void check_app_smack_accesses(const std::string &appId, const std::string bool isHybrid = false) { static const std::vector rules[] = - {parseSmackRulesFile(CONF_DIR "pkg-rules-template.smack"), - parseSmackRulesFile(CONF_DIR "app-rules-template.smack")}; + {parseSmackRulesFile(PolicyConfiguration::getPkgRulesFilePath()), + parseSmackRulesFile(PolicyConfiguration::getAppRulesFilePath())}; const std::pair switchAliases[] = {std::make_pair("~PATH_RW~", generatePathRWLabel(pkgId)), -- 2.7.4