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

Using Collection instead of GlobalCollection

Browse Source 
Both has the same methods and characteristics except for the fact that
one is global and the other not. That can be handled by the backend.
This commit is contained in:
Felipe Zimmerle
2016-05-04 14:18:02 -03:00
parent 64c4f23a4e
commit 3062ff2aa5
14 changed files with 135 additions and 649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,8 @@ bool InMemoryPerProcess::storeOrUpdateFirst(const std::string &key,
}
bool InMemoryPerProcess::updateFirst(const std::string &key, const std::string &value) {
bool InMemoryPerProcess::updateFirst(const std::string &key,
const std::string &value) {
auto range = this->equal_range(key);
for (auto it = range.first; it != range.second; ++it) {
@@ -121,6 +122,63 @@ std::string* InMemoryPerProcess::resolveFirst(const std::string& var) {
return NULL;
}
void InMemoryPerProcess::store(std::string key, std::string compartment,
std::string value) {
std::string nkey = key + "::" + compartment;
store(nkey, value);
}
bool InMemoryPerProcess::storeOrUpdateFirst(const std::string &key,
std::string compartment, const std::string &value) {
std::string nkey = key + "::" + compartment;
return storeOrUpdateFirst(nkey, value);
}
bool InMemoryPerProcess::updateFirst(const std::string &key,
std::string compartment, const std::string &value) {
std::string nkey = key + "::" + compartment;
return updateFirst(nkey, value);
}
void InMemoryPerProcess::del(const std::string& key,
std::string compartment) {
std::string nkey = key + "::" + compartment;
del(nkey);
}
std::string* InMemoryPerProcess::resolveFirst(const std::string& var,
std::string compartment) {
std::string nkey = var + "::" + compartment;
return resolveFirst(nkey);
}
void InMemoryPerProcess::resolveSingleMatch(const std::string& var,
std::string compartment, std::vector<const Variable *> *l) {
std::string nkey = var + "::" + compartment;
resolveSingleMatch(nkey, l);
}
void InMemoryPerProcess::resolveMultiMatches(const std::string& var,
std::string compartment, std::vector<const Variable *> *l) {
std::string nkey = var + "::" + compartment;
resolveMultiMatches(nkey, l);
}
void InMemoryPerProcess::resolveRegularExpression(const std::string& var,
std::string compartment, std::vector<const Variable *> *l) {
std::string nkey = var + "::" + compartment;
resolveRegularExpression(nkey, l);
}
} // namespace backend
} // namespace collection
} // namespace modsecurity

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

@@ -27,8 +27,8 @@
#include "modsecurity/collection/variable.h"
#include "modsecurity/collection/collection.h"
#ifndef HEADERS_MODSECURITY_COLLECTION_BACKEND_IN_MEMORY_PER_PROCESS_H_
#define HEADERS_MODSECURITY_COLLECTION_BACKEND_IN_MEMORY_PER_PROCESS_H_
#ifndef SRC_COLLECTION_BACKEND_IN_MEMORY_PER_PROCESS_H_
#define SRC_COLLECTION_BACKEND_IN_MEMORY_PER_PROCESS_H_
#ifdef __cplusplus
namespace modsecurity {
@@ -46,14 +46,11 @@ namespace backend {
*/
struct MyEqual {
bool operator()(const std::string& Left, const std::string& Right) const {
/*
return Left.size() == Right.size()
&& std::equal(Left.begin(), Left.end(), Right.begin(),
[](char a, char b) {
return tolower(a) == tolower(b);
});
*/
return Left == Right;
}
};
@@ -75,23 +72,41 @@ class InMemoryPerProcess :
public:
InMemoryPerProcess();
~InMemoryPerProcess();
void store(std::string key, std::string value);
void store(std::string key, std::string value) override;
bool storeOrUpdateFirst(const std::string &key,
const std::string &value);
const std::string &value) override;
bool updateFirst(const std::string &key, const std::string &value);
bool updateFirst(const std::string &key,
const std::string &value) override;
void del(const std::string& key);
void del(const std::string& key) override;
std::string* resolveFirst(const std::string& var);
std::string* resolveFirst(const std::string& var) override;
void resolveSingleMatch(const std::string& var,
std::vector<const Variable *> *l);
std::vector<const Variable *> *l) override;
void resolveMultiMatches(const std::string& var,
std::vector<const Variable *> *l);
std::vector<const Variable *> *l) override;
void resolveRegularExpression(const std::string& var,
std::vector<const Variable *> *l);
std::vector<const Variable *> *l) override;
void store(std::string key, std::string compartment,
std::string value) override;
bool storeOrUpdateFirst(const std::string &key, std::string compartment,
const std::string &value) override;
bool updateFirst(const std::string &key, std::string compartment,
const std::string &value) override;
void del(const std::string& key, std::string compartment) override;
std::string* resolveFirst(const std::string& var,
std::string compartment) override;
void resolveSingleMatch(const std::string& var, std::string compartment,
std::vector<const Variable *> *l) override;
void resolveMultiMatches(const std::string& var, std::string compartment,
std::vector<const Variable *> *l) override;
void resolveRegularExpression(const std::string& var,
std::string compartment, std::vector<const Variable *> *l) override;
};
} // namespace backend
@@ -100,4 +115,4 @@ class InMemoryPerProcess :
#endif
#endif // HEADERS_MODSECURITY_COLLECTION_BACKEND_IN_MEMORY_PER_PROCESS_H_
#endif // SRC_COLLECTION_BACKEND_IN_MEMORY_PER_PROCESS_H_

7
src/collection/collections.cc
View File

@@ -33,8 +33,8 @@ namespace modsecurity {
namespace collection {
Collections::Collections(GlobalCollection *global,
GlobalCollection *ip)
Collections::Collections(Collection *global,
Collection *ip)
: m_global_collection_key(""),
m_ip_collection_key(""),
m_global_collection(global),
@@ -139,7 +139,8 @@ std::string* Collections::resolveFirst(const std::string& collectionName,
for (auto &a : *this) {
if (tolower(a.first) == tolower(collectionName)) {
std::string *res = a.second->resolveFirst(toupper(a.first) + ":" + var);
std::string *res = a.second->resolveFirst(toupper(a.first)
+ ":" + var);
if (res != NULL) {
return res;
}

128
src/collection/global_collections.cc
View File

@@ -1,128 +0,0 @@
/*
* ModSecurity, http://www.modsecurity.org/
* Copyright (c) 2015 Trustwave Holdings, Inc. (http://www.trustwave.com/)
*
* You may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* If any of the files related to licensing are missing or if you have any
* other questions related to licensing please contact Trustwave Holdings, Inc.
* directly using the email address security@modsecurity.org.
*
*/
#include "modsecurity/collection/global_collection.h"
#ifdef __cplusplus
#include <string>
#include <iostream>
#include <unordered_map>
#include <list>
#endif
#include "src/utils.h"
namespace modsecurity {
namespace collection {
GlobalCollection::GlobalCollection() {
this->reserve(1000);
}
GlobalCollection::~GlobalCollection() {
this->clear();
}
void GlobalCollection::store(std::string key, std::string compartment,
std::string value) {
this->emplace(new CollectionKey(key, compartment), value);
}
bool GlobalCollection::storeOrUpdateFirst(const std::string &key,
std::string compartment, const std::string &value) {
if (updateFirst(key, compartment, value) == false) {
store(key, compartment, value);
}
return true;
}
bool GlobalCollection::updateFirst(const std::string &key,
std::string compartment, const std::string &value) {
auto range = this->equal_range(new CollectionKey(key, compartment));
for (auto it = range.first; it != range.second; ++it) {
it->second = value;
return true;
}
return false;
}
void GlobalCollection::del(const std::string& key, std::string compartment) {
this->erase(new CollectionKey(key, compartment));
}
void GlobalCollection::resolveSingleMatch(const std::string& var,
std::string compartment, std::vector<const Variable *> *l) {
auto range = this->equal_range(new CollectionKey(var, compartment));
for (auto it = range.first; it != range.second; ++it) {
l->push_back(new Variable(var, it->second));
}
}
void GlobalCollection::resolveMultiMatches(const std::string& var,
std::string compartment, std::vector<const Variable *> *l) {
size_t keySize = var.size();
l->reserve(15);
auto range = this->equal_range(new CollectionKey(var, compartment));
for (auto it = range.first; it != range.second; ++it) {
l->insert(l->begin(), new Variable(var, it->second));
}
for (const auto& x : *this) {
if (x.first->m_name.size() <= keySize + 1) {
continue;
}
if (x.first->m_name.at(keySize) != ':') {
continue;
}
if (x.first->m_name.compare(0, keySize, var) != 0) {
continue;
}
l->insert(l->begin(),
new Variable(x.first->m_name, x.second));
}
}
void GlobalCollection::resolveRegularExpression(const std::string& var,
std::string compartment, std::vector<const Variable *> *l) {
/* Not ready */
}
std::string* GlobalCollection::resolveFirst(const std::string& var,
std::string compartment) {
auto range = equal_range(new CollectionKey(var, compartment));
for (auto it = range.first; it != range.second; ++it) {
return &it->second;
}
return NULL;
}
} // namespace collection
} // namespace modsecurity