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

Collections cleanup: removes resolveFirstCopy method

Browse Source
This commit is contained in:
Felipe Zimmerle 2016-12-23 10:36:51 -03:00
parent 6fff8c954a
commit 168fa22e19
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
8 changed files with 4 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
headers/modsecurity/collection/collection.h
View File

@ -51,7 +51,6 @@ class Collection {
virtual void del(const std::string& key) = 0;
virtual std::string* resolveFirst(const std::string& var) = 0;
virtual std::string resolveFirstCopy(const std::string& var) = 0;
virtual void resolveSingleMatch(const std::string& var,
std::vector<const Variable *> *l) = 0;
@ -90,12 +89,6 @@ class Collection {
return resolveFirst(nkey);
}
virtual std::string resolveFirstCopy(const std::string& var,
std::string compartment) {
std::string nkey = compartment + "::" + var;
return resolveFirstCopy(nkey);
}
virtual void resolveSingleMatch(const std::string& var,
std::string compartment, std::vector<const Variable *> *l) {
std::string nkey = compartment + "::" + var;

3
headers/modsecurity/collection/collections.h
View File

@ -59,9 +59,6 @@ class Collections :
std::string* resolveFirst(const std::string& var);
std::string* resolveFirst(const std::string& collectionName,
const std::string& var);
std::string resolveFirstCopy(const std::string& var);
std::string resolveFirstCopy(const std::string& collectionName,
const std::string& var);
void resolveSingleMatch(const std::string& var,
std::vector<const Variable *> *l);

8
src/actions/set_var.cc
View File

@ -110,14 +110,14 @@ bool SetVar::evaluate(Rule *rule, Transaction *transm_parser_payload) {
}
try {
std::string resolvedValue =
transm_parser_payload->m_collections.resolveFirstCopy(
std::string *resolvedValue =
transm_parser_payload->m_collections.resolveFirst(
m_collectionName,
m_variableNameExpanded);
if (resolvedValue.empty()) {
if (resolvedValue == NULL || resolvedValue->empty()) {
value = 0;
} else {
value = stoi(resolvedValue);
value = stoi(*resolvedValue);
}
} catch (...) {
value = 0;

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

@ -166,17 +166,6 @@ std::string* InMemoryPerProcess::resolveFirst(const std::string& var) {
}
std::string InMemoryPerProcess::resolveFirstCopy(const std::string& var) {
auto range = equal_range(var);
for (auto it = range.first; it != range.second; ++it) {
return it->second;
}
return "";
}
} // namespace backend
} // namespace collection
} // namespace modsecurity

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

@ -83,7 +83,6 @@ class InMemoryPerProcess :
void del(const std::string& key) override;
std::string* resolveFirst(const std::string& var) override;
std::string resolveFirstCopy(const std::string& var) override;
void resolveSingleMatch(const std::string& var,
std::vector<const Variable *> *l) override;

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

@ -161,46 +161,6 @@ void LMDB::lmdb_debug(int rc, std::string op, std::string scope) {
}
std::string LMDB::resolveFirstCopy(const std::string& var) {
int rc;
MDB_val mdb_key;
MDB_val mdb_value;
MDB_val mdb_value_ret;
std::string ret;
MDB_txn *txn = NULL;
MDB_dbi dbi;
string2val(var, &mdb_key);
rc = mdb_txn_begin(m_env, NULL, 0, &txn);
lmdb_debug(rc, "txn", "resolveFirst");
if (rc != 0) {
goto end_txn;
}
rc = mdb_dbi_open(txn, NULL, MDB_CREATE | MDB_DUPSORT, &dbi);
lmdb_debug(rc, "dbi", "resolveFirst");
if (rc != 0) {
goto end_dbi;
}
rc = mdb_get(txn, dbi, &mdb_key, &mdb_value_ret);
lmdb_debug(rc, "get", "resolveFirst");
if (rc != 0) {
goto end_get;
}
ret.assign(
reinterpret_cast<char *>(mdb_value_ret.mv_data),
mdb_value_ret.mv_size);
end_get:
mdb_dbi_close(m_env, dbi);
end_dbi:
mdb_txn_abort(txn);
end_txn:
return ret;
}
std::string* LMDB::resolveFirst(const std::string& var) {
int rc;
MDB_val mdb_key;

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

@ -62,7 +62,6 @@ class LMDB :
void del(const std::string& key) override;
std::string* resolveFirst(const std::string& var) override;
std::string resolveFirstCopy(const std::string& var) override;
void resolveSingleMatch(const std::string& var,
std::vector<const Variable *> *l) override;

65
src/collection/collections.cc
View File

@ -190,71 +190,6 @@ std::string* Collections::resolveFirst(const std::string& collectionName,
}
std::string Collections::resolveFirstCopy(const std::string& var) {
std::string transientVar = m_transient->resolveFirstCopy(var);
if (transientVar.empty() == false) {
return transientVar;
}
for (auto &a : *this) {
std::string res = a.second->resolveFirstCopy(
utils::string::toupper(a.first) +
":" + var);
if (res.empty() == false) {
return res;
}
}
return "";
}
std::string Collections::resolveFirstCopy(const std::string& collectionName,
const std::string& var) {
if (utils::string::tolower(collectionName) == "ip"
&& !m_ip_collection_key.empty()) {
return m_ip_collection->resolveFirstCopy(
utils::string::toupper(collectionName)
+ ":" + var, m_ip_collection_key);
}
if (utils::string::tolower(collectionName) == "global"
&& !m_global_collection_key.empty()) {
return m_global_collection->resolveFirstCopy(
utils::string::toupper(collectionName) + ":" + var,
m_global_collection_key);
}
if (utils::string::tolower(collectionName) == "resource"
&& !m_resource_collection_key.empty()) {
return m_resource_collection->resolveFirstCopy(
utils::string::toupper(collectionName) + ":" + var,
m_resource_collection_key);
}
if (utils::string::tolower(collectionName) == "session"
&& !m_session_collection_key.empty()) {
return m_session_collection->resolveFirstCopy(
utils::string::toupper(collectionName) + ":" + var,
m_session_collection_key);
}
for (auto &a : *this) {
if (utils::string::tolower(a.first)
== utils::string::tolower(collectionName)) {
std::string res = a.second->resolveFirstCopy(
utils::string::toupper(a.first) + ":" + var);
if (res.empty() == false) {
return res;
}
}
}
return "";
}
void Collections::resolveSingleMatch(const std::string& var,
std::vector<const Variable *> *l) {