github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-30 03:34: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

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;