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

Moves fixDefaultActions to Rules

Browse Source
This commit is contained in:
Felipe Zimmerle 2020-12-21 10:10:37 -03:00 committed by Felipe Zimmerle
parent fa877bd5fc
commit 571a59bad8
2 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/rules.cc
View File

@ -13,12 +13,54 @@
* *
*/ */
#include "modsecurity/modsecurity.h"
#include "modsecurity/rules.h" #include "modsecurity/rules.h"
#include "modsecurity/rules_set.h"
#include "modsecurity/transaction.h"
#include "src/parser/driver.h"
#include "src/rule_marker.h"
#include "src/rule_with_actions.h" #include "src/rule_with_actions.h"
#include "src/utils/https_client.h"
namespace modsecurity { namespace modsecurity {
void Rules::fixDefaultActions(RulesWarnings *warnings, RulesErrors *errors) {
for (size_t i = 0; i < m_rules.size(); i++) {
auto &rule = m_rules[i];
RuleWithActions *r = dynamic_cast<RuleWithActions *>(rule.get());
if (!r) {
continue;
}
if (dynamic_cast<RuleWithOperator *>(rule.get())) {
RuleWithOperator *op = new RuleWithOperator(*dynamic_cast<RuleWithOperator *>(rule.get()));
std::unique_ptr<RuleWithOperator> nrp(op);
m_rules[i] = std::move(nrp);
} else if (dynamic_cast<RuleUnconditional *>(rule.get())) {
RuleUnconditional *un = new RuleUnconditional(*dynamic_cast<RuleUnconditional *>(rule.get()));
std::unique_ptr<RuleUnconditional> nrp(un);
m_rules[i] = std::move(nrp);
} else if (dynamic_cast<RuleScript *>(rule.get())) {
RuleScript *rs = new RuleScript(*dynamic_cast<RuleScript *>(rule.get()));
std::unique_ptr<RuleScript> nrp(rs);
m_rules[i] = std::move(nrp);
} else {
RuleWithActions *nr = new RuleWithActions(*dynamic_cast<RuleWithActions *>(rule.get()));
std::unique_ptr<RuleWithActions> nrp(nr);
m_rules[i] = std::move(nrp);
}
RuleWithActions *nr = dynamic_cast<RuleWithActions *>(m_rules[i].get());
nr->clearDefaultActions();
for (auto &a : m_defaultActions) {
nr->addDefaultAction(a);
}
for (auto a : m_defaultTransformations) {
nr->addDefaulTransformation(a);
}
}
}
int Rules::append(Rules *from) { int Rules::append(Rules *from) {
m_rules.insert(m_rules.end(), from->m_rules.begin(), from->m_rules.end()); m_rules.insert(m_rules.end(), from->m_rules.begin(), from->m_rules.end());

40
src/rules_set.cc
View File

@ -33,46 +33,6 @@ using modsecurity::Utils::HttpsClient;
namespace modsecurity { namespace modsecurity {
void Rules::fixDefaultActions(RulesWarnings *warnings, RulesErrors *errors) {
for (size_t i = 0; i < m_rules.size(); i++) {
auto &rule = m_rules[i];
RuleWithActions *r = dynamic_cast<RuleWithActions *>(rule.get());
if (!r) {
continue;
}
if (dynamic_cast<RuleWithOperator *>(rule.get())) {
RuleWithOperator *op = new RuleWithOperator(*dynamic_cast<RuleWithOperator *>(rule.get()));
std::unique_ptr<RuleWithOperator> nrp(op);
m_rules[i] = std::move(nrp);
} else if (dynamic_cast<RuleUnconditional *>(rule.get())) {
RuleUnconditional *un = new RuleUnconditional(*dynamic_cast<RuleUnconditional *>(rule.get()));
std::unique_ptr<RuleUnconditional> nrp(un);
m_rules[i] = std::move(nrp);
} else if (dynamic_cast<RuleScript *>(rule.get())) {
RuleScript *rs = new RuleScript(*dynamic_cast<RuleScript *>(rule.get()));
std::unique_ptr<RuleScript> nrp(rs);
m_rules[i] = std::move(nrp);
} else {
RuleWithActions *nr = new RuleWithActions(*dynamic_cast<RuleWithActions *>(rule.get()));
std::unique_ptr<RuleWithActions> nrp(nr);
m_rules[i] = std::move(nrp);
}
RuleWithActions *nr = dynamic_cast<RuleWithActions *>(m_rules[i].get());
nr->clearDefaultActions();
for (auto &a : m_defaultActions) {
nr->addDefaultAction(a);
}
for (auto a : m_defaultTransformations) {
nr->addDefaulTransformation(a);
}
}
}
/** /**
* @name loadFromUri * @name loadFromUri