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

Better error handling when loading configurations

Browse Source
This commit is contained in:
Felipe Zimmerle
2019-03-21 09:45:04 -03:00
parent 942de22069
commit 78d9575dd2
11 changed files with 160 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/rules_set_phases.cc
View File

@@ -15,78 +15,34 @@
#include "modsecurity/rules_set_phases.h"
#include "src/rule_with_operator.h"
#include <iterator>
namespace modsecurity {
bool RulesSetPhases::insert(std::shared_ptr<Rule> rule) {
if (rule->getPhase() >= modsecurity::Phases::NUMBER_OF_PHASES) {
return false;
void RulesSetPhases::insert(std::shared_ptr<Rule> rule) {
if (rule->getPhase() >= size()) {
return;
}
m_rulesAtPhase[rule->getPhase()].insert(rule);
return true;
}
int RulesSetPhases::append(RulesSetPhases *from, std::ostringstream *err) {
int amount_of_rules = 0;
std::vector<int64_t> v;
for (int i = 0; i < modsecurity::Phases::NUMBER_OF_PHASES; i++) {
v.reserve(m_rulesAtPhase[i].size());
for (size_t z = 0; z < m_rulesAtPhase[i].size(); z++) {
RuleWithOperator *rule_ckc = dynamic_cast<RuleWithOperator *>(m_rulesAtPhase[i].at(z).get());
//RuleWithOperator *rule_ckc = dynamic_cast<RuleWithOperator *>(m_rulesAtPhase->at(i).get());
if (!rule_ckc) {
continue;
}
v.push_back(rule_ckc->getId());
}
void RulesSetPhases::append(RulesSetPhases *from) {
int phase = 0;
for (auto &a : *from) {
m_rulesAtPhase[phase++].append(&a);
}
std::sort (v.begin(), v.end());
for (int phase = 0; phase < modsecurity::Phases::NUMBER_OF_PHASES; phase++) {
int res = m_rulesAtPhase[phase].append(from->at(phase), v, err);
if (res < 0) {
return res;
}
amount_of_rules = amount_of_rules + res;
/**
* 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();
}
}
return amount_of_rules;
}
void RulesSetPhases::dump() const {
for (int i = 0; i <= modsecurity::Phases::NUMBER_OF_PHASES; i++) {
const Rules *rules = &m_rulesAtPhase[i];
std::cout << "Phase: " << std::to_string(i);
std::cout << " (" << std::to_string(m_rulesAtPhase[i].size());
void RulesSetPhases::dump() {
int phase = 0;
for (auto &rules : m_rulesAtPhase) {
std::cout << "Phase: " << std::to_string(phase++);
std::cout << " (" << std::to_string(rules.size());
std::cout << " rules)" << std::endl;
m_rulesAtPhase[i].dump();
rules.dump();
}
}