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

Merge pull request #1 from LuyaoZhong/v3/master

Browse Source 
support logCb for disruptive actions
This commit is contained in:
Le Yao 2021-08-10 08:47:47 +08:00 committed by GitHub
commit 9b8a53686f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/rule_with_actions.cc
View File

@ -500,17 +500,23 @@ void RuleWithActions::performLogging(Transaction *trans,
trans->m_rulesMessages.push_back(*ruleMessage); trans->m_rulesMessages.push_back(*ruleMessage);
/* error */ /* error */
trans->serverLog(ruleMessage);
/*
if (!ruleMessage->m_isDisruptive) { if (!ruleMessage->m_isDisruptive) {
trans->serverLog(ruleMessage); trans->serverLog(ruleMessage);
} }
*/
} }
} else if (hasBlockAction() && !hasMultimatch()) { } else if (hasBlockAction() && !hasMultimatch()) {
/* warn */ /* warn */
trans->m_rulesMessages.push_back(*ruleMessage); trans->m_rulesMessages.push_back(*ruleMessage);
/* error */ /* error */
trans->serverLog(ruleMessage);
/*
if (!ruleMessage->m_isDisruptive) { if (!ruleMessage->m_isDisruptive) {
trans->serverLog(ruleMessage); trans->serverLog(ruleMessage);
} }
*/
} else { } else {
if (isItToBeLogged && !hasMultimatch() if (isItToBeLogged && !hasMultimatch()
&& !ruleMessage->m_message.empty()) { && !ruleMessage->m_message.empty()) {
@ -518,9 +524,12 @@ void RuleWithActions::performLogging(Transaction *trans,
trans->m_rulesMessages.push_back(*ruleMessage); trans->m_rulesMessages.push_back(*ruleMessage);
/* error */ /* error */
trans->serverLog(ruleMessage);
/*
if (!ruleMessage->m_isDisruptive) { if (!ruleMessage->m_isDisruptive) {
trans->serverLog(ruleMessage); trans->serverLog(ruleMessage);
} }
*/
} }
} }
} else { } else {
@ -529,10 +538,12 @@ void RuleWithActions::performLogging(Transaction *trans,
trans->m_rulesMessages.push_back(*ruleMessage.get()); trans->m_rulesMessages.push_back(*ruleMessage.get());
/* error */ /* error */
trans->serverLog(ruleMessage);
/*
if (!ruleMessage->m_isDisruptive) { if (!ruleMessage->m_isDisruptive) {
trans->serverLog(ruleMessage); trans->serverLog(ruleMessage);
} }
*/
RuleMessage *rm = new RuleMessage(this, trans); RuleMessage *rm = new RuleMessage(this, trans);
rm->m_saveMessage = ruleMessage->m_saveMessage; rm->m_saveMessage = ruleMessage->m_saveMessage;
ruleMessage.reset(rm); ruleMessage.reset(rm);