github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-30 11:44:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Creates the RulesSetPhases clas"

Browse Source 
This reverts commit 072e4edc53.
This commit is contained in:
Felipe Zimmerle
2020-03-11 08:17:56 -03:00
parent 072e4edc53
commit 1e26bf2078
8 changed files with 79 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/parser/driver.cc
View File

@@ -45,7 +45,7 @@ int Driver::addSecMarker(std::string marker) {
for (int i = 0; i < modsecurity::Phases::NUMBER_OF_PHASES; i++) {
Rule *rule = new Rule(marker);
rule->m_phase = i;
m_rulesSetPhases.insert(rule);
m_rules[i].push_back(rule);
}
return 0;
}
@@ -58,15 +58,14 @@ int Driver::addSecAction(Rule *rule) {
return false;
}
m_rulesSetPhases.insert(rule);
m_rules[rule->m_phase].push_back(rule);
return true;
}
int Driver::addSecRuleScript(RuleScript *rule) {
m_rulesSetPhases.insert(rule);
m_rules[rule->m_phase].push_back(rule);
return true;
}
@@ -119,7 +118,7 @@ int Driver::addSecRule(Rule *rule) {
return false;
}
for (int i = 0; i < modsecurity::Phases::NUMBER_OF_PHASES; i++) {
std::vector<Rule *> rules = m_rulesSetPhases[i];
std::vector<Rule *> rules = m_rules[i];
for (int j = 0; j < rules.size(); j++) {
if (rules[j]->m_ruleId == rule->m_ruleId) {
m_parserError << "Rule id: " << std::to_string(rule->m_ruleId) \
@@ -130,7 +129,7 @@ int Driver::addSecRule(Rule *rule) {
}
lastRule = rule;
m_rulesSetPhases.insert(rule);
m_rules[rule->m_phase].push_back(rule);
return true;
}

2
src/parser/driver.h
View File

@@ -90,8 +90,6 @@ class Driver : public RulesSetProperties {
std::string buffer;
Rule *lastRule;
RulesSetPhases m_rulesSetPhases;
};