From 1079b5ba54ddbc62be924806e5ca0aca3df42501 Mon Sep 17 00:00:00 2001 From: Felipe Zimmerle Date: Wed, 9 Sep 2015 22:19:07 -0300 Subject: [PATCH] Adds action maturity to the parser --- src/parser/seclang-parser.yy | 5 +++++ src/parser/seclang-scanner.ll | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/parser/seclang-parser.yy b/src/parser/seclang-parser.yy index d0db0b9b..9872e7e7 100644 --- a/src/parser/seclang-parser.yy +++ b/src/parser/seclang-parser.yy @@ -230,6 +230,7 @@ using ModSecurity::Variables::Variable; %token ACTION_TAG %token ACTION_REV %token ACTION_VER +%token ACTION_MATURITY %token LOG_DATA %token TRANSFORMATION %token ACTION_CTL_AUDIT_ENGINE @@ -749,6 +750,10 @@ act: { $$ = Action::instantiate($1); } + | ACTION_MATURITY + { + $$ = Action::instantiate($1); + } | ACTION_CTL_BDY_XML { /* not ready yet. */ diff --git a/src/parser/seclang-scanner.ll b/src/parser/seclang-scanner.ll index a05df6a8..edec0613 100755 --- a/src/parser/seclang-scanner.ll +++ b/src/parser/seclang-scanner.ll @@ -23,7 +23,7 @@ using ModSecurity::split; %} %option noyywrap nounput batch debug noinput -ACTION (?i:accuracy|allow|append|block|capture|chain|deny|deprecatevar|drop|exec|expirevar|id:[0-9]+|id:'[0-9]+'|initcol|log|maturity|multiMatch|noauditlog|nolog|pass|pause|prepend|proxy|sanitiseArg|sanitiseMatched|sanitiseMatchedBytes|sanitiseRequestHeader|sanitiseResponseHeader|setuid|setrsc|setsid|setenv|skip|status:[0-9]+|xmlns) +ACTION (?i:accuracy|allow|append|block|capture|chain|deny|deprecatevar|drop|exec|expirevar|id:[0-9]+|id:'[0-9]+'|initcol|log|multiMatch|noauditlog|nolog|pass|pause|prepend|proxy|sanitiseArg|sanitiseMatched|sanitiseMatchedBytes|sanitiseRequestHeader|sanitiseResponseHeader|setuid|setrsc|setsid|setenv|skip|status:[0-9]+|xmlns) ACTION_REDIRECT (?i:redirect) ACTION_SKIP_AFTER (?i:skipAfter) @@ -37,6 +37,7 @@ ACTION_MSG (?i:msg) ACTION_TAG (?i:tag) ACTION_REV (?i:rev) ACTION_VER (?i:ver) +ACTION_MATURITY (?i:maturity) ACTION_CTL_BDY_XML (?i:ctl:requestBodyProcessor=XML) ACTION_CTL_BDY_JSON (?i:ctl:requestBodyProcessor=JSON) ACTION_CTL_AUDIT_LOG_PARTS (?i:ctl:auditLogParts) @@ -306,6 +307,8 @@ CONFIG_DIR_UNICODE_MAP_FILE (?i:SecUnicodeMapFile) {ACTION_TAG}:'{FREE_TEXT_QUOTE}' { return yy::seclang_parser::make_ACTION_TAG(strchr(yytext, ':') + 1, *driver.loc.back()); } {ACTION_REV}:'{CONFIG_VALUE_NUMBER}' { return yy::seclang_parser::make_ACTION_REV(strchr(yytext, ':') + 1, *driver.loc.back()); } {ACTION_VER}:'{FREE_TEXT_QUOTE}' { return yy::seclang_parser::make_ACTION_VER(strchr(yytext, ':') + 1, *driver.loc.back()); } +{ACTION_MATURITY}:'{FREE_TEXT_QUOTE}' { return yy::seclang_parser::make_ACTION_MATURITY(strchr(yytext, ':') + 1, *driver.loc.back()); } +{ACTION_MATURITY}:{FREE_TEXT_QUOTE} { return yy::seclang_parser::make_ACTION_MATURITY(strchr(yytext, ':') + 1, *driver.loc.back()); } {ACTION_CTL_BDY_XML} { return yy::seclang_parser::make_ACTION_CTL_BDY_XML(yytext, *driver.loc.back()); } {ACTION_CTL_BDY_JSON} { return yy::seclang_parser::make_ACTION_CTL_BDY_JSON(yytext, *driver.loc.back()); }