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

Adds support to the collection RESOURCE

Browse Source
This commit is contained in:
Felipe Zimmerle
2017-10-30 09:06:23 -03:00
parent a9d54c30a1
commit 9369efcb90
9 changed files with 3320 additions and 3190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

884
src/parser/seclang-parser.cc
View File

File diff suppressed because it is too large Load Diff

16
src/parser/seclang-parser.yy
View File

@@ -1760,6 +1760,18 @@ var:
{
VARIABLE_CONTAINER($$, new Variables::FilesTmpNames_NoDictElement());
}
| VARIABLE_RESOURCE DICT_ELEMENT
{
VARIABLE_CONTAINER($$, new Variables::Resource_DictElement($2));
}
| VARIABLE_RESOURCE DICT_ELEMENT_REGEXP
{
VARIABLE_CONTAINER($$, new Variables::Resource_DictElementRegexp($2));
}
| VARIABLE_RESOURCE
{
VARIABLE_CONTAINER($$, new Variables::Resource_NoDictElement());
}
| VARIABLE_IP DICT_ELEMENT
{
@@ -2025,10 +2037,6 @@ var:
{
VARIABLE_CONTAINER($$, new Variables::RequestURIRaw());
}
| VARIABLE_RESOURCE
{
VARIABLE_CONTAINER($$, new Variables::Resource());
}
| VARIABLE_RESPONSE_BODY
{
VARIABLE_CONTAINER($$, new Variables::ResponseBody());

5504
src/parser/seclang-scanner.cc
View File

File diff suppressed because it is too large Load Diff

2
src/parser/seclang-scanner.ll
View File

@@ -809,6 +809,8 @@ EQUALS_MINUS (?i:=\-)
{VARIABLE_IP} { return p::make_VARIABLE_IP(*driver.loc.back()); }
{VARIABLE_IP}[:] { BEGIN(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_IP(*driver.loc.back()); }
{VARIABLE_RESOURCE} { return p::make_VARIABLE_RESOURCE(*driver.loc.back()); }
{VARIABLE_RESOURCE}[:] { BEGIN(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_RESOURCE(*driver.loc.back()); }
{VARIABLE_GLOBAL} { return p::make_VARIABLE_GLOBAL(*driver.loc.back()); }
{VARIABLE_GLOBAL}[:] { BEGIN(EXPECTING_VAR_PARAMETER); return p::make_VARIABLE_GLOBAL(*driver.loc.back()); }
{VARIABLE_SESSION} { return p::make_VARIABLE_SESSION(*driver.loc.back()); }

2
src/variables/ip.h
View File

@@ -33,7 +33,7 @@ namespace Variables {
class Ip_DictElement : public Variable {
public:
explicit Ip_DictElement(std::string dictElement)
: Variable("IP"),
: Variable("IP:" + dictElement),
m_dictElement("IP:" + dictElement) { }
void evaluate(Transaction *transaction,

45
src/variables/resource.h
View File

@@ -29,18 +29,55 @@ namespace modsecurity {
class Transaction;
namespace Variables {
class Resource : public Variable {
class Resource_DictElement : public Variable {
public:
Resource()
explicit Resource_DictElement(std::string dictElement)
: Variable("RESOURCE:" + dictElement),
m_dictElement("RESOURCE:" + dictElement) { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
transaction->m_collections.resolveMultiMatches(m_dictElement, "RESOURCE", l);
}
std::string m_dictElement;
};
class Resource_NoDictElement : public Variable {
public:
Resource_NoDictElement()
: Variable("RESOURCE") { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) {
transaction->m_variableResource.evaluate(l);
std::vector<const collection::Variable *> *l) override {
transaction->m_collections.resolveMultiMatches(m_name, "RESOURCE", l);
}
};
class Resource_DictElementRegexp : public Variable {
public:
explicit Resource_DictElementRegexp(std::string dictElement)
: Variable("RESOURCE:regex(" + dictElement + ")"),
m_r(dictElement),
m_dictElement("RESOURCE:" + dictElement) { }
void evaluate(Transaction *transaction,
Rule *rule,
std::vector<const collection::Variable *> *l) override {
transaction->m_collections.resolveRegularExpression(m_dictElement,
"RESOURCE", l);
}
Utils::Regex m_r;
std::string m_dictElement;
};
} // namespace Variables
} // namespace modsecurity