github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-13 21:36:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Rules ID are validated during a set merge

Browse Source 
Further info at: #1192
This commit is contained in:
Felipe Zimmerle 2016-09-23 16:28:47 -03:00
parent ecd3fd0dc1
commit 13b6a3ecf6
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/rules.cc
View File

@ -144,6 +144,11 @@ int Rules::load(const char *file, const std::string &ref) {
return -1;
}
int rules = this->merge(driver);
if (rules == -1) {
parserError << driver->parserError.str();
delete driver;
return -1;
}
delete driver;
return rules;
@ -235,10 +240,20 @@ int Rules::merge(Driver *from) {
int amount_of_rules = 0;
for (int i = 0; i <= ModSecurity::Phases::NUMBER_OF_PHASES; i++) {
std::vector<Rule *> rules = from->rules[i];
this->rules[i].empty();
std::vector<Rule *> rules_here = this->rules[i];
for (int j = 0; j < rules.size(); j++) {
amount_of_rules++;
Rule *rule = rules[j];
for (int z = 0; z < rules_here.size(); z++) {
Rule *rule_ckc = rules_here[z];
if (rule_ckc->rule_id == rule->rule_id) {
parserError << "Rule id: " \
<< std::to_string(rule->rule_id) \
<< " is duplicated" << std::endl;
return -1;
}
}
amount_of_rules++;
this->rules[i].push_back(rule);
rule->refCountIncrease();
}
@ -310,9 +325,20 @@ int Rules::merge(Rules *from) {
int amount_of_rules = 0;
for (int i = 0; i <= ModSecurity::Phases::NUMBER_OF_PHASES; i++) {
std::vector<Rule *> rules = from->rules[i];
std::vector<Rule *> rules_here = this->rules[i];
for (int j = 0; j < rules.size(); j++) {
amount_of_rules++;
Rule *rule = rules[j];
for (int z = 0; z < rules_here.size(); z++) {
Rule *rule_ckc = rules_here[z];
if (rule_ckc->rule_id == rule->rule_id) {
parserError << "Rule id: " \
<< std::to_string(rule->rule_id) \
<< " is duplicated" << std::endl;
return -1;
}
}
amount_of_rules++;
this->rules[i].push_back(rule);
rule->refCountIncrease();
}