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

Refactoring: renames Rule to RuleWithOperator

Browse Source
This commit is contained in:
Felipe Zimmerle
2019-02-19 11:08:47 -03:00
parent 8eb7b8fe6c
commit 59d4268882
100 changed files with 657 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@
namespace modsecurity {
class Transaction;
class Rule;
class RuleWithOperator;
class RuleWithActions;
namespace actions {

2
headers/modsecurity/modsecurity.h
View File

@@ -229,7 +229,7 @@ namespace modsecurity {
namespace actions {
class Action;
}
class Rule;
class RuleWithOperator;
#ifdef __cplusplus
extern "C" {

10
headers/modsecurity/rule.h
View File

@@ -216,16 +216,16 @@ class RuleWithActions : public RuleBase {
};
class Rule : public RuleWithActions {
class RuleWithOperator : public RuleWithActions {
public:
Rule(operators::Operator *op,
RuleWithOperator(operators::Operator *op,
variables::Variables *variables,
std::vector<actions::Action *> *actions,
Transformations *transformations,
std::unique_ptr<std::string> fileName,
int lineNumber);
virtual ~Rule();
virtual ~RuleWithOperator();
bool evaluate(Transaction *transaction,
std::shared_ptr<RuleMessage> rm) override;
@@ -250,8 +250,8 @@ class Rule : public RuleWithActions {
return std::to_string(m_ruleId);
}
std::unique_ptr<Rule> m_chainedRuleChild;
Rule *m_chainedRuleParent;
std::unique_ptr<RuleWithOperator> m_chainedRuleChild;
RuleWithOperator *m_chainedRuleParent;
private:
modsecurity::variables::Variables *m_variables;

4
headers/modsecurity/rule_message.h
View File

@@ -41,7 +41,7 @@ class RuleMessage {
ClientLogMessageInfo = 4
};
explicit RuleMessage(Rule *rule, Transaction *trans) :
explicit RuleMessage(RuleWithOperator *rule, Transaction *trans) :
m_accuracy(rule->m_accuracy),
m_clientIpAddress(trans->m_clientIpAddress),
m_data(""),
@@ -103,7 +103,7 @@ class RuleMessage {
int m_phase;
std::string m_reference;
std::string m_rev;
Rule *m_rule;
RuleWithOperator *m_rule;
std::shared_ptr<std::string> m_ruleFile;
int m_ruleId;
int m_ruleLine;

6
headers/modsecurity/rules.h
View File

@@ -48,7 +48,7 @@ class Rules {
int append(Rules *from, const std::vector<int64_t> &ids, std::ostringstream *err) {
size_t j = 0;
for (; j < from->size(); j++) {
Rule *rule = dynamic_cast<Rule *>(from->at(j).get());
RuleWithOperator *rule = dynamic_cast<RuleWithOperator *>(from->at(j).get());
if (rule && std::binary_search(ids.begin(), ids.end(), rule->m_ruleId)) {
if (err != NULL) {
*err << "Rule id: " << std::to_string(rule->m_ruleId) \
@@ -66,8 +66,8 @@ class Rules {
}
bool insert(std::shared_ptr<RuleBase> rule, const std::vector<int64_t> *ids, std::ostringstream *err) {
Rule *r = dynamic_cast<Rule *>(rule.get());
if (ids != nullptr && std::binary_search(ids->begin(), ids->end(), r->m_ruleId)) {
RuleWithOperator *r = dynamic_cast<RuleWithOperator *>(rule.get());
if (r && ids != nullptr && std::binary_search(ids->begin(), ids->end(), r->m_ruleId)) {
if (err != nullptr) {
*err << "Rule id: " << std::to_string(r->m_ruleId) \
<< " is duplicated" << std::endl;

2
headers/modsecurity/rules_set.h
View File

@@ -37,7 +37,7 @@
#ifdef __cplusplus
namespace modsecurity {
class Rule;
class RuleWithOperator;
namespace Parser {
class Driver;
}

5
headers/modsecurity/rules_set_phases.h
View File

@@ -34,7 +34,10 @@
#ifdef __cplusplus
namespace modsecurity {
class Rule;
class RuleWithOperator;
namespace Parser {
class Driver;
}
/** @ingroup ModSecurity_CPP_API */
class RulesSetPhases {