github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-10-01 12:07:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix disruptive actions execution

Browse Source
This commit is contained in:
Felipe Zimmerle
2015-09-16 19:42:26 -03:00
parent 081fe235ad
commit 5228b685bf
15 changed files with 304 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/rule.cc
View File

@@ -297,9 +297,20 @@ bool Rule::evaluate(Assay *assay) {
std::to_string(elapsed_secs) + " seconds");
if (ret) {
bool containsDisruptive = false;
bool chainResult = false;
assay->debug(4, "Rule returned 1.");
for (Action *a :
this->actions_runtime_pos) {
if (a->isDisruptive() == false) {
assay->debug(4, "Running (_non_ disruptive) action: " + a->action);
a->evaluate(this, assay);
} else {
containsDisruptive = true;
}
}
if (this->chained && this->chainedRule == NULL) {
assay->debug(4, "Rule is marked as chained but there " \
"isn't a subsequent rule.");
@@ -326,14 +337,31 @@ bool Rule::evaluate(Assay *assay) {
if (this->chained && chainResult == true || !this->chained) {
for (Action *a : assay->m_rules->defaultActions[this->phase]) {
if (a->action_kind == actions::Action::RunTimeOnlyIfMatchKind) {
assay->debug(4, "(SecDefaultAction) Running action: " + a->action);
a->evaluate(this, assay);
if (a->isDisruptive()) {
if (containsDisruptive) {
assay->debug(4, "(SecDefaultAction) " \
"_ignoring_ action: " + a->action + \
" (rule contains a disruptive action)");
} else {
assay->debug(4, "(SecDefaultAction) " \
"Running action: " + a->action + \
" (rule _does not_ contains a " \
"disruptive action)");
a->evaluate(this, assay);
}
} else {
assay->debug(4, "(SecDefaultAction) Running " \
"action: " + a->action);
a->evaluate(this, assay);
}
}
}
for (Action *a :
this->actions_runtime_pos) {
assay->debug(4, "Running action: " + a->action);
a->evaluate(this, assay);
if (a->isDisruptive()) {
assay->debug(4, "Running (disruptive) action: " + a->action);
a->evaluate(this, assay);
}
}
}