github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-11-17 01:51:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Adds new method for rule merge

Browse Source 
IMPORTANT: SecDefaultAction specified on a child configuration will
overwrite the ones specified on the parent; Previously it was
concatenating.
This commit is contained in:
Felipe Zimmerle
2020-04-14 11:33:17 -03:00
parent 33def54fa9
commit 2b9ec1a0f1
115 changed files with 2136 additions and 1517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/rules_set_phases.cc
View File

@@ -62,11 +62,27 @@ int RulesSetPhases::append(RulesSetPhases *from, std::ostringstream *err) {
}
amount_of_rules = amount_of_rules + res;
std::vector<std::shared_ptr<actions::Action> > *actions_from = &from->at(phase)->m_defaultActions;
std::vector<std::shared_ptr<actions::Action> > *actions_to = &at(phase)->m_defaultActions;
for (size_t j = 0; j < actions_from->size(); j++) {
actions_to->push_back(actions_from->at(j));
/**
* An action set in a child will overwrite an action set on a parent.
*
*/
std::vector<std::shared_ptr<actions::Action> > *actions_to = &at(phase)->m_defaultActions;
std::vector<std::shared_ptr<actions::transformations::Transformation> > *actions_t_to = &at(phase)->m_defaultTransformations;
if (actions_to->size() == 0 || actions_t_to->size() == 0) {
std::vector<std::shared_ptr<actions::Action> > *actions_from = &from->at(phase)->m_defaultActions;
actions_to->clear();
for (size_t j = 0; j < actions_from->size(); j++) {
actions_to->push_back(actions_from->at(j));
}
std::vector<std::shared_ptr<actions::transformations::Transformation> > *actions_t_from = &from->at(phase)->m_defaultTransformations;
actions_t_to->clear();
for (size_t j = 0; j < actions_t_from->size(); j++) {
actions_t_to->push_back(actions_t_from->at(j));
}
at(phase)->fixDefaultActions();
}
}