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

Removes RuleMessage from action execute signature

Browse Source
This commit is contained in:
Felipe Zimmerle
2019-03-15 01:35:07 -03:00
parent 12304ea36b
commit 10985f33b0
30 changed files with 45 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/rule_with_actions.cc
View File

@@ -258,7 +258,7 @@ void RuleWithActions::executeActionsIndependentOfChainedRuleResult(Transaction *
} else if (*a->m_name.get() == "setvar") {
ms_dbg_a(trans, 4, "Running [independent] (non-disruptive) " \
"action: " + *a->m_name.get());
a->execute(this, trans, *trans->messageGetLast());
a->execute(this, trans);
}
}
}
@@ -282,7 +282,7 @@ void RuleWithActions::executeActionsAfterFullMatch(Transaction *trans) {
for (actions::Tag *a : getTagsActionPtr()) {
ms_dbg_a(trans, 4, "Running (non-disruptive) action: " \
+ *a->m_name.get());
a->execute(this, trans, *trans->messageGetLast());
a->execute(this, trans);
}
/**
@@ -301,18 +301,17 @@ void RuleWithActions::executeActionsAfterFullMatch(Transaction *trans) {
}
if (m_logData) {
m_logData->execute(this, trans, *trans->messageGetLast());
m_logData->execute(this, trans);
} else if (m_defaultActionLogData) {
m_defaultActionLogData->execute(this, trans, *trans->messageGetLast());
m_defaultActionLogData->execute(this, trans);
}
if (m_msg) {
m_msg->execute(this, trans, *trans->messageGetLast());
m_msg->execute(this, trans);
} else if (m_defaultActionMsg) {
m_defaultActionMsg->execute(this, trans, *trans->messageGetLast());
m_defaultActionMsg->execute(this, trans);
}
for (auto &a : getMatchActionsPtr()) {
if (!a->isDisruptive()
&& !(disruptiveAlreadyExecuted
@@ -334,11 +333,10 @@ void RuleWithActions::executeActionsAfterFullMatch(Transaction *trans) {
void RuleWithActions::executeAction(Transaction *trans,
Action *a, bool defaultContext) {
if (a->isDisruptive() == false && *a->m_name.get() != "block") {
ms_dbg_a(trans, 9, "Running " \
"action: " + *a->m_name.get());
a->execute(this, trans, *trans->messageGetLast());
a->execute(this, trans);
return;
}
@@ -351,7 +349,7 @@ void RuleWithActions::executeAction(Transaction *trans,
if (trans->getRuleEngineState() == RulesSet::EnabledRuleEngine) {
ms_dbg_a(trans, 4, "Running (disruptive) action: " +
*a->m_name.get() + ".");
a->execute(this, trans, *trans->messageGetLast());
a->execute(this, trans);
return;
}