github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-11-16 01:22:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Makes Rule a shared pointer

Browse Source
This commit is contained in:
Felipe Zimmerle
2018-11-22 10:48:33 -03:00
parent f55ff85b36
commit 248cce8aff
11 changed files with 872 additions and 906 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
headers/modsecurity/rule.h
View File

@@ -100,20 +100,6 @@ class Rule {
bool containsTag(const std::string& name, Transaction *t);
bool containsMsg(const std::string& name, Transaction *t);
int refCountDecreaseAndCheck() {
m_referenceCount--;
if (m_referenceCount == 0) {
delete this;
return 1;
}
return 0;
}
void refCountIncrease() {
m_referenceCount++;
}
void executeTransformations(
actions::Action *a,
std::shared_ptr<std::string> newValue,
@@ -140,7 +126,7 @@ class Rule {
int m_phase;
modsecurity::Variables::Variables *m_variables;
operators::Operator *m_op;
Rule *m_chainedRuleChild;
std::shared_ptr<Rule> m_chainedRuleChild;
Rule *m_chainedRuleParent;
std::string m_fileName;
std::string m_marker;
@@ -152,7 +138,6 @@ class Rule {
std::vector<actions::Tag *> m_actionsTag;
private:
bool m_unconditional;
int m_referenceCount;
};

37
headers/modsecurity/rules.h
View File

@@ -37,19 +37,19 @@
namespace modsecurity {
class Rules : public std::vector<Rule *> {
class Rules {
public:
void dump() {
for (int j = 0; j < size(); j++) {
std::cout << " Rule ID: " << std::to_string(at(j)->m_ruleId);
std::cout << "--" << at(j) << std::endl;
for (int j = 0; j < m_rules.size(); j++) {
std::cout << " Rule ID: " << std::to_string(m_rules.at(j)->m_ruleId);
std::cout << "--" << m_rules.at(j) << std::endl;
}
}
int append(Rules *from, const std::vector<int64_t> &ids, std::ostringstream *err) {
size_t j = 0;
for (; j < from->size(); j++) {
Rule *rule = from->at(j);
Rule *rule = from->at(j).get();
if (std::binary_search(ids.begin(), ids.end(), rule->m_ruleId)) {
if (err != NULL) {
*err << "Rule id: " << std::to_string(rule->m_ruleId) \
@@ -57,11 +57,34 @@ class Rules : public std::vector<Rule *> {
}
return -1;
}
rule->refCountIncrease();
}
insert(end(), from->begin(), from->end());
m_rules.insert(m_rules.end(), from->m_rules.begin(), from->m_rules.end());
return j;
}
bool insert(std::shared_ptr<Rule> rule) {
return insert(rule, nullptr, nullptr);
}
bool insert(std::shared_ptr<Rule> rule, const std::vector<int64_t> *ids, std::ostringstream *err) {
if (ids != nullptr && err != nullptr
&& std::binary_search(ids->begin(), ids->end(), rule->m_ruleId)) {
if (err != NULL) {
*err << "Rule id: " << std::to_string(rule->m_ruleId) \
<< " is duplicated" << std::endl;
}
return false;
}
m_rules.push_back(rule);
return true;
}
size_t size() { return m_rules.size(); }
std::shared_ptr<Rule> operator[](int index) { return m_rules[index]; }
std::shared_ptr<Rule> at(int index) { return m_rules[index]; }
std::vector<std::shared_ptr<Rule> > m_rules;
};

21
headers/modsecurity/rules_set_phases.h
View File

@@ -31,26 +31,11 @@ class Driver;
/** @ingroup ModSecurity_CPP_API */
class RulesSetPhases {
public:
~RulesSetPhases() {
/** Cleanup the rules */
for (int i = 0; i < modsecurity::Phases::NUMBER_OF_PHASES; i++) {
Rules *rules = &m_rulesAtPhase[i];
while (rules->empty() == false) {
Rule *rule = rules->back();
rules->pop_back();
if (rule->refCountDecreaseAndCheck()) {
rule = NULL;
}
}
}
}
bool insert(Rule *rule) {
bool insert(std::shared_ptr<Rule> rule) {
if (rule->m_phase >= modsecurity::Phases::NUMBER_OF_PHASES) {
return false;
}
m_rulesAtPhase[rule->m_phase].push_back(rule);
m_rulesAtPhase[rule->m_phase].insert(std::move(rule));
return true;
}
@@ -62,7 +47,7 @@ class RulesSetPhases {
for (int i = 0; i < modsecurity::Phases::NUMBER_OF_PHASES; i++) {
v.reserve(m_rulesAtPhase[i].size());
for (size_t z = 0; z < m_rulesAtPhase[i].size(); z++) {
Rule *rule_ckc = m_rulesAtPhase[i].at(z);
Rule *rule_ckc = m_rulesAtPhase[i].at(z).get();
if (rule_ckc->m_secMarker == true) {
continue;
}