github_mirrors/openappsec
3
0
Fork 1
mirror of https://github.com/openappsec/openappsec.git synced 2025-06-28 16:41:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Change declarative policy initialization

Browse Source
This commit is contained in:
Ned Wright 2023-12-25 16:45:45 +00:00
parent 3282774432
commit 3084641737
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/security_apps/orchestration/include/declarative_policy_utils.h
View File

@ -80,6 +80,7 @@ public:
std::string getUpdate(CheckUpdateRequest &request) override; std::string getUpdate(CheckUpdateRequest &request) override;
bool shouldApplyPolicy() override; bool shouldApplyPolicy() override;
void turnOffApplyPolicyFlag() override; void turnOffApplyPolicyFlag() override;
void turnOnApplyPolicyFlag() override;
std::string getCurrPolicy() override { return curr_policy; } std::string getCurrPolicy() override { return curr_policy; }

1
components/security_apps/orchestration/include/i_declarative_policy.h
View File

@ -23,6 +23,7 @@ public:
virtual std::string getCurrPolicy() = 0; virtual std::string getCurrPolicy() = 0;
virtual void turnOffApplyPolicyFlag() = 0; virtual void turnOffApplyPolicyFlag() = 0;
virtual void turnOnApplyPolicyFlag() = 0;
protected: protected:
virtual ~I_DeclarativePolicy() {} virtual ~I_DeclarativePolicy() {}

6
components/security_apps/orchestration/orchestration_comp.cc
View File

@ -221,10 +221,7 @@ private:
auto update_communication = Singleton::Consume<I_UpdateCommunication>::by<OrchestrationComp>(); auto update_communication = Singleton::Consume<I_UpdateCommunication>::by<OrchestrationComp>();
auto agent_mode = getOrchestrationMode(); auto agent_mode = getOrchestrationMode();
auto policy_mgmt_mode = getSettingWithDefault<string>("management", "profileManagedMode"); auto policy_mgmt_mode = getSettingWithDefault<string>("management", "profileManagedMode");
if (agent_mode == OrchestrationMode::HYBRID || policy_mgmt_mode == "declarative") { bool declarative = agent_mode == OrchestrationMode::HYBRID || policy_mgmt_mode == "declarative";
update_communication->authenticateAgent();
return Maybe<void>();
}
bool enforce_policy_flag = false; bool enforce_policy_flag = false;
Maybe<OrchestrationPolicy> maybe_policy = genError("Empty policy"); Maybe<OrchestrationPolicy> maybe_policy = genError("Empty policy");
@ -274,6 +271,7 @@ private:
if (enforce_policy_flag) { if (enforce_policy_flag) {
// Trying to create the Orchestration policy from the general policy file // Trying to create the Orchestration policy from the general policy file
maybe_policy = enforceOrchestrationPolicy(); maybe_policy = enforceOrchestrationPolicy();
if (declarative) Singleton::Consume<I_DeclarativePolicy>::from<DeclarativePolicyUtils>()->turnOnApplyPolicyFlag();
if (!maybe_policy.ok()) { if (!maybe_policy.ok()) {
return genError(maybe_policy.getErr()); return genError(maybe_policy.getErr());
} }

6
components/security_apps/orchestration/update_communication/declarative_policy_utils.cc
View File

@ -57,6 +57,12 @@ DeclarativePolicyUtils::turnOffApplyPolicyFlag()
should_apply_policy = false; should_apply_policy = false;
} }
void
DeclarativePolicyUtils::turnOnApplyPolicyFlag()
{
should_apply_policy = true;
}
Maybe<string> Maybe<string>
DeclarativePolicyUtils::getLocalPolicyChecksum() DeclarativePolicyUtils::getLocalPolicyChecksum()
{ {