github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-11-18 02:10:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Constify Transaction on variable resolution

Browse Source
This commit is contained in:
Felipe Zimmerle
2020-09-18 11:41:55 -03:00
parent b9735f8bcd
commit bd59555206
55 changed files with 242 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/collection/backend/in_memory-per_process.cc
View File

@@ -86,7 +86,7 @@ void InMemoryPerProcess::del(const std::string& key) {
void InMemoryPerProcess::resolveSingleMatch(const std::string& var,
VariableValues *l) {
VariableValues *l) const noexcept {
auto range = this->equal_range(var);
for (auto it = range.first; it != range.second; ++it) {
@@ -96,7 +96,7 @@ void InMemoryPerProcess::resolveSingleMatch(const std::string& var,
void InMemoryPerProcess::resolveMultiMatches(const std::string& var,
VariableValues *l, variables::KeyExclusions &ke) {
VariableValues *l, const variables::KeyExclusions &ke) const noexcept {
size_t keySize = var.size();
l->reserve(15);
@@ -121,7 +121,7 @@ void InMemoryPerProcess::resolveMultiMatches(const std::string& var,
void InMemoryPerProcess::resolveRegularExpression(const std::string& var,
VariableValues *l, variables::KeyExclusions &ke) {
VariableValues *l, const variables::KeyExclusions &ke) const noexcept {
//if (var.find(":") == std::string::npos) {
// return;
@@ -160,7 +160,7 @@ void InMemoryPerProcess::resolveRegularExpression(const std::string& var,
std::unique_ptr<std::string> InMemoryPerProcess::resolveFirst(
const std::string& var) {
const std::string& var) const noexcept {
auto range = equal_range(var);
for (auto it = range.first; it != range.second; ++it) {
return std::unique_ptr<std::string>(new std::string(it->second));

8
src/collection/backend/in_memory-per_process.h
View File

@@ -84,16 +84,16 @@ class InMemoryPerProcess :
void del(const std::string& key) override;
std::unique_ptr<std::string> resolveFirst(const std::string& var) override;
std::unique_ptr<std::string> resolveFirst(const std::string& var) const noexcept override;
void resolveSingleMatch(const std::string& var,
VariableValues *l) override;
VariableValues *l) const noexcept override;
void resolveMultiMatches(const std::string& var,
VariableValues *l,
variables::KeyExclusions &ke) override;
const variables::KeyExclusions &ke) const noexcept override;
void resolveRegularExpression(const std::string& var,
VariableValues *l,
variables::KeyExclusions &ke) override;
const variables::KeyExclusions &ke) const noexcept override;
private:
pthread_mutex_t m_lock;

33
src/collection/backend/lmdb.cc
View File

@@ -48,13 +48,13 @@ LMDB::~LMDB() {
}
void LMDB::string2val(const std::string& str, MDB_val *val) {
void LMDB::string2val(const std::string& str, MDB_val *val) const {
val->mv_size = sizeof(char)*(str.size());
val->mv_data = const_cast<char *>(str.c_str());
}
void LMDB::lmdb_debug(int rc, std::string op, std::string scope) {
void LMDB::lmdb_debug(int rc, std::string op, std::string scope) const {
#ifndef LMDB_STDOUT_COUT
return;
#else
@@ -162,7 +162,7 @@ void LMDB::lmdb_debug(int rc, std::string op, std::string scope) {
}
std::unique_ptr<std::string> LMDB::resolveFirst(const std::string& var) {
std::unique_ptr<std::string> LMDB::resolveFirst(const std::string& var) const noexcept {
int rc;
MDB_val mdb_key;
MDB_val mdb_value;
@@ -262,7 +262,7 @@ end_txn:
void LMDB::resolveSingleMatch(const std::string& var,
VariableValues *l) {
VariableValues *l) const noexcept {
int rc;
MDB_txn *txn;
MDB_dbi dbi;
@@ -287,10 +287,11 @@ void LMDB::resolveSingleMatch(const std::string& var,
mdb_cursor_open(txn, dbi, &cursor);
while ((rc = mdb_cursor_get(cursor, &mdb_key,
&mdb_value_ret, MDB_NEXT_DUP)) == 0) {
std::string a(
reinterpret_cast<char *>(mdb_value_ret.mv_data),
mdb_value_ret.mv_size);
l->emplace_back(&var, &a);
l->insert(l->begin(), std::make_shared<VariableValue>(
&m_name,
new std::string(var),
new std::string(reinterpret_cast<char *>(mdb_value_ret.mv_data),
mdb_value_ret.mv_size)));
}
mdb_cursor_close(cursor);
@@ -466,7 +467,7 @@ end_txn:
void LMDB::resolveMultiMatches(const std::string& var,
VariableValues *l,
variables::KeyExclusions &ke) {
const variables::KeyExclusions &ke) const noexcept {
MDB_val key, data;
MDB_txn *txn = NULL;
MDB_dbi dbi;
@@ -528,7 +529,7 @@ end_txn:
void LMDB::resolveRegularExpression(const std::string& var,
VariableValues *l,
variables::KeyExclusions &ke) {
const variables::KeyExclusions &ke) const noexcept {
MDB_val key, data;
MDB_txn *txn = NULL;
MDB_dbi dbi;
@@ -567,12 +568,16 @@ void LMDB::resolveRegularExpression(const std::string& var,
continue;
}
VariableValue *v = new VariableValue(
l->insert(l->begin(), std::make_shared<VariableValue>(
&m_name,
new std::string(reinterpret_cast<char *>(key.mv_data),
key.mv_size),
key.mv_size),
new std::string(reinterpret_cast<char *>(data.mv_data),
data.mv_size));
l->insert(l->begin(), v);
data.mv_size)));
//l->insert(l->begin(), std::make_shared<VariableValue>(&m_name,
// new std::string(reinterpret_cast<char *>(key.mv_data), key.mv_size),
// new std::string(reinterpret_cast<char *>(data.mv_data), data.mv_size))
//);
}
mdb_cursor_close(cursor);

12
src/collection/backend/lmdb.h
View File

@@ -63,20 +63,20 @@ class LMDB :
void del(const std::string& key) override;
std::unique_ptr<std::string> resolveFirst(const std::string& var) override;
std::unique_ptr<std::string> resolveFirst(const std::string& var) const noexcept override;
void resolveSingleMatch(const std::string& var,
VariableValues *l) override;
VariableValues *l) const noexcept override;
void resolveMultiMatches(const std::string& var,
VariableValues *l,
variables::KeyExclusions &ke) override;
const variables::KeyExclusions &ke) const noexcept override;
void resolveRegularExpression(const std::string& var,
VariableValues *l,
variables::KeyExclusions &ke) override;
const variables::KeyExclusions &ke) const noexcept override;
private:
void string2val(const std::string& str, MDB_val *val);
void inline lmdb_debug(int rc, std::string op, std::string scope);
void string2val(const std::string& str, MDB_val *val) const;
void inline lmdb_debug(int rc, std::string op, std::string scope) const;
MDB_env *m_env;
};