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

Reduce the workload on VariableValue

Browse Source 
Last compute at the last minute, if needed.
This commit is contained in:
Felipe Zimmerle
2020-09-17 19:51:34 -03:00
committed by Felipe Zimmerle
parent 8fa4fc67af
commit 820396f784
24 changed files with 255 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/variables/duration.cc
View File

@@ -31,9 +31,9 @@ void Duration::evaluate(Transaction *transaction,
VariableValues *l) {
double e = utils::cpu_seconds() - transaction->m_creationTimeStamp;
transaction->m_variableDuration.assign(std::to_string(e));
l->push_back(std::make_shared<VariableValue>(&m_retName, &transaction->m_variableDuration));
l->push_back(std::make_shared<VariableValue>(
std::unique_ptr<std::string>(new std::string(std::to_string(e))),
&m_retName));
}

26
src/variables/env.cc
View File

@@ -32,28 +32,30 @@ extern char **environ;
namespace modsecurity {
namespace variables {
void Env::evaluate(Transaction *transaction,
VariableValues *l) {
void Env::evaluate(Transaction *transaction, VariableValues *l) {
bool checkForKey = getVariableKey()->length() > 0;
for (char **current = environ; *current; current++) {
std::string env = std::string(*current);
size_t pos = env.find_first_of("=");
if (pos == std::string::npos) {
continue;
}
std::string key = std::string(env, 0, pos);
std::string value = std::string(env, pos+1, env.length() - (pos + 1));
std::pair<std::string, std::string> a(key, value);
transaction->m_variableEnvs.insert(a);
}
std::unique_ptr<std::string> key(new std::string(env, 0, pos));
std::unique_ptr<std::string> value(new std::string(env, pos+1, env.length() - (pos + 1)));
for (auto& x : transaction->m_variableEnvs) {
if (x.first != *getVariableKey() && getVariableKey()->length() > 0) {
if (checkForKey && *key != *getVariableKey()) {
continue;
}
if (!m_keyExclusion.toOmit(x.first)) {
l->emplace_back(std::make_shared<VariableValue>(getVariableKeyWithCollection().get(),
&x.first, &x.second));
if (m_keyExclusion.toOmit(*key)) {
continue;
}
l->emplace_back(std::make_shared<VariableValue>(
std::move(value),
std::move(key),
getVariableKeyWithCollection()
));
}
}

7
src/variables/env.h
View File

@@ -30,11 +30,10 @@ namespace variables {
class Env : public Variable {
public:
explicit Env(const std::string &_name)
: Variable(_name) { }
explicit Env(const std::string &name)
: Variable(name) { }
void evaluate(Transaction *transaction,
VariableValues *l) override;
void evaluate(Transaction *transaction, VariableValues *l) override;
};
} // namespace variables

6
src/variables/highest_severity.cc
View File

@@ -28,9 +28,9 @@ namespace variables {
void HighestSeverity::evaluate(Transaction *transaction,
VariableValues *l) {
transaction->m_variableHighestSeverityAction.assign(
std::to_string(transaction->m_highestSeverityAction));
l->push_back(std::make_shared<VariableValue>(getVariableKeyWithCollection().get(), &transaction->m_variableHighestSeverityAction));
l->push_back(std::make_shared<VariableValue>(
std::unique_ptr<std::string>(new std::string(std::to_string(transaction->m_highestSeverityAction))),
getVariableKeyWithCollection().get()));
}

2
src/variables/remote_user.cc
View File

@@ -63,7 +63,7 @@ void RemoteUser::evaluate(Transaction *transaction,
}
transaction->m_variableRemoteUser.assign(std::string(base64, 0, pos));
auto var = std::make_shared<VariableValue>(&l2[0]->getName(), &transaction->m_variableRemoteUser);
auto var = std::make_shared<VariableValue>(&m_retName, &transaction->m_variableRemoteUser);
for (auto &i : l2[0]->getOrigin()) {
var->addOrigin(i);

15
src/variables/rule.h
View File

@@ -57,8 +57,7 @@ class Rule_DictElement : public RuleVariable, public VariableDictElement {
static void id(Transaction *t,
const RuleWithActions *rule,
VariableValues *l) {
std::string a = std::to_string(rule->getId());
auto var = std::make_shared<VariableValue>(&m_rule, &m_rule_id, &a);
auto var = std::make_shared<VariableValue>(&m_rule, &m_rule_id, std::unique_ptr<std::string>(new std::string(std::to_string(rule->getId()))));
VariableOrigin origin;
origin.m_offset = 0;
origin.m_length = 0;
@@ -73,8 +72,7 @@ class Rule_DictElement : public RuleVariable, public VariableDictElement {
VariableValues *l) {
if (rule->hasRevisionAction()) {
std::string a(rule->getRevision());
auto var = std::make_shared<VariableValue>(&m_rule, &m_rule_rev, &a);
auto var = std::make_shared<VariableValue>(&m_rule, &m_rule_rev, std::unique_ptr<std::string>(new std::string(rule->getRevision())));
VariableOrigin origin;
origin.m_offset = 0;
origin.m_length = 0;
@@ -90,8 +88,7 @@ class Rule_DictElement : public RuleVariable, public VariableDictElement {
VariableValues *l) {
if (rule->hasSeverityAction()) {
std::string a(std::to_string(rule->getSeverity()));
auto var = std::make_shared<VariableValue>(&m_rule, &m_rule_severity, &a);
auto var = std::make_shared<VariableValue>(&m_rule, &m_rule_severity, std::unique_ptr<std::string>(new std::string(std::to_string(rule->getSeverity()))));
VariableOrigin origin;
origin.m_offset = 0;
origin.m_length = 0;
@@ -106,8 +103,7 @@ class Rule_DictElement : public RuleVariable, public VariableDictElement {
VariableValues *l) {
if (rule->hasLogDataAction()) {
std::string a(rule->getLogData(t));
auto var = std::make_shared<VariableValue>(&m_rule, &m_rule_logdata, &a);
auto var = std::make_shared<VariableValue>(&m_rule, &m_rule_logdata, std::unique_ptr<std::string>(new std::string(rule->getLogData(t))));
VariableOrigin origin;
origin.m_offset = 0;
origin.m_length = 0;
@@ -121,8 +117,7 @@ class Rule_DictElement : public RuleVariable, public VariableDictElement {
VariableValues *l) {
if (rule->hasMessageAction()) {
std::string a(rule->getMessage(t));
auto var = std::make_shared<VariableValue>(&m_rule, &m_rule_msg, &a);
auto var = std::make_shared<VariableValue>(&m_rule, &m_rule_msg, std::unique_ptr<std::string>(new std::string(rule->getMessage(t))));
VariableOrigin origin;
origin.m_offset = 0;
origin.m_length = 0;

5
src/variables/time.cc
View File

@@ -46,8 +46,9 @@ void Time::evaluate(Transaction *transaction,
localtime_r(&timer, &timeinfo);
strftime(tstr, 200, "%H:%M:%S", &timeinfo);
transaction->m_variableTime.assign(tstr);
l->push_back(std::make_shared<VariableValue>(&m_retName, &transaction->m_variableTime));
l->push_back(std::make_shared<VariableValue>(
std::unique_ptr<std::string>(new std::string(tstr)),
&m_retName));
}

6
src/variables/time_day.cc
View File

@@ -45,9 +45,9 @@ void TimeDay::evaluate(Transaction *transaction,
localtime_r(&timer, &timeinfo);
strftime(tstr, 200, "%d", &timeinfo);
transaction->m_variableTimeDay.assign(tstr);
l->push_back(std::make_shared<VariableValue>(&m_retName, &transaction->m_variableTimeDay));
l->push_back(std::make_shared<VariableValue>(
std::unique_ptr<std::string>(new std::string(tstr)),
&m_retName));
}

7
src/variables/time_epoch.cc
View File

@@ -35,9 +35,10 @@ namespace variables {
void TimeEpoch::evaluate(Transaction *transaction,
VariableValues *l) {
transaction->m_variableTimeEpoch.assign(
std::to_string(std::time(nullptr)));
l->push_back(std::make_shared<VariableValue>(&m_retName, &transaction->m_variableTimeEpoch));
l->push_back(std::make_shared<VariableValue>(
std::unique_ptr<std::string>(new std::string(std::to_string(std::time(nullptr)))),
&m_retName));
}

6
src/variables/time_hour.cc
View File

@@ -45,9 +45,9 @@ void TimeHour::evaluate(Transaction *transaction,
localtime_r(&timer, &timeinfo);
strftime(tstr, 200, "%H", &timeinfo);
transaction->m_variableTimeHour.assign(tstr);
l->push_back(std::make_shared<VariableValue>(&m_retName, &transaction->m_variableTimeHour));
l->push_back(std::make_shared<VariableValue>(
std::unique_ptr<std::string>(new std::string(tstr)),
&m_retName));
}

6
src/variables/time_min.cc
View File

@@ -45,9 +45,9 @@ void TimeMin::evaluate(Transaction *transaction,
localtime_r(&timer, &timeinfo);
strftime(tstr, 200, "%M", &timeinfo);
transaction->m_variableTimeMin.assign(tstr);
l->push_back(std::make_shared<VariableValue>(&m_retName, &transaction->m_variableTimeMin));
l->push_back(std::make_shared<VariableValue>(
std::unique_ptr<std::string>(new std::string(tstr)),
&m_retName));
}

10
src/variables/time_mon.cc
View File

@@ -44,12 +44,12 @@ void TimeMon::evaluate(Transaction *transaction,
localtime_r(&timer, &timeinfo);
strftime(tstr, 200, "%m", &timeinfo);
int a = atoi(tstr);
a--;
//int a = atoi(tstr);
//a--;
transaction->m_variableTimeMin.assign(std::to_string(a));
l->push_back(std::make_shared<VariableValue>(&m_retName, &transaction->m_variableTimeMin));
l->push_back(std::make_shared<VariableValue>(
std::unique_ptr<std::string>(new std::string(tstr)),
&m_retName));
}

6
src/variables/time_sec.cc
View File

@@ -45,9 +45,9 @@ void TimeSec::evaluate(Transaction *transaction,
localtime_r(&timer, &timeinfo);
strftime(tstr, 200, "%S", &timeinfo);
transaction->m_variableTimeSec.assign(tstr);
l->push_back(std::make_shared<VariableValue>(&m_retName, &transaction->m_variableTimeSec));
l->push_back(std::make_shared<VariableValue>(
std::unique_ptr<std::string>(new std::string(tstr)),
&m_retName));
}

6
src/variables/time_wday.cc
View File

@@ -45,9 +45,9 @@ void TimeWDay::evaluate(Transaction *transaction,
localtime_r(&timer, &timeinfo);
strftime(tstr, 200, "%u", &timeinfo);
transaction->m_variableTimeWDay.assign(tstr);
l->push_back(std::make_shared<VariableValue>(&m_retName, &transaction->m_variableTimeWDay));
l->push_back(std::make_shared<VariableValue>(
std::unique_ptr<std::string>(new std::string(tstr)),
&m_retName));
}

6
src/variables/time_year.cc
View File

@@ -45,9 +45,9 @@ void TimeYear::evaluate(Transaction *transaction,
localtime_r(&timer, &timeinfo);
strftime(tstr, 200, "%Y", &timeinfo);
transaction->m_variableTimeYear.assign(tstr);
l->push_back(std::make_shared<VariableValue>(&m_retName, &transaction->m_variableTimeYear));
l->push_back(std::make_shared<VariableValue>(
std::unique_ptr<std::string>(new std::string(tstr)),
&m_retName));
}

5
src/variables/variable.h
View File

@@ -772,8 +772,9 @@ class VariableModificatorCount : public Variable {
m_base->evaluate(t, &reslIn);
auto count = reslIn.size();
std::string res(std::to_string(count));
l->push_back(std::make_shared<VariableValue>(getVariableKeyWithCollection().get(), &res));
l->push_back(std::make_shared<VariableValue>(
std::unique_ptr<std::string>(new std::string(std::to_string(count))),
getVariableKeyWithCollection().get()));
return;
}