mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-09-30 03:34:29 +03:00
Using direct variable access instead m_collections
This commit is contained in:
Felipe Zimmerle
@@ -44,309 +44,11 @@ Collections::Collections(Collection *global,
|
||||
m_ip_collection(ip),
|
||||
m_session_collection(session),
|
||||
m_user_collection(user),
|
||||
m_transient(new backend::InMemoryPerProcess()) {
|
||||
/* Create collection TX */
|
||||
this->emplace("TX", new backend::InMemoryPerProcess());
|
||||
}
|
||||
m_tx_collection(new backend::InMemoryPerProcess()) { }
|
||||
|
||||
|
||||
Collections::~Collections() {
|
||||
for (const auto &thing : *this) {
|
||||
delete thing.second;
|
||||
}
|
||||
delete m_transient;
|
||||
this->clear();
|
||||
}
|
||||
Collections::~Collections() { }
|
||||
|
||||
void Collections::storeOrUpdateFirst(const std::string& collectionName,
|
||||
const std::string& variableName,
|
||||
const std::string& targetValue) {
|
||||
storeOrUpdateFirst(collectionName, variableName, "", targetValue);
|
||||
}
|
||||
|
||||
void Collections::storeOrUpdateFirst(const std::string& collectionName,
|
||||
const std::string& variableName, const std::string& appid,
|
||||
const std::string& targetValue) {
|
||||
if (utils::string::tolower(collectionName) == "ip"
|
||||
&& !m_ip_collection_key.empty()) {
|
||||
m_ip_collection->storeOrUpdateFirst(collectionName + ":"
|
||||
+ variableName, m_ip_collection_key, targetValue);
|
||||
return;
|
||||
}
|
||||
|
||||
if (utils::string::tolower(collectionName) == "global"
|
||||
&& !m_global_collection_key.empty()) {
|
||||
m_global_collection->storeOrUpdateFirst(collectionName + ":"
|
||||
+ variableName, m_global_collection_key, targetValue);
|
||||
return;
|
||||
}
|
||||
|
||||
if (utils::string::tolower(collectionName) == "resource"
|
||||
&& !m_resource_collection_key.empty()) {
|
||||
m_resource_collection->storeOrUpdateFirst(collectionName + ":"
|
||||
+ variableName, m_resource_collection_key, appid, targetValue);
|
||||
return;
|
||||
}
|
||||
|
||||
if (utils::string::tolower(collectionName) == "session"
|
||||
&& !m_session_collection_key.empty()) {
|
||||
m_session_collection->storeOrUpdateFirst(collectionName + ":"
|
||||
+ variableName, m_session_collection_key, appid, targetValue);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
Collection *collection;
|
||||
collection = this->at(collectionName);
|
||||
collection->storeOrUpdateFirst(collectionName + ":"
|
||||
+ variableName, targetValue);
|
||||
} catch (...) {
|
||||
#if 0
|
||||
debug(9, "don't know any collection named: "
|
||||
+ collectionName + ". it was created?");
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void Collections::store(std::string key, std::string value) {
|
||||
m_transient->store(key, value);
|
||||
}
|
||||
|
||||
|
||||
bool Collections::storeOrUpdateFirst(const std::string &key,
|
||||
const std::string &value) {
|
||||
return m_transient->storeOrUpdateFirst(key, value);
|
||||
}
|
||||
|
||||
|
||||
bool Collections::updateFirst(const std::string &key,
|
||||
const std::string &value) {
|
||||
return m_transient->updateFirst(key, value);
|
||||
}
|
||||
|
||||
|
||||
void Collections::del(const std::string& key) {
|
||||
return m_transient->del(key);
|
||||
}
|
||||
|
||||
|
||||
std::unique_ptr<std::string> Collections::resolveFirst(const std::string& var) {
|
||||
std::unique_ptr<std::string> transientVar = m_transient->resolveFirst(var);
|
||||
|
||||
if (transientVar != NULL) {
|
||||
return transientVar;
|
||||
}
|
||||
|
||||
for (auto &a : *this) {
|
||||
std::unique_ptr<std::string> res = a.second->resolveFirst(
|
||||
utils::string::toupper(a.first) + ":" + var);
|
||||
|
||||
if (res != NULL) {
|
||||
return res;
|
||||
}
|
||||
}
|
||||
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
std::unique_ptr<std::string> Collections::resolveFirst(
|
||||
const std::string& collectionName, const std::string& var) {
|
||||
return resolveFirst(collectionName, "", var);
|
||||
}
|
||||
|
||||
std::unique_ptr<std::string> Collections::resolveFirst(
|
||||
const std::string& collectionName, const std::string &appid,
|
||||
const std::string& var) {
|
||||
if (utils::string::tolower(collectionName) == "ip"
|
||||
&& !m_ip_collection_key.empty()) {
|
||||
return m_ip_collection->resolveFirst(
|
||||
utils::string::toupper(collectionName)
|
||||
+ ":" + var, m_ip_collection_key);
|
||||
}
|
||||
|
||||
if (utils::string::tolower(collectionName) == "global"
|
||||
&& !m_global_collection_key.empty()) {
|
||||
return m_global_collection->resolveFirst(
|
||||
utils::string::toupper(collectionName)
|
||||
+ ":" + var, m_global_collection_key);
|
||||
}
|
||||
|
||||
if (utils::string::tolower(collectionName) == "resource"
|
||||
&& !m_resource_collection_key.empty()) {
|
||||
return m_resource_collection->resolveFirst(
|
||||
utils::string::toupper(collectionName)
|
||||
+ ":" + var, m_resource_collection_key, appid);
|
||||
}
|
||||
|
||||
if (utils::string::tolower(collectionName) == "session"
|
||||
&& !m_session_collection_key.empty()) {
|
||||
return m_session_collection->resolveFirst(
|
||||
utils::string::toupper(collectionName)
|
||||
+ ":" + var, m_session_collection_key, appid);
|
||||
}
|
||||
|
||||
for (auto &a : *this) {
|
||||
if (utils::string::tolower(a.first)
|
||||
== utils::string::tolower(collectionName)) {
|
||||
std::unique_ptr<std::string> res = a.second->resolveFirst(
|
||||
utils::string::toupper(a.first)
|
||||
+ ":" + var);
|
||||
if (res != NULL) {
|
||||
return res;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
void Collections::resolveSingleMatch(const std::string& var,
|
||||
std::vector<const Variable *> *l) {
|
||||
|
||||
m_transient->resolveSingleMatch(var, l);
|
||||
}
|
||||
|
||||
void Collections::resolveSingleMatch(const std::string& var,
|
||||
const std::string& collection,
|
||||
std::vector<const Variable *> *l) {
|
||||
resolveSingleMatch(var, collection, "", l);
|
||||
}
|
||||
|
||||
void Collections::resolveSingleMatch(const std::string& var,
|
||||
const std::string& collection, const std::string& appid,
|
||||
std::vector<const Variable *> *l) {
|
||||
|
||||
if (utils::string::tolower(collection) == "ip"
|
||||
&& !m_ip_collection_key.empty()) {
|
||||
m_ip_collection->resolveSingleMatch(var, m_ip_collection_key, l);
|
||||
return;
|
||||
}
|
||||
|
||||
if (utils::string::tolower(collection) == "global"
|
||||
&& !m_global_collection_key.empty()) {
|
||||
m_global_collection->resolveSingleMatch(var,
|
||||
m_global_collection_key, l);
|
||||
return;
|
||||
}
|
||||
|
||||
if (utils::string::tolower(collection) == "resource"
|
||||
&& !m_resource_collection_key.empty()) {
|
||||
m_resource_collection->resolveSingleMatch(var,
|
||||
m_resource_collection_key, appid, l);
|
||||
return;
|
||||
}
|
||||
|
||||
if (utils::string::tolower(collection) == "session"
|
||||
&& !m_session_collection_key.empty()) {
|
||||
m_session_collection->resolveSingleMatch(var,
|
||||
m_session_collection_key, appid, l);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
this->at(collection)->resolveSingleMatch(var, l);
|
||||
} catch (...) { }
|
||||
}
|
||||
|
||||
void Collections::resolveMultiMatches(const std::string& var,
|
||||
std::vector<const Variable *> *l) {
|
||||
|
||||
m_transient->resolveMultiMatches(var, l);
|
||||
}
|
||||
|
||||
void Collections::resolveMultiMatches(const std::string& var,
|
||||
const std::string& collection,
|
||||
std::vector<const Variable *> *l) {
|
||||
return resolveMultiMatches(var, collection, "", l);
|
||||
}
|
||||
|
||||
void Collections::resolveMultiMatches(const std::string& var,
|
||||
const std::string& collection, const std::string &appid,
|
||||
std::vector<const Variable *> *l) {
|
||||
if (utils::string::tolower(collection) == "ip"
|
||||
&& !m_ip_collection_key.empty()) {
|
||||
m_ip_collection->resolveMultiMatches(var, m_ip_collection_key, l);
|
||||
return;
|
||||
}
|
||||
|
||||
if (utils::string::tolower(collection) == "global"
|
||||
&& !m_global_collection_key.empty()) {
|
||||
m_global_collection->resolveMultiMatches(var,
|
||||
m_global_collection_key, l);
|
||||
return;
|
||||
}
|
||||
|
||||
if (utils::string::tolower(collection) == "resource"
|
||||
&& !m_resource_collection_key.empty()) {
|
||||
m_resource_collection->resolveMultiMatches(var,
|
||||
m_resource_collection_key, appid, l);
|
||||
return;
|
||||
}
|
||||
|
||||
if (utils::string::tolower(collection) == "session"
|
||||
&& !m_session_collection_key.empty()) {
|
||||
m_session_collection->resolveMultiMatches(var,
|
||||
m_session_collection_key, appid, l);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
this->at(collection)->resolveMultiMatches(var, l);
|
||||
} catch (...) { }
|
||||
}
|
||||
|
||||
void Collections::resolveRegularExpression(const std::string& var,
|
||||
std::vector<const Variable *> *l) {
|
||||
m_transient->resolveRegularExpression(var, l);
|
||||
}
|
||||
|
||||
void Collections::resolveRegularExpression(const std::string& var,
|
||||
const std::string& collection,
|
||||
std::vector<const Variable *> *l) {
|
||||
return resolveRegularExpression(var, collection, "", l);
|
||||
}
|
||||
|
||||
void Collections::resolveRegularExpression(const std::string& var,
|
||||
const std::string& collection, const std::string &appid,
|
||||
std::vector<const Variable *> *l) {
|
||||
if (utils::string::tolower(collection) == "ip"
|
||||
&& !m_ip_collection_key.empty()) {
|
||||
m_ip_collection->resolveRegularExpression(
|
||||
utils::string::toupper(collection)
|
||||
+ ":" + var, m_ip_collection_key, l);
|
||||
return;
|
||||
}
|
||||
|
||||
if (utils::string::tolower(collection) == "global"
|
||||
&& !m_global_collection_key.empty()) {
|
||||
m_global_collection->resolveRegularExpression(
|
||||
utils::string::toupper(collection)
|
||||
+ ":" + var, m_global_collection_key, l);
|
||||
return;
|
||||
}
|
||||
|
||||
if (utils::string::tolower(collection) == "resource"
|
||||
&& !m_resource_collection_key.empty()) {
|
||||
m_resource_collection->resolveRegularExpression(
|
||||
utils::string::toupper(collection)
|
||||
+ ":" + var, m_resource_collection_key, appid, l);
|
||||
return;
|
||||
}
|
||||
|
||||
if (utils::string::tolower(collection) == "session"
|
||||
&& !m_session_collection_key.empty()) {
|
||||
m_session_collection->resolveRegularExpression(
|
||||
utils::string::toupper(collection)
|
||||
+ ":" + var, m_session_collection_key, appid, l);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
this->at(collection)->resolveRegularExpression(var, l);
|
||||
} catch (...) { }
|
||||
}
|
||||
|
||||
} // namespace collection
|
||||
} // namespace modsecurity
|
||||
|
||||
Reference in New Issue
Block a user