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

Looks for external resources in the same path of the rule

Browse Source
This commit is contained in:
Felipe Zimmerle
2015-10-06 09:21:30 -03:00
parent 5cc9e94505
commit e54ef72051
17 changed files with 96 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -351,7 +351,7 @@ op:
{
Operator *op = Operator::instantiate($1);
const char *error = NULL;
if (op->init(&error) == false) {
if (op->init(driver.ref.back(), &error) == false) {
driver.error(@0, error);
YYERROR;
}
@@ -361,7 +361,7 @@ op:
{
Operator *op = Operator::instantiate("\"@rx " + $1 + "\"");
const char *error = NULL;
if (op->init(&error) == false) {
if (op->init(driver.ref.back(), &error) == false) {
driver.error(@0, error);
YYERROR;
}
@@ -375,7 +375,9 @@ expression:
Rule *rule = new Rule(
/* op */ $3,
/* variables */ $2,
/* actions */ $4
/* actions */ $4,
/* file name */ driver.ref.back(),
/* line number */ @0.end.line
);
if (driver.addSecRule(rule) == false) {
@@ -387,7 +389,9 @@ expression:
Rule *rule = new Rule(
/* op */ $3,
/* variables */ $2,
/* actions */ NULL
/* actions */ NULL,
/* file name */ driver.ref.back(),
/* line number */ @0.end.line
);
if (driver.addSecRule(rule) == false) {
@@ -399,7 +403,9 @@ expression:
Rule *rule = new Rule(
/* op */ NULL,
/* variables */ NULL,
/* actions */ $2
/* actions */ $2,
/* file name */ driver.ref.back(),
/* line number */ @0.end.line
);
driver.addSecAction(rule);
}
@@ -508,7 +514,14 @@ expression:
/* Debug log: end */
| CONFIG_DIR_GEO_DB
{
GeoLookup::getInstance().setDataBase($1);
std::string file = ModSecurity::find_resource($1, driver.ref.back());
if (GeoLookup::getInstance().setDataBase(file) == false) {
std::stringstream ss;
ss << "Failed to load the GeoDB from: ";
ss << file;
driver.error(@0, ss.str());
YYERROR;
}
}
/* Body limits */
| CONFIG_DIR_REQ_BODY_LIMIT