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

Removes method isDisruptive from Action class

Browse Source
This commit is contained in:
Felipe Zimmerle 2020-06-05 11:51:45 -03:00
parent bc3ad6e049
commit f8d56f64f1
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
5 changed files with 764 additions and 769 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
headers/modsecurity/actions/action.h
View File

@ -75,11 +75,6 @@ class Action {
} }
virtual bool isDisruptive() {
return false;
}
const std::string *getName() const noexcept { const std::string *getName() const noexcept {
return &m_name; return &m_name;
} }

3
src/actions/disruptive/disruptive_action.h
View File

@ -31,9 +31,6 @@ namespace disruptive {
class ActionDisruptive : public ActionAllowedAsSecDefaultAction { class ActionDisruptive : public ActionAllowedAsSecDefaultAction {
public: public:
bool isDisruptive() override {
return true;
}
}; };

1509
src/parser/seclang-parser.cc
View File

File diff suppressed because it is too large Load Diff

3
src/parser/seclang-parser.yy
View File

@ -1180,7 +1180,8 @@ expression:
int secRuleDefinedPhase = -1; int secRuleDefinedPhase = -1;
for (actions::Action *a : *actions) { for (actions::Action *a : *actions) {
actions::Phase *phase = dynamic_cast<actions::Phase *>(a); actions::Phase *phase = dynamic_cast<actions::Phase *>(a);
if (a->isDisruptive() == true && dynamic_cast<actions::Block *>(a) == NULL) { if (dynamic_cast<actions::disruptive::ActionDisruptive *>(a) != NULL
&& dynamic_cast<actions::Block *>(a) == NULL) {
hasDisruptive = true; hasDisruptive = true;
} }
if (phase != NULL) { if (phase != NULL) {

13
src/rule_with_actions.cc
View File

@ -43,6 +43,7 @@
#include "src/actions/set_var.h" #include "src/actions/set_var.h"
#include "src/actions/severity.h" #include "src/actions/severity.h"
#include "src/actions/tag.h" #include "src/actions/tag.h"
#include "src/actions/disruptive/disruptive_action.h"
#include "src/actions/transformations/transformation.h" #include "src/actions/transformations/transformation.h"
#include "src/actions/transformations/none.h" #include "src/actions/transformations/none.h"
#include "src/actions/xmlns.h" #include "src/actions/xmlns.h"
@ -142,7 +143,7 @@ void RuleWithActions::addDefaultAction(std::shared_ptr<actions::Action> a) {
} else if (dynamic_cast<actions::Block *>(a.get())) { } else if (dynamic_cast<actions::Block *>(a.get())) {
m_defaultActionActionsRuntimePos.push_back(a); m_defaultActionActionsRuntimePos.push_back(a);
m_defaultContainsStaticBlockAction = true; m_defaultContainsStaticBlockAction = true;
} else if (a->isDisruptive() == true) { } else if (std::dynamic_pointer_cast<actions::disruptive::ActionDisruptive>(a) != NULL) {
m_defaultActionDisruptiveAction = a; m_defaultActionDisruptiveAction = a;
} else { } else {
m_defaultActionActionsRuntimePos.push_back(a); m_defaultActionActionsRuntimePos.push_back(a);
@ -179,7 +180,7 @@ void RuleWithActions::addAction(actions::Action *a) {
m_containsStaticBlockAction = true; m_containsStaticBlockAction = true;
} else if (dynamic_cast<actions::XmlNS *>(a)) { } else if (dynamic_cast<actions::XmlNS *>(a)) {
m_XmlNSs.push_back(std::unique_ptr<actions::XmlNS>(dynamic_cast<actions::XmlNS *>(a))); m_XmlNSs.push_back(std::unique_ptr<actions::XmlNS>(dynamic_cast<actions::XmlNS *>(a)));
} else if (a->isDisruptive() == true) { } else if (dynamic_cast<actions::disruptive::ActionDisruptive *>(a) != NULL) {
m_disruptiveAction = std::unique_ptr<Action>(a); m_disruptiveAction = std::unique_ptr<Action>(a);
} else { } else {
m_actionsRuntimePos.push_back(std::unique_ptr<Action>(a)); m_actionsRuntimePos.push_back(std::unique_ptr<Action>(a));
@ -241,16 +242,16 @@ void RuleWithActions::executeActionsAfterFullMatch(Transaction *trans) {
continue; continue;
} }
actions::Action *a = dynamic_cast<actions::Action*>(b.second.get()); actions::Action *a = dynamic_cast<actions::Action*>(b.second.get());
if (a->isDisruptive()) { if (dynamic_cast<actions::disruptive::ActionDisruptive *>(a) != NULL) {
trans->messageGetLast()->setRule(this); trans->messageGetLast()->setRule(this);
} }
executeAction(trans, a, false); executeAction(trans, a, false);
if (a->isDisruptive()) { if (dynamic_cast<actions::disruptive::ActionDisruptive *>(a) != NULL) {
disruptiveAlreadyExecuted = true; disruptiveAlreadyExecuted = true;
} }
} }
for (auto &a : getMatchActionsPtr()) { for (auto &a : getMatchActionsPtr()) {
if (!a->isDisruptive() if (!dynamic_cast<actions::disruptive::ActionDisruptive *>(a) != NULL
&& !(disruptiveAlreadyExecuted && !(disruptiveAlreadyExecuted
&& dynamic_cast<actions::Block *>(a))) { && dynamic_cast<actions::Block *>(a))) {
executeAction(trans, a, false); executeAction(trans, a, false);
@ -270,7 +271,7 @@ void RuleWithActions::executeActionsAfterFullMatch(Transaction *trans) {
void RuleWithActions::executeAction(Transaction *trans, void RuleWithActions::executeAction(Transaction *trans,
Action *a, bool defaultContext) { Action *a, bool defaultContext) {
if (a->isDisruptive() == false) { if (dynamic_cast<actions::disruptive::ActionDisruptive *>(a) == NULL) {
ms_dbg_a(trans, 9, "Running action: " + *a->getName()); ms_dbg_a(trans, 9, "Running action: " + *a->getName());
a->execute(trans); a->execute(trans);
return; return;