github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-10-01 12:07:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring on {global,ip,resources,session,tx,user} collections

Browse Source 
Now using the same name schema and interface for these "special"
collection.

Fix: #1754, #1778
This commit is contained in:
Felipe Zimmerle
2018-05-29 23:48:05 -03:00
parent 550e9d3f39
commit 892beb5360
7 changed files with 66 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/variables/ip.h
View File

@@ -40,9 +40,9 @@ class Ip_DictElement : public Variable {
void evaluate(Transaction *t,
Rule *rule,
std::vector<const VariableValue *> *l) override {
t->m_collections.m_ip_collection->resolveMultiMatches(m_dictElement,
t->m_collections.m_ip_collection_key, l);
t->m_collections.m_ip_collection->resolveMultiMatches(
m_name, t->m_collections.m_ip_collection_key,
t->m_rules->m_secWebAppId.m_value, l);
}
std::string m_dictElement;
@@ -57,8 +57,9 @@ class Ip_NoDictElement : public Variable {
void evaluate(Transaction *t,
Rule *rule,
std::vector<const VariableValue *> *l) override {
t->m_collections.m_ip_collection->resolveMultiMatches(m_name,
t->m_collections.m_ip_collection_key, l);
t->m_collections.m_ip_collection->resolveMultiMatches("",
t->m_collections.m_ip_collection_key,
t->m_rules->m_secWebAppId.m_value, l);
}
};
@@ -68,13 +69,14 @@ class Ip_DictElementRegexp : public Variable {
explicit Ip_DictElementRegexp(std::string dictElement)
: Variable("IP:regex(" + dictElement + ")"),
m_r(dictElement),
m_dictElement("IP:" + dictElement) { }
m_dictElement(dictElement) { }
void evaluate(Transaction *t,
Rule *rule,
std::vector<const VariableValue *> *l) override {
t->m_collections.m_ip_collection->resolveRegularExpression(m_dictElement,
t->m_collections.m_ip_collection_key, l);
t->m_collections.m_ip_collection_key,
t->m_rules->m_secWebAppId.m_value, l);
}
Utils::Regex m_r;
@@ -92,19 +94,24 @@ class Ip_DynamicElement : public Variable {
Rule *rule,
std::vector<const VariableValue *> *l) override {
std::string string = m_string->evaluate(t);
t->m_collections.m_ip_collection->resolveMultiMatches("IP:" + string,
t->m_collections.m_ip_collection_key, l);
t->m_collections.m_ip_collection->resolveMultiMatches(
string,
t->m_collections.m_ip_collection_key,
t->m_rules->m_secWebAppId.m_value, l);
}
void del(Transaction *t, std::string k) {
t->m_collections.m_ip_collection->del(k,
t->m_collections.m_ip_collection_key);
t->m_collections.m_ip_collection_key,
t->m_rules->m_secWebAppId.m_value);
}
void storeOrUpdateFirst(Transaction *t, std::string var,
std::string value) {
t->m_collections.m_ip_collection->storeOrUpdateFirst(
var, t->m_collections.m_ip_collection_key, value);
var, t->m_collections.m_ip_collection_key,
t->m_rules->m_secWebAppId.m_value,
value);
}
std::unique_ptr<RunTimeString> m_string;