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

Rule: isMarker is no longer necessary

Browse Source
This commit is contained in:
Felipe Zimmerle 2019-02-25 11:32:43 -03:00
parent 766b373c3b
commit 5c40997028
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
headers/modsecurity/rule.h
View File

@ -101,9 +101,6 @@ class Rule {
return *m_fileName + ":" + std::to_string(m_lineNumber);
}
virtual bool isMarker() { return false; }
private:
std::shared_ptr<std::string> m_fileName;
int m_lineNumber;

4
headers/modsecurity/rule_marker.h
View File

@ -58,12 +58,10 @@ class RuleMarker : public Rule {
};
std::shared_ptr<std::string> getName() {
std::shared_ptr<std::string> getName() const {
return m_name;
}
bool isMarker() override { return true; }
private:
std::shared_ptr<std::string> m_name;
};

15
src/rules_set.cc
View File

@ -20,6 +20,7 @@
#include <vector>
#include "modsecurity/rules_set.h"
#include "modsecurity/rule_marker.h"
#include "modsecurity/modsecurity.h"
#include "modsecurity/transaction.h"
#include "src/parser/driver.h"
@ -176,12 +177,14 @@ int RulesSet::evaluate(int phase, Transaction *t) {
// FIXME: This is not meant to be here. At the end of this refactoring,
// the shared pointer won't be used.
auto 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());
} else if (rule->isMarker()) {
rule->evaluate(t);
if (t->isInsideAMarker()) {
RuleMarker *ruleMarker = dynamic_cast<RuleMarker *>(rule.get());
if (!ruleMarker) {
ms_dbg_a(t, 9, "Skipped rule id '" + rule->getReference() \
+ "' due to a SecMarker: " + *t->getCurrentMarker());
} else {
rule->evaluate(t);
}
} else if (t->m_skip_next > 0) {
t->m_skip_next--;
ms_dbg_a(t, 9, "Skipped rule id '" + rule->getReference() \