github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-15 23:55:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Removes SPACE token form the GRAMMAR

Browse Source
This commit is contained in:
Felipe Zimmerle 2015-10-02 11:30:05 -03:00
parent 54c51e2512
commit df819dc43b
2 changed files with 47 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,7 +140,6 @@ using ModSecurity::Variables::Variable;
%token %token
END 0 "end of file" END 0 "end of file"
COMMA "," COMMA ","
SPACE
PIPE PIPE
; ;
@ -278,15 +277,15 @@ audit_log:
} }
/* SecAuditEngine */ /* SecAuditEngine */
| CONFIG_DIR_AUDIT_ENG SPACE CONFIG_VALUE_RELEVANT_ONLY | CONFIG_DIR_AUDIT_ENG CONFIG_VALUE_RELEVANT_ONLY
{ {
driver.audit_log->setStatus(ModSecurity::AuditLog::RelevantOnlyAuditLogStatus); driver.audit_log->setStatus(ModSecurity::AuditLog::RelevantOnlyAuditLogStatus);
} }
| CONFIG_DIR_AUDIT_ENG SPACE CONFIG_VALUE_OFF | CONFIG_DIR_AUDIT_ENG CONFIG_VALUE_OFF
{ {
driver.audit_log->setStatus(ModSecurity::AuditLog::OffAuditLogStatus); driver.audit_log->setStatus(ModSecurity::AuditLog::OffAuditLogStatus);
} }
| CONFIG_DIR_AUDIT_ENG SPACE CONFIG_VALUE_ON | CONFIG_DIR_AUDIT_ENG CONFIG_VALUE_ON
{ {
driver.audit_log->setStatus(ModSecurity::AuditLog::OnAuditLogStatus); driver.audit_log->setStatus(ModSecurity::AuditLog::OnAuditLogStatus);
} }
@ -325,22 +324,18 @@ audit_log:
} }
/* SecAuditLogType */ /* SecAuditLogType */
| CONFIG_DIR_AUDIT_TPE SPACE CONFIG_VALUE_SERIAL | CONFIG_DIR_AUDIT_TPE CONFIG_VALUE_SERIAL
{ {
driver.audit_log->setType(ModSecurity::AuditLog::SerialAuditLogType); driver.audit_log->setType(ModSecurity::AuditLog::SerialAuditLogType);
} }
| CONFIG_DIR_AUDIT_TPE SPACE CONFIG_VALUE_PARALLEL | CONFIG_DIR_AUDIT_TPE CONFIG_VALUE_PARALLEL
{ {
driver.audit_log->setType(ModSecurity::AuditLog::ParallelAuditLogType); driver.audit_log->setType(ModSecurity::AuditLog::ParallelAuditLogType);
} }
; ;
actings: actings:
QUOTATION_MARK actions SPACE QUOTATION_MARK QUOTATION_MARK actions QUOTATION_MARK
{
$$ = $2;
}
| QUOTATION_MARK actions QUOTATION_MARK
{ {
$$ = $2; $$ = $2;
} }
@ -353,9 +348,9 @@ actings:
expression: expression:
audit_log audit_log
| DIRECTIVE SPACE variables SPACE OPERATOR SPACE actings | DIRECTIVE variables OPERATOR actings
{ {
Operator *op = Operator::instantiate($5); Operator *op = Operator::instantiate($3);
const char *error = NULL; const char *error = NULL;
if (op->init(&error) == false) { if (op->init(&error) == false) {
driver.error(@0, error); driver.error(@0, error);
@ -363,17 +358,17 @@ expression:
} }
Rule *rule = new Rule( Rule *rule = new Rule(
/* op */ op, /* op */ op,
/* variables */ $3, /* variables */ $2,
/* actions */ $7 /* actions */ $4
); );
if (driver.addSecRule(rule) == false) { if (driver.addSecRule(rule) == false) {
YYERROR; YYERROR;
} }
} }
| DIRECTIVE SPACE variables SPACE FREE_TEXT SPACE actings | DIRECTIVE variables FREE_TEXT actings
{ {
Operator *op = Operator::instantiate("\"@rx " + $5 + "\""); Operator *op = Operator::instantiate("\"@rx " + $3 + "\"");
const char *error = NULL; const char *error = NULL;
if (op->init(&error) == false) { if (op->init(&error) == false) {
driver.error(@0, error); driver.error(@0, error);
@ -381,17 +376,17 @@ expression:
} }
Rule *rule = new Rule( Rule *rule = new Rule(
/* op */ op, /* op */ op,
/* variables */ $3, /* variables */ $2,
/* actions */ $7 /* actions */ $4
); );
if (driver.addSecRule(rule) == false) { if (driver.addSecRule(rule) == false) {
YYERROR; YYERROR;
} }
} }
| DIRECTIVE SPACE variables SPACE OPERATOR | DIRECTIVE variables OPERATOR
{ {
Operator *op = Operator::instantiate("\"@rx " + $5 + "\""); Operator *op = Operator::instantiate("\"@rx " + $3 + "\"");
const char *error = NULL; const char *error = NULL;
if (op->init(&error) == false) { if (op->init(&error) == false) {
driver.error(@0, error); driver.error(@0, error);
@ -399,7 +394,7 @@ expression:
} }
Rule *rule = new Rule( Rule *rule = new Rule(
/* op */ op, /* op */ op,
/* variables */ $3, /* variables */ $2,
/* actions */ NULL /* actions */ NULL
); );
@ -407,16 +402,7 @@ expression:
YYERROR; YYERROR;
} }
} }
| CONFIG_DIR_SEC_ACTION SPACE QUOTATION_MARK actions QUOTATION_MARK | CONFIG_DIR_SEC_ACTION QUOTATION_MARK actions QUOTATION_MARK
{
Rule *rule = new Rule(
/* op */ NULL,
/* variables */ NULL,
/* actions */ $4
);
driver.addSecAction(rule);
}
| CONFIG_DIR_SEC_ACTION SPACE actions
{ {
Rule *rule = new Rule( Rule *rule = new Rule(
/* op */ NULL, /* op */ NULL,
@ -425,9 +411,18 @@ expression:
); );
driver.addSecAction(rule); driver.addSecAction(rule);
} }
| CONFIG_DIR_SEC_DEFAULT_ACTION SPACE QUOTATION_MARK actions QUOTATION_MARK | CONFIG_DIR_SEC_ACTION actions
{ {
std::vector<Action *> *actions = $4; Rule *rule = new Rule(
/* op */ NULL,
/* variables */ NULL,
/* actions */ $2
);
driver.addSecAction(rule);
}
| CONFIG_DIR_SEC_DEFAULT_ACTION QUOTATION_MARK actions QUOTATION_MARK
{
std::vector<Action *> *actions = $3;
std::vector<Action *> checkedActions; std::vector<Action *> checkedActions;
int definedPhase = -1; int definedPhase = -1;
int secRuleDefinedPhase = -1; int secRuleDefinedPhase = -1;
@ -470,31 +465,31 @@ expression:
{ {
driver.addSecMarker($1); driver.addSecMarker($1);
} }
| CONFIG_DIR_RULE_ENG SPACE CONFIG_VALUE_OFF | CONFIG_DIR_RULE_ENG CONFIG_VALUE_OFF
{ {
driver.secRuleEngine = ModSecurity::Rules::DisabledRuleEngine; driver.secRuleEngine = ModSecurity::Rules::DisabledRuleEngine;
} }
| CONFIG_DIR_RULE_ENG SPACE CONFIG_VALUE_ON | CONFIG_DIR_RULE_ENG CONFIG_VALUE_ON
{ {
driver.secRuleEngine = ModSecurity::Rules::EnabledRuleEngine; driver.secRuleEngine = ModSecurity::Rules::EnabledRuleEngine;
} }
| CONFIG_DIR_RULE_ENG SPACE CONFIG_VALUE_DETC | CONFIG_DIR_RULE_ENG CONFIG_VALUE_DETC
{ {
driver.secRuleEngine = ModSecurity::Rules::DetectionOnlyRuleEngine; driver.secRuleEngine = ModSecurity::Rules::DetectionOnlyRuleEngine;
} }
| CONFIG_DIR_REQ_BODY SPACE CONFIG_VALUE_ON | CONFIG_DIR_REQ_BODY CONFIG_VALUE_ON
{ {
driver.secRequestBodyAccess = true; driver.secRequestBodyAccess = true;
} }
| CONFIG_DIR_REQ_BODY SPACE CONFIG_VALUE_OFF | CONFIG_DIR_REQ_BODY CONFIG_VALUE_OFF
{ {
driver.secRequestBodyAccess = false; driver.secRequestBodyAccess = false;
} }
| CONFIG_DIR_RES_BODY SPACE CONFIG_VALUE_ON | CONFIG_DIR_RES_BODY CONFIG_VALUE_ON
{ {
driver.secResponseBodyAccess = true; driver.secResponseBodyAccess = true;
} }
| CONFIG_DIR_RES_BODY SPACE CONFIG_VALUE_OFF | CONFIG_DIR_RES_BODY CONFIG_VALUE_OFF
{ {
driver.secResponseBodyAccess = false; driver.secResponseBodyAccess = false;
} }
@ -549,27 +544,27 @@ expression:
{ {
driver.responseBodyLimit = atoi($1.c_str()); driver.responseBodyLimit = atoi($1.c_str());
} }
| CONFIG_DIR_REQ_BODY_LIMIT_ACTION SPACE CONFIG_VALUE_PROCESS_PARTIAL | CONFIG_DIR_REQ_BODY_LIMIT_ACTION CONFIG_VALUE_PROCESS_PARTIAL
{ {
driver.requestBodyLimitAction = ModSecurity::Rules::BodyLimitAction::ProcessPartialBodyLimitAction; driver.requestBodyLimitAction = ModSecurity::Rules::BodyLimitAction::ProcessPartialBodyLimitAction;
} }
| CONFIG_DIR_REQ_BODY_LIMIT_ACTION SPACE CONFIG_VALUE_REJECT | CONFIG_DIR_REQ_BODY_LIMIT_ACTION CONFIG_VALUE_REJECT
{ {
driver.requestBodyLimitAction = ModSecurity::Rules::BodyLimitAction::RejectBodyLimitAction; driver.requestBodyLimitAction = ModSecurity::Rules::BodyLimitAction::RejectBodyLimitAction;
} }
| CONFIG_DIR_RES_BODY_LIMIT_ACTION SPACE CONFIG_VALUE_PROCESS_PARTIAL | CONFIG_DIR_RES_BODY_LIMIT_ACTION CONFIG_VALUE_PROCESS_PARTIAL
{ {
driver.responseBodyLimitAction = ModSecurity::Rules::BodyLimitAction::ProcessPartialBodyLimitAction; driver.responseBodyLimitAction = ModSecurity::Rules::BodyLimitAction::ProcessPartialBodyLimitAction;
} }
| CONFIG_DIR_RES_BODY_LIMIT_ACTION SPACE CONFIG_VALUE_REJECT | CONFIG_DIR_RES_BODY_LIMIT_ACTION CONFIG_VALUE_REJECT
{ {
driver.responseBodyLimitAction = ModSecurity::Rules::BodyLimitAction::RejectBodyLimitAction; driver.responseBodyLimitAction = ModSecurity::Rules::BodyLimitAction::RejectBodyLimitAction;
} }
| CONFIG_SEC_REMOTE_RULES_FAIL_ACTION SPACE CONFIG_VALUE_ABORT | CONFIG_SEC_REMOTE_RULES_FAIL_ACTION CONFIG_VALUE_ABORT
{ {
driver.remoteRulesActionOnFailed = Rules::OnFailedRemoteRulesAction::AbortOnFailedRemoteRulesAction; driver.remoteRulesActionOnFailed = Rules::OnFailedRemoteRulesAction::AbortOnFailedRemoteRulesAction;
} }
| CONFIG_SEC_REMOTE_RULES_FAIL_ACTION SPACE CONFIG_VALUE_WARN | CONFIG_SEC_REMOTE_RULES_FAIL_ACTION CONFIG_VALUE_WARN
{ {
driver.remoteRulesActionOnFailed = Rules::OnFailedRemoteRulesAction::WarnOnFailedRemoteRulesAction; driver.remoteRulesActionOnFailed = Rules::OnFailedRemoteRulesAction::WarnOnFailedRemoteRulesAction;
} }
@ -868,24 +863,12 @@ act:
; ;
actions: actions:
actions COMMA SPACE act actions COMMA act
{
std::vector<Action *> *a = $1;
a->push_back($4);
$$ = $1;
}
| actions COMMA act
{ {
std::vector<Action *> *a = $1; std::vector<Action *> *a = $1;
a->push_back($3); a->push_back($3);
$$ = $1; $$ = $1;
} }
| SPACE act
{
std::vector<Action *> *a = new std::vector<Action *>;
a->push_back($2);
$$ = a;
}
| act | act
{ {
std::vector<Action *> *a = new std::vector<Action *>; std::vector<Action *> *a = new std::vector<Action *>;

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

@ -170,7 +170,7 @@ CONFIG_DIR_UNICODE_MAP_FILE (?i:SecUnicodeMapFile)
driver.loc.back()->step(); driver.loc.back()->step();
%} %}
[ \t]*{DIRECTIVE} { return yy::seclang_parser::make_DIRECTIVE(yytext, *driver.loc.back()); } {DIRECTIVE} { return yy::seclang_parser::make_DIRECTIVE(yytext, *driver.loc.back()); }
{TRANSFORMATION} { return yy::seclang_parser::make_TRANSFORMATION(yytext, *driver.loc.back()); } {TRANSFORMATION} { return yy::seclang_parser::make_TRANSFORMATION(yytext, *driver.loc.back()); }
{CONFIG_DIR_RULE_ENG} { return yy::seclang_parser::make_CONFIG_DIR_RULE_ENG(yytext, *driver.loc.back()); } {CONFIG_DIR_RULE_ENG} { return yy::seclang_parser::make_CONFIG_DIR_RULE_ENG(yytext, *driver.loc.back()); }
{CONFIG_DIR_RES_BODY} { return yy::seclang_parser::make_CONFIG_DIR_RES_BODY(yytext, *driver.loc.back()); } {CONFIG_DIR_RES_BODY} { return yy::seclang_parser::make_CONFIG_DIR_RES_BODY(yytext, *driver.loc.back()); }
@ -329,9 +329,9 @@ CONFIG_DIR_UNICODE_MAP_FILE (?i:SecUnicodeMapFile)
} }
<INITIAL,EXPECTING_OPERATOR>{ <INITIAL,EXPECTING_OPERATOR>{
[ \t]+ { return yy::seclang_parser::make_SPACE(*driver.loc.back()); } [ \t]+ { }
[ \t]*\\\n[ \t]* { driver.loc.back()->lines(1); driver.loc.back()->step(); return yy::seclang_parser::make_SPACE(*driver.loc.back()); } [ \t]*\\\n[ \t]* { driver.loc.back()->lines(1); driver.loc.back()->step(); }
[ \t]*\\\r\n[ \t]* { driver.loc.back()->lines(1); driver.loc.back()->step(); return yy::seclang_parser::make_SPACE(*driver.loc.back()); } [ \t]*\\\r\n[ \t]* { driver.loc.back()->lines(1); driver.loc.back()->step(); }
} }
<COMMENT>{ <COMMENT>{