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

Refactoring: Renames RuleBase to Rule

Browse Source
This commit is contained in:
Felipe Zimmerle
2019-02-19 13:34:36 -03:00
parent 59d4268882
commit bdedfd2463
8 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
headers/modsecurity/rule.h
View File

@@ -66,9 +66,9 @@ using Tags = std::vector<actions::Tag *>;
using SetVars = std::vector<actions::SetVar *>;
using MatchActions = std::vector<actions::Action *>;
class RuleBase {
class Rule {
public:
RuleBase(std::unique_ptr<std::string> fileName, int lineNumber)
Rule(std::unique_ptr<std::string> 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<std::string> fileName,
int lineNumber)
: RuleBase(std::move(fileName), lineNumber),
: Rule(std::move(fileName), lineNumber),
m_name(std::make_shared<std::string>(name)) { }
@@ -139,7 +139,7 @@ class RuleMarker : public RuleBase {
};
class RuleWithActions : public RuleBase {
class RuleWithActions : public Rule {
public:
RuleWithActions(
Actions *a,

10
headers/modsecurity/rules.h
View File

@@ -61,11 +61,11 @@ class Rules {
return j;
}
bool insert(std::shared_ptr<RuleBase> rule) {
bool insert(std::shared_ptr<Rule> rule) {
return insert(rule, nullptr, nullptr);
}
bool insert(std::shared_ptr<RuleBase> rule, const std::vector<int64_t> *ids, std::ostringstream *err) {
bool insert(std::shared_ptr<Rule> rule, const std::vector<int64_t> *ids, std::ostringstream *err) {
RuleWithOperator *r = dynamic_cast<RuleWithOperator *>(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<RuleBase> operator[](int index) const { return m_rules[index]; }
std::shared_ptr<RuleBase> at(int index) const { return m_rules[index]; }
std::shared_ptr<Rule> operator[](int index) const { return m_rules[index]; }
std::shared_ptr<Rule> at(int index) const { return m_rules[index]; }
std::vector<std::shared_ptr<RuleBase> > m_rules;
std::vector<std::shared_ptr<Rule> > m_rules;
};

2
headers/modsecurity/rules_set_phases.h
View File

@@ -43,7 +43,7 @@ class Driver;
class RulesSetPhases {
public:
bool insert(std::shared_ptr<RuleBase> rule);
bool insert(std::shared_ptr<Rule> rule);
int append(RulesSetPhases *from, std::ostringstream *err);
void dump() const;