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

Reduce use of underscores in log output.

Browse Source 
The use of underscores in log lines makes them harder to read,
without contributing/adding extra information.
This commit is contained in:
Lasse Karstensen
2017-07-27 13:59:22 +02:00
committed by Felipe Zimmerle
parent e3b9e6061f
commit 5c7892ce89
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/rule.cc
View File

@@ -259,12 +259,9 @@ void Rule::executeActionsIndependentOfChainedRuleResult(Transaction *trans,
*containsDisruptive = true; *containsDisruptive = true;
} }
} else { } else {
if (a->m_name == "setvar" if (a->m_name == "setvar" || a->m_name == "msg" || a->m_name == "log") {
|| a->m_name == "msg" trans->debug(4, "Running [independent] (non-disruptive) action: " + a->m_name);
|| a->m_name == "log") { a->evaluate(this, trans, ruleMessage);
trans->debug(4, "Running [I] (_non_ disruptive) " \
"action: " + a->m_name);
a->evaluate(this, trans, ruleMessage);
} }
} }
} }
@@ -635,7 +632,7 @@ void Rule::executeActionsAfterFullMatch(Transaction *trans,
} }
if (containsDisruptive) { if (containsDisruptive) {
trans->debug(4, "(SecDefaultAction) _ignoring_ " \ trans->debug(4, "(SecDefaultAction) ignoring " \
"action: " + a->m_name + \ "action: " + a->m_name + \
" (rule contains a disruptive action)"); " (rule contains a disruptive action)");
continue; continue;
@@ -644,14 +641,13 @@ void Rule::executeActionsAfterFullMatch(Transaction *trans,
if (trans->getRuleEngineState() == Rules::EnabledRuleEngine) { if (trans->getRuleEngineState() == Rules::EnabledRuleEngine) {
trans->debug(4, "(SecDefaultAction) " \ trans->debug(4, "(SecDefaultAction) " \
"Running action: " + a->m_name + \ "Running action: " + a->m_name + \
" (rule _does not_ contains a " \ " (rule does not contain a disruptive action)");
"disruptive action)");
a->evaluate(this, trans, ruleMessage); a->evaluate(this, trans, ruleMessage);
continue; continue;
} }
trans->debug(4, "(SecDefaultAction) _Not_ running action: " \ trans->debug(4, "(SecDefaultAction) Not running action: " \
+ a->m_name + ". Rule _does not_contains a disruptive action,"\ + a->m_name + ". Rule does not contain a disruptive action,"\
+ " but SecRuleEngine is not On."); + " but SecRuleEngine is not On.");
} }
@@ -659,14 +655,13 @@ void Rule::executeActionsAfterFullMatch(Transaction *trans,
if (a->isDisruptive() == false) { if (a->isDisruptive() == false) {
if (a->m_name != "setvar" && a->m_name != "log" if (a->m_name != "setvar" && a->m_name != "log"
&& a->m_name != "msg") { && a->m_name != "msg") {
trans->debug(4, "Running [I] (_non_ disruptive) " \ trans->debug(4, "Running (non-disruptive) action: " + a->m_name);
"action: " + a->m_name); a->evaluate(this, trans, ruleMessage);
a->evaluate(this, trans, ruleMessage);
} }
continue; continue;
} }
if (trans->getRuleEngineState() == Rules::EnabledRuleEngine) { if (trans->getRuleEngineState() == Rules::EnabledRuleEngine) {
trans->debug(4, "Running (disruptive) action: " + a->m_name); trans->debug(4, "Running (disruptive) action: " + a->m_name);
a->evaluate(this, trans, ruleMessage); a->evaluate(this, trans, ruleMessage);
continue; continue;
} }