From bdedfd246312692442bfa996394e7be6f4ef6663 Mon Sep 17 00:00:00 2001 From: Felipe Zimmerle Date: Tue, 19 Feb 2019 13:34:36 -0300 Subject: [PATCH] Refactoring: Renames RuleBase to Rule --- headers/modsecurity/rule.h | 10 +++++----- headers/modsecurity/rules.h | 10 +++++----- headers/modsecurity/rules_set_phases.h | 2 +- src/rule.cc | 2 +- src/rules_set.cc | 4 ++-- src/rules_set_phases.cc | 2 +- src/run_time_string.cc | 2 +- src/run_time_string.h | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/headers/modsecurity/rule.h b/headers/modsecurity/rule.h index 811c93e5..2b43c4ae 100644 --- a/headers/modsecurity/rule.h +++ b/headers/modsecurity/rule.h @@ -66,9 +66,9 @@ using Tags = std::vector; using SetVars = std::vector; using MatchActions = std::vector; -class RuleBase { +class Rule { public: - RuleBase(std::unique_ptr fileName, int lineNumber) + Rule(std::unique_ptr fileName, int lineNumber) : m_fileName(std::move(fileName)), m_lineNumber(lineNumber), m_phase(modsecurity::Phases::RequestHeadersPhase) { @@ -103,13 +103,13 @@ class RuleBase { }; -class RuleMarker : public RuleBase { +class RuleMarker : public Rule { public: RuleMarker( const std::string &name, std::unique_ptr fileName, int lineNumber) - : RuleBase(std::move(fileName), lineNumber), + : Rule(std::move(fileName), lineNumber), m_name(std::make_shared(name)) { } @@ -139,7 +139,7 @@ class RuleMarker : public RuleBase { }; -class RuleWithActions : public RuleBase { +class RuleWithActions : public Rule { public: RuleWithActions( Actions *a, diff --git a/headers/modsecurity/rules.h b/headers/modsecurity/rules.h index 32226044..1e121d13 100644 --- a/headers/modsecurity/rules.h +++ b/headers/modsecurity/rules.h @@ -61,11 +61,11 @@ class Rules { return j; } - bool insert(std::shared_ptr rule) { + bool insert(std::shared_ptr rule) { return insert(rule, nullptr, nullptr); } - bool insert(std::shared_ptr rule, const std::vector *ids, std::ostringstream *err) { + bool insert(std::shared_ptr rule, const std::vector *ids, std::ostringstream *err) { RuleWithOperator *r = dynamic_cast(rule.get()); if (r && ids != nullptr && std::binary_search(ids->begin(), ids->end(), r->m_ruleId)) { if (err != nullptr) { @@ -79,10 +79,10 @@ class Rules { } size_t size() const { return m_rules.size(); } - std::shared_ptr operator[](int index) const { return m_rules[index]; } - std::shared_ptr at(int index) const { return m_rules[index]; } + std::shared_ptr operator[](int index) const { return m_rules[index]; } + std::shared_ptr at(int index) const { return m_rules[index]; } - std::vector > m_rules; + std::vector > m_rules; }; diff --git a/headers/modsecurity/rules_set_phases.h b/headers/modsecurity/rules_set_phases.h index 32c05db5..59d3fdf3 100644 --- a/headers/modsecurity/rules_set_phases.h +++ b/headers/modsecurity/rules_set_phases.h @@ -43,7 +43,7 @@ class Driver; class RulesSetPhases { public: - bool insert(std::shared_ptr rule); + bool insert(std::shared_ptr rule); int append(RulesSetPhases *from, std::ostringstream *err); void dump() const; diff --git a/src/rule.cc b/src/rule.cc index d349efde..9e58835b 100644 --- a/src/rule.cc +++ b/src/rule.cc @@ -57,7 +57,7 @@ RuleWithActions::RuleWithActions( Transformations *transformations, std::unique_ptr fileName, int lineNumber) - : RuleBase(std::move(fileName), lineNumber), + : Rule(std::move(fileName), lineNumber), m_rev(""), m_ver(""), m_accuracy(0), diff --git a/src/rules_set.cc b/src/rules_set.cc index e36730ff..a658764d 100644 --- a/src/rules_set.cc +++ b/src/rules_set.cc @@ -135,7 +135,7 @@ int RulesSet::evaluate(int phase, Transaction *t) { for (int i = 0; i < rules->size(); i++) { // FIXME: This is not meant to be here. At the end of this refactoring, // the shared pointer won't be used. - std::shared_ptr rule = rules->at(i); + std::shared_ptr rule = rules->at(i); if (t->isInsideAMarker() && !rule->isMarker()) { ms_dbg_a(t, 9, "Skipped rule id '" + rule->getReference() \ + "' due to a SecMarker: " + *t->getCurrentMarker()); @@ -152,7 +152,7 @@ int RulesSet::evaluate(int phase, Transaction *t) { ms_dbg_a(t, 9, "Skipped rule id '" + rule->getReference() \ + "' as request trough the utilization of an `allow' action."); } else { - RuleBase *base = rule.get(); + Rule *base = rule.get(); RuleWithOperator *ruleWithOperator = dynamic_cast(base); if (m_exceptions.contains(ruleWithOperator->m_ruleId)) { ms_dbg_a(t, 9, "Skipped rule id '" + rule->getReference() \ diff --git a/src/rules_set_phases.cc b/src/rules_set_phases.cc index d0c4e2d9..6d92530e 100644 --- a/src/rules_set_phases.cc +++ b/src/rules_set_phases.cc @@ -29,7 +29,7 @@ namespace modsecurity { -bool RulesSetPhases::insert(std::shared_ptr rule) { +bool RulesSetPhases::insert(std::shared_ptr rule) { if (rule->getPhase() >= modsecurity::Phases::NUMBER_OF_PHASES) { return false; } diff --git a/src/run_time_string.cc b/src/run_time_string.cc index 05378655..604467e8 100644 --- a/src/run_time_string.cc +++ b/src/run_time_string.cc @@ -51,7 +51,7 @@ std::string RunTimeString::evaluate(Transaction *t) { } -std::string RunTimeString::evaluate(Transaction *t, RuleBase *r) { +std::string RunTimeString::evaluate(Transaction *t, Rule *r) { std::string s; for (auto &z : m_elements) { if (z->m_string.size() > 0) { diff --git a/src/run_time_string.h b/src/run_time_string.h index 37c6f682..85b02dd0 100644 --- a/src/run_time_string.h +++ b/src/run_time_string.h @@ -49,7 +49,7 @@ class RunTimeString { void appendText(const std::string &text); void appendVar(std::unique_ptr var); std::string evaluate(Transaction *t); - std::string evaluate(Transaction *t, RuleBase *r); + std::string evaluate(Transaction *t, Rule *r); std::string evaluate() { return evaluate(NULL); }