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

Cosmetics: Defining a type for RuleId

Browse Source
This commit is contained in:
Felipe Zimmerle 2019-03-20 16:21:28 -03:00
parent 999af35e22
commit 5bd6c58385
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
headers/modsecurity/modsecurity.h
View File

@ -95,6 +95,8 @@ namespace modsecurity {
*/
using ModSecString = std::string;
using RuleId = int64_t;
/**
*
* The Phases enumerator consists in mapping the different stages of a

4
headers/modsecurity/rules.h
View File

@ -45,13 +45,13 @@ class Rules {
void dump() const;
int append(Rules *from,
const std::vector<int64_t> &ids,
const std::vector<RuleId> &ids,
std::ostringstream *err);
bool insert(const std::shared_ptr<Rule> &rule);
bool insert(std::shared_ptr<Rule> rule,
const std::vector<int64_t> *ids,
const std::vector<RuleId> *ids,
std::ostringstream *err);
size_t size() const;

4
src/rule_with_actions.h
View File

@ -420,7 +420,7 @@ class RuleWithActions : public Rule {
return dst;
}
inline int64_t getId() const { return m_ruleId; }
inline RuleId getId() const { return m_ruleId; }
void setId(int id) {
m_ruleId = id;
}
@ -455,7 +455,7 @@ class RuleWithActions : public Rule {
}
private:
int64_t m_ruleId;
RuleId m_ruleId;
std::shared_ptr<RuleWithActions> m_chainedRuleChild;
RuleWithActions *m_chainedRuleParent;

4
src/rules.cc
View File

@ -20,7 +20,7 @@
namespace modsecurity {
int Rules::append(Rules *from, const std::vector<int64_t> &ids, std::ostringstream *err) {
int Rules::append(Rules *from, const std::vector<RuleId> &ids, std::ostringstream *err) {
size_t j = 0;
for (; j < from->size(); j++) {
RuleWithActions *rule = dynamic_cast<RuleWithActions*>(from->at(j).get());
@ -42,7 +42,7 @@ bool Rules::insert(const std::shared_ptr<Rule> &rule) {
}
bool Rules::insert(std::shared_ptr<Rule> rule, const std::vector<int64_t> *ids, std::ostringstream *err) {
bool Rules::insert(std::shared_ptr<Rule> rule, const std::vector<RuleId> *ids, std::ostringstream *err) {
RuleWithActions*r = dynamic_cast<RuleWithActions*>(rule.get());
if (r && ids != nullptr
&& std::binary_search(ids->begin(), ids->end(), r->getId())) {

2
test/cppcheck_suppressions.txt
View File

@ -56,6 +56,8 @@ duplicateBranch:src/request_body_processor/multipart.cc:93
danglingTempReference:src/modsecurity.cc:204
knownConditionTrueFalse:src/operators/validate_url_encoding.cc:77
knownConditionTrueFalse:src/operators/verify_svnr.cc:88
noConstructor:src/actions/rule_id.h:33
functionStatic:src/actions/rule_id.h:35
noExplicitConstructor:seclang-parser.hh