diff --git a/headers/modsecurity/rules_properties.h b/headers/modsecurity/rules_properties.h index 2efea9ab..3ff59246 100644 --- a/headers/modsecurity/rules_properties.h +++ b/headers/modsecurity/rules_properties.h @@ -313,8 +313,8 @@ class RulesProperties { for (int i = 0; i <= modsecurity::Phases::NUMBER_OF_PHASES; i++) { std::vector *actions_from = \ - from->defaultActions+i; - std::vector *actions_to = to->defaultActions+i; + from->m_defaultActions+i; + std::vector *actions_to = to->m_defaultActions+i; for (int j = 0; j < actions_from->size(); j++) { actions::Action *action = actions_from->at(j); action->refCountIncrease(); @@ -419,7 +419,7 @@ class RulesProperties { ConfigString m_httpblKey; ConfigString m_uploadDirectory; ConfigString m_uploadTmpDirectory; - std::vector defaultActions[8]; + std::vector m_defaultActions[8]; std::vector m_rules[8]; }; diff --git a/src/actions/disruptive/block.cc b/src/actions/disruptive/block.cc index 830972b8..74d875b1 100644 --- a/src/actions/disruptive/block.cc +++ b/src/actions/disruptive/block.cc @@ -32,7 +32,7 @@ namespace disruptive { bool Block::evaluate(Rule *rule, Transaction *transaction, RuleMessage *rm) { transaction->debug(8, "Marking request as disruptive."); - for (Action *a : transaction->m_rules->defaultActions[rule->phase]) { + for (Action *a : transaction->m_rules->m_defaultActions[rule->phase]) { if (a->isDisruptive() == false) { continue; } diff --git a/src/parser/seclang-parser.yy b/src/parser/seclang-parser.yy index 5836446c..526e0d03 100644 --- a/src/parser/seclang-parser.yy +++ b/src/parser/seclang-parser.yy @@ -915,7 +915,7 @@ expression: definedPhase = modsecurity::Phases::RequestHeadersPhase; } - if (!driver.defaultActions[definedPhase].empty()) { + if (!driver.m_defaultActions[definedPhase].empty()) { std::stringstream ss; ss << "SecDefaultActions can only be placed once per phase and configuration context. Phase "; ss << secRuleDefinedPhase; @@ -925,7 +925,7 @@ expression: } for (actions::Action *a : checkedActions) { - driver.defaultActions[definedPhase].push_back(a); + driver.m_defaultActions[definedPhase].push_back(a); } delete actions; diff --git a/src/rule.cc b/src/rule.cc index 33cdf09e..c5bddaaf 100644 --- a/src/rule.cc +++ b/src/rule.cc @@ -309,7 +309,7 @@ std::vector Rule::executeSecDefaultActionTransofrmations( // Notice that first we make sure that won't be a t:none // on the target rule. if (none == 0) { - for (Action *a : trasn->m_rules->defaultActions[this->phase]) { + for (Action *a : trasn->m_rules->m_defaultActions[this->phase]) { if (a->action_kind \ == actions::Action::RunTimeBeforeMatchAttemptKind) { newValue = new std::string(a->evaluate(*value, trasn)); @@ -472,7 +472,7 @@ std::vector Rule::getFinalVars( void Rule::executeActionsAfterFullMatch(Transaction *trasn, bool containsDisruptive, RuleMessage *ruleMessage) { - for (Action *a : trasn->m_rules->defaultActions[this->phase]) { + for (Action *a : trasn->m_rules->m_defaultActions[this->phase]) { if (a->action_kind != actions::Action::RunTimeOnlyIfMatchKind) { continue; } diff --git a/src/rules.cc b/src/rules.cc index 05f33679..23886f9c 100644 --- a/src/rules.cc +++ b/src/rules.cc @@ -93,7 +93,7 @@ Rules::~Rules() { } } for (i = 0; i < modsecurity::Phases::NUMBER_OF_PHASES; i++) { - std::vector *tmp = &defaultActions[i]; + std::vector *tmp = &m_defaultActions[i]; while (tmp->empty() == false) { actions::Action *a = tmp->back(); a->refCountDecreaseAndCheck();