github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2026-01-01 06:09:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring on Action - having RuleWithAction and RuleWithActionsProperties

Browse Source
This commit is contained in:
Felipe Zimmerle
2020-09-23 13:48:15 -03:00
parent bd59555206
commit 79d574baa3
44 changed files with 2172 additions and 1533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/run_time_string.h
View File

@@ -75,7 +75,7 @@ class RunTimeString {
}
void populate(RuleWithActions *rule) noexcept {
void populate(const RuleWithActions *rule) noexcept {
for (auto &a : m_elements) {
a->populate(rule);
}
@@ -108,7 +108,6 @@ class RunTimeString {
rv = dynamic_cast<RuleVariable *>(nrv);
rv->populate(nullptr);
m_variable = std::unique_ptr<Variable>(nrv);
/* m_variable = nullptr; */
} else {
m_variable = other.m_variable;
}
@@ -119,7 +118,9 @@ class RunTimeString {
void appendValueTo(const Transaction *transaction, std::string &v) const noexcept {
if (m_variable && transaction) {
VariableValues l;
m_variable->evaluate(transaction, &l);
if (!l.empty()) {
v.append(l[0]->getValue());
}
@@ -130,19 +131,20 @@ class RunTimeString {
}
void populate(RuleWithActions *rule) noexcept {
void populate(const RuleWithActions *rule) noexcept {
if (!m_variable) {
return;
}
RuleVariable *vrule = dynamic_cast<RuleVariable *>(m_variable.get());
if (vrule != nullptr) {
vrule->populate(rule);
if (!vrule) {
return;
}
vrule->populate(rule);
}
private:
std::string m_string;
const std::string m_string;
/*
*
* FIXME: In the current state m_variable should be a unique_ptr. There