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

Fix RULE lookup in chained rules.

Browse Source
This commit is contained in:
Felipe Zimmerle
2018-10-15 16:42:36 -03:00
parent 120108fd33
commit 8bda7c0a45
4 changed files with 59 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/rule.cc
View File

@@ -57,7 +57,7 @@ Rule::Rule(std::string marker)
m_actionsSetVar(),
m_actionsTag(),
m_chained(false),
m_chainedRule(NULL),
m_chainedRuleChild(NULL),
m_fileName(""),
m_lineNumber(0),
m_marker(marker),
@@ -91,7 +91,8 @@ Rule::Rule(Operator *_op,
m_actionsSetVar(),
m_actionsTag(),
m_chained(false),
m_chainedRule(NULL),
m_chainedRuleChild(NULL),
m_chainedRuleParent(NULL),
m_fileName(fileName),
m_lineNumber(lineNumber),
m_marker(""),
@@ -146,8 +147,8 @@ Rule::~Rule() {
delete m_variables;
}
if (m_chainedRule != NULL) {
delete m_chainedRule;
if (m_chainedRuleChild != NULL) {
delete m_chainedRuleChild;
}
}
@@ -793,7 +794,7 @@ bool Rule::evaluate(Transaction *trans,
goto end_exec;
}
if (this->m_chainedRule == NULL) {
if (this->m_chainedRuleChild == NULL) {
#ifndef NO_LOGS
trans->debug(4, "Rule is marked as chained but there " \
"isn't a subsequent rule.");
@@ -804,7 +805,7 @@ bool Rule::evaluate(Transaction *trans,
#ifndef NO_LOGS
trans->debug(4, "Executing chained rule.");
#endif
recursiveGlobalRet = this->m_chainedRule->evaluate(trans, ruleMessage);
recursiveGlobalRet = this->m_chainedRuleChild->evaluate(trans, ruleMessage);
if (recursiveGlobalRet == true) {
goto end_exec;