diff --git a/src/parser/seclang-parser.cc b/src/parser/seclang-parser.cc index efe8d773bf..536fc525c2 100644 --- a/src/parser/seclang-parser.cc +++ b/src/parser/seclang-parser.cc @@ -281,11 +281,11 @@ namespace yy { case 180: // "Proxy" case 181: // "Redirect" case 182: // "Rev" - case 183: // "SanatiseArg" - case 184: // "SanatiseMatched" - case 185: // "SanatiseMatchedBytes" - case 186: // "SanatiseRequestHeader" - case 187: // "SanatiseResponseHeader" + case 183: // "SanitiseArg" + case 184: // "SanitiseMatched" + case 185: // "SanitiseMatchedBytes" + case 186: // "SanitiseRequestHeader" + case 187: // "SanitiseResponseHeader" case 188: // "SetEnv" case 189: // "SetRsc" case 190: // "SetSid" @@ -518,11 +518,11 @@ namespace yy { case 180: // "Proxy" case 181: // "Redirect" case 182: // "Rev" - case 183: // "SanatiseArg" - case 184: // "SanatiseMatched" - case 185: // "SanatiseMatchedBytes" - case 186: // "SanatiseRequestHeader" - case 187: // "SanatiseResponseHeader" + case 183: // "SanitiseArg" + case 184: // "SanitiseMatched" + case 185: // "SanitiseMatchedBytes" + case 186: // "SanitiseRequestHeader" + case 187: // "SanitiseResponseHeader" case 188: // "SetEnv" case 189: // "SetRsc" case 190: // "SetSid" @@ -758,11 +758,11 @@ namespace yy { case 180: // "Proxy" case 181: // "Redirect" case 182: // "Rev" - case 183: // "SanatiseArg" - case 184: // "SanatiseMatched" - case 185: // "SanatiseMatchedBytes" - case 186: // "SanatiseRequestHeader" - case 187: // "SanatiseResponseHeader" + case 183: // "SanitiseArg" + case 184: // "SanitiseMatched" + case 185: // "SanitiseMatchedBytes" + case 186: // "SanitiseRequestHeader" + case 187: // "SanitiseResponseHeader" case 188: // "SetEnv" case 189: // "SetRsc" case 190: // "SetSid" @@ -1217,11 +1217,11 @@ namespace yy { case 180: // "Proxy" case 181: // "Redirect" case 182: // "Rev" - case 183: // "SanatiseArg" - case 184: // "SanatiseMatched" - case 185: // "SanatiseMatchedBytes" - case 186: // "SanatiseRequestHeader" - case 187: // "SanatiseResponseHeader" + case 183: // "SanitiseArg" + case 184: // "SanitiseMatched" + case 185: // "SanitiseMatchedBytes" + case 186: // "SanitiseRequestHeader" + case 187: // "SanitiseResponseHeader" case 188: // "SetEnv" case 189: // "SetRsc" case 190: // "SetSid" @@ -4736,7 +4736,7 @@ namespace yy { case 375: #line 2696 "seclang-parser.yy" // lalr1.cc:856 { - ACTION_NOT_SUPPORTED("SanatiseArg", yystack_[1].location); + ACTION_NOT_SUPPORTED("SanitiseArg", yystack_[1].location); } #line 4742 "seclang-parser.cc" // lalr1.cc:856 break; @@ -4744,7 +4744,7 @@ namespace yy { case 376: #line 2700 "seclang-parser.yy" // lalr1.cc:856 { - ACTION_NOT_SUPPORTED("SanatiseMatched", yystack_[1].location); + ACTION_NOT_SUPPORTED("SanitiseMatched", yystack_[1].location); } #line 4750 "seclang-parser.cc" // lalr1.cc:856 break; @@ -4752,7 +4752,7 @@ namespace yy { case 377: #line 2704 "seclang-parser.yy" // lalr1.cc:856 { - ACTION_NOT_SUPPORTED("SanatiseMatchedBytes", yystack_[1].location); + ACTION_NOT_SUPPORTED("SanitiseMatchedBytes", yystack_[1].location); } #line 4758 "seclang-parser.cc" // lalr1.cc:856 break; @@ -4760,7 +4760,7 @@ namespace yy { case 378: #line 2708 "seclang-parser.yy" // lalr1.cc:856 { - ACTION_NOT_SUPPORTED("SanatiseRequestHeader", yystack_[1].location); + ACTION_NOT_SUPPORTED("SanitiseRequestHeader", yystack_[1].location); } #line 4766 "seclang-parser.cc" // lalr1.cc:856 break; @@ -4768,7 +4768,7 @@ namespace yy { case 379: #line 2712 "seclang-parser.yy" // lalr1.cc:856 { - ACTION_NOT_SUPPORTED("SanatiseResponseHeader", yystack_[1].location); + ACTION_NOT_SUPPORTED("SanitiseResponseHeader", yystack_[1].location); } #line 4774 "seclang-parser.cc" // lalr1.cc:856 break; @@ -6531,8 +6531,8 @@ namespace yy { "\"InitCol\"", "\"Log\"", "\"LogData\"", "\"Maturity\"", "\"Msg\"", "\"MultiMatch\"", "\"NoAuditLog\"", "\"NoLog\"", "\"Pass\"", "\"Pause\"", "\"Phase\"", "\"Prepend\"", "\"Proxy\"", "\"Redirect\"", "\"Rev\"", - "\"SanatiseArg\"", "\"SanatiseMatched\"", "\"SanatiseMatchedBytes\"", - "\"SanatiseRequestHeader\"", "\"SanatiseResponseHeader\"", "\"SetEnv\"", + "\"SanitiseArg\"", "\"SanitiseMatched\"", "\"SanitiseMatchedBytes\"", + "\"SanitiseRequestHeader\"", "\"SanitiseResponseHeader\"", "\"SetEnv\"", "\"SetRsc\"", "\"SetSid\"", "\"SetUID\"", "\"Severity\"", "\"Skip\"", "\"SkipAfter\"", "\"Status\"", "\"Tag\"", "\"ACTION_TRANSFORMATION_BASE_64_ENCODE\"", diff --git a/src/parser/seclang-parser.hh b/src/parser/seclang-parser.hh index 2234cebdde..342a805b5d 100644 --- a/src/parser/seclang-parser.hh +++ b/src/parser/seclang-parser.hh @@ -663,11 +663,11 @@ namespace yy { // "Proxy" // "Redirect" // "Rev" - // "SanatiseArg" - // "SanatiseMatched" - // "SanatiseMatchedBytes" - // "SanatiseRequestHeader" - // "SanatiseResponseHeader" + // "SanitiseArg" + // "SanitiseMatched" + // "SanitiseMatchedBytes" + // "SanitiseRequestHeader" + // "SanitiseResponseHeader" // "SetEnv" // "SetRsc" // "SetSid" @@ -1045,11 +1045,11 @@ namespace yy { TOK_ACTION_PROXY = 435, TOK_ACTION_REDIRECT = 436, TOK_ACTION_REV = 437, - TOK_ACTION_SANATISE_ARG = 438, - TOK_ACTION_SANATISE_MATCHED = 439, - TOK_ACTION_SANATISE_MATCHED_BYTES = 440, - TOK_ACTION_SANATISE_REQUEST_HEADER = 441, - TOK_ACTION_SANATISE_RESPONSE_HEADER = 442, + TOK_ACTION_SANITISE_ARG = 438, + TOK_ACTION_SANITISE_MATCHED = 439, + TOK_ACTION_SANITISE_MATCHED_BYTES = 440, + TOK_ACTION_SANITISE_REQUEST_HEADER = 441, + TOK_ACTION_SANITISE_RESPONSE_HEADER = 442, TOK_ACTION_SETENV = 443, TOK_ACTION_SETRSC = 444, TOK_ACTION_SETSID = 445, @@ -2045,23 +2045,23 @@ namespace yy { static inline symbol_type - make_ACTION_SANATISE_ARG (const std::string& v, const location_type& l); + make_ACTION_SANITISE_ARG (const std::string& v, const location_type& l); static inline symbol_type - make_ACTION_SANATISE_MATCHED (const std::string& v, const location_type& l); + make_ACTION_SANITISE_MATCHED (const std::string& v, const location_type& l); static inline symbol_type - make_ACTION_SANATISE_MATCHED_BYTES (const std::string& v, const location_type& l); + make_ACTION_SANITISE_MATCHED_BYTES (const std::string& v, const location_type& l); static inline symbol_type - make_ACTION_SANATISE_REQUEST_HEADER (const std::string& v, const location_type& l); + make_ACTION_SANITISE_REQUEST_HEADER (const std::string& v, const location_type& l); static inline symbol_type - make_ACTION_SANATISE_RESPONSE_HEADER (const std::string& v, const location_type& l); + make_ACTION_SANITISE_RESPONSE_HEADER (const std::string& v, const location_type& l); static inline symbol_type @@ -3027,11 +3027,11 @@ namespace yy { case 180: // "Proxy" case 181: // "Redirect" case 182: // "Rev" - case 183: // "SanatiseArg" - case 184: // "SanatiseMatched" - case 185: // "SanatiseMatchedBytes" - case 186: // "SanatiseRequestHeader" - case 187: // "SanatiseResponseHeader" + case 183: // "SanitiseArg" + case 184: // "SanitiseMatched" + case 185: // "SanitiseMatchedBytes" + case 186: // "SanitiseRequestHeader" + case 187: // "SanitiseResponseHeader" case 188: // "SetEnv" case 189: // "SetRsc" case 190: // "SetSid" @@ -3268,11 +3268,11 @@ namespace yy { case 180: // "Proxy" case 181: // "Redirect" case 182: // "Rev" - case 183: // "SanatiseArg" - case 184: // "SanatiseMatched" - case 185: // "SanatiseMatchedBytes" - case 186: // "SanatiseRequestHeader" - case 187: // "SanatiseResponseHeader" + case 183: // "SanitiseArg" + case 184: // "SanitiseMatched" + case 185: // "SanitiseMatchedBytes" + case 186: // "SanitiseRequestHeader" + case 187: // "SanitiseResponseHeader" case 188: // "SetEnv" case 189: // "SetRsc" case 190: // "SetSid" @@ -3582,11 +3582,11 @@ namespace yy { case 180: // "Proxy" case 181: // "Redirect" case 182: // "Rev" - case 183: // "SanatiseArg" - case 184: // "SanatiseMatched" - case 185: // "SanatiseMatchedBytes" - case 186: // "SanatiseRequestHeader" - case 187: // "SanatiseResponseHeader" + case 183: // "SanitiseArg" + case 184: // "SanitiseMatched" + case 185: // "SanitiseMatchedBytes" + case 186: // "SanitiseRequestHeader" + case 187: // "SanitiseResponseHeader" case 188: // "SetEnv" case 189: // "SetRsc" case 190: // "SetSid" @@ -3829,11 +3829,11 @@ namespace yy { case 180: // "Proxy" case 181: // "Redirect" case 182: // "Rev" - case 183: // "SanatiseArg" - case 184: // "SanatiseMatched" - case 185: // "SanatiseMatchedBytes" - case 186: // "SanatiseRequestHeader" - case 187: // "SanatiseResponseHeader" + case 183: // "SanitiseArg" + case 184: // "SanitiseMatched" + case 185: // "SanitiseMatchedBytes" + case 186: // "SanitiseRequestHeader" + case 187: // "SanitiseResponseHeader" case 188: // "SetEnv" case 189: // "SetRsc" case 190: // "SetSid" @@ -5196,33 +5196,33 @@ namespace yy { } seclang_parser::symbol_type - seclang_parser::make_ACTION_SANATISE_ARG (const std::string& v, const location_type& l) + seclang_parser::make_ACTION_SANITISE_ARG (const std::string& v, const location_type& l) { - return symbol_type (token::TOK_ACTION_SANATISE_ARG, v, l); + return symbol_type (token::TOK_ACTION_SANITISE_ARG, v, l); } seclang_parser::symbol_type - seclang_parser::make_ACTION_SANATISE_MATCHED (const std::string& v, const location_type& l) + seclang_parser::make_ACTION_SANITISE_MATCHED (const std::string& v, const location_type& l) { - return symbol_type (token::TOK_ACTION_SANATISE_MATCHED, v, l); + return symbol_type (token::TOK_ACTION_SANITISE_MATCHED, v, l); } seclang_parser::symbol_type - seclang_parser::make_ACTION_SANATISE_MATCHED_BYTES (const std::string& v, const location_type& l) + seclang_parser::make_ACTION_SANITISE_MATCHED_BYTES (const std::string& v, const location_type& l) { - return symbol_type (token::TOK_ACTION_SANATISE_MATCHED_BYTES, v, l); + return symbol_type (token::TOK_ACTION_SANITISE_MATCHED_BYTES, v, l); } seclang_parser::symbol_type - seclang_parser::make_ACTION_SANATISE_REQUEST_HEADER (const std::string& v, const location_type& l) + seclang_parser::make_ACTION_SANITISE_REQUEST_HEADER (const std::string& v, const location_type& l) { - return symbol_type (token::TOK_ACTION_SANATISE_REQUEST_HEADER, v, l); + return symbol_type (token::TOK_ACTION_SANITISE_REQUEST_HEADER, v, l); } seclang_parser::symbol_type - seclang_parser::make_ACTION_SANATISE_RESPONSE_HEADER (const std::string& v, const location_type& l) + seclang_parser::make_ACTION_SANITISE_RESPONSE_HEADER (const std::string& v, const location_type& l) { - return symbol_type (token::TOK_ACTION_SANATISE_RESPONSE_HEADER, v, l); + return symbol_type (token::TOK_ACTION_SANITISE_RESPONSE_HEADER, v, l); } seclang_parser::symbol_type diff --git a/src/parser/seclang-parser.yy b/src/parser/seclang-parser.yy index 1145f6d0f5..f196dc6a7b 100644 --- a/src/parser/seclang-parser.yy +++ b/src/parser/seclang-parser.yy @@ -552,11 +552,11 @@ using modsecurity::operators::Operator; ACTION_PROXY "Proxy" ACTION_REDIRECT "Redirect" ACTION_REV "Rev" - ACTION_SANATISE_ARG "SanatiseArg" - ACTION_SANATISE_MATCHED "SanatiseMatched" - ACTION_SANATISE_MATCHED_BYTES "SanatiseMatchedBytes" - ACTION_SANATISE_REQUEST_HEADER "SanatiseRequestHeader" - ACTION_SANATISE_RESPONSE_HEADER "SanatiseResponseHeader" + ACTION_SANITISE_ARG "SanitiseArg" + ACTION_SANITISE_MATCHED "SanitiseMatched" + ACTION_SANITISE_MATCHED_BYTES "SanitiseMatchedBytes" + ACTION_SANITISE_REQUEST_HEADER "SanitiseRequestHeader" + ACTION_SANITISE_RESPONSE_HEADER "SanitiseResponseHeader" ACTION_SETENV "SetEnv" ACTION_SETRSC "SetRsc" ACTION_SETSID "SetSid" @@ -2692,25 +2692,25 @@ act: { ACTION_CONTAINER($$, new actions::Rev($1)); } - | ACTION_SANATISE_ARG + | ACTION_SANITISE_ARG { - ACTION_NOT_SUPPORTED("SanatiseArg", @0); + ACTION_NOT_SUPPORTED("SanitiseArg", @0); } - | ACTION_SANATISE_MATCHED + | ACTION_SANITISE_MATCHED { - ACTION_NOT_SUPPORTED("SanatiseMatched", @0); + ACTION_NOT_SUPPORTED("SanitiseMatched", @0); } - | ACTION_SANATISE_MATCHED_BYTES + | ACTION_SANITISE_MATCHED_BYTES { - ACTION_NOT_SUPPORTED("SanatiseMatchedBytes", @0); + ACTION_NOT_SUPPORTED("SanitiseMatchedBytes", @0); } - | ACTION_SANATISE_REQUEST_HEADER + | ACTION_SANITISE_REQUEST_HEADER { - ACTION_NOT_SUPPORTED("SanatiseRequestHeader", @0); + ACTION_NOT_SUPPORTED("SanitiseRequestHeader", @0); } - | ACTION_SANATISE_RESPONSE_HEADER + | ACTION_SANITISE_RESPONSE_HEADER { - ACTION_NOT_SUPPORTED("SanatiseResponseHeader", @0); + ACTION_NOT_SUPPORTED("SanitiseResponseHeader", @0); } | ACTION_SETENV { diff --git a/src/parser/seclang-scanner.cc b/src/parser/seclang-scanner.cc index 72ed541be9..a2ddd29d06 100644 --- a/src/parser/seclang-scanner.cc +++ b/src/parser/seclang-scanner.cc @@ -6002,27 +6002,27 @@ YY_RULE_SETUP case 17: YY_RULE_SETUP #line 518 "seclang-scanner.ll" -{ return p::make_ACTION_SANATISE_ARG(yytext, *driver.loc.back()); } +{ return p::make_ACTION_SANITISE_ARG(yytext, *driver.loc.back()); } YY_BREAK case 18: YY_RULE_SETUP #line 519 "seclang-scanner.ll" -{ return p::make_ACTION_SANATISE_MATCHED(yytext, *driver.loc.back()); } +{ return p::make_ACTION_SANITISE_MATCHED(yytext, *driver.loc.back()); } YY_BREAK case 19: YY_RULE_SETUP #line 520 "seclang-scanner.ll" -{ return p::make_ACTION_SANATISE_MATCHED_BYTES(yytext, *driver.loc.back()); } +{ return p::make_ACTION_SANITISE_MATCHED_BYTES(yytext, *driver.loc.back()); } YY_BREAK case 20: YY_RULE_SETUP #line 521 "seclang-scanner.ll" -{ return p::make_ACTION_SANATISE_REQUEST_HEADER(yytext, *driver.loc.back()); } +{ return p::make_ACTION_SANITISE_REQUEST_HEADER(yytext, *driver.loc.back()); } YY_BREAK case 21: YY_RULE_SETUP #line 522 "seclang-scanner.ll" -{ return p::make_ACTION_SANATISE_RESPONSE_HEADER(yytext, *driver.loc.back()); } +{ return p::make_ACTION_SANITISE_RESPONSE_HEADER(yytext, *driver.loc.back()); } YY_BREAK case 22: YY_RULE_SETUP diff --git a/src/parser/seclang-scanner.ll b/src/parser/seclang-scanner.ll index 6f5cc8b3ba..5b22117c80 100755 --- a/src/parser/seclang-scanner.ll +++ b/src/parser/seclang-scanner.ll @@ -117,11 +117,11 @@ ACTION_PREPEND (?i:prepend) ACTION_PROXY (?i:proxy) ACTION_REDIRECT (?i:redirect) ACTION_REV (?i:rev) -ACTION_SANATISE_ARG (?i:sanitiseArg) -ACTION_SANATISE_MATCHED_BYTES (?i:sanitiseMatchedBytes) -ACTION_SANATISE_MATCHED (?i:sanitiseMatched) -ACTION_SANATISE_REQUEST_HEADER (?i:sanitiseRequestHeader) -ACTION_SANATISE_RESPONSE_HEADER (?i:sanitiseResponseHeader) +ACTION_SANITISE_ARG (?i:sanitiseArg) +ACTION_SANITISE_MATCHED_BYTES (?i:sanitiseMatchedBytes) +ACTION_SANITISE_MATCHED (?i:sanitiseMatched) +ACTION_SANITISE_REQUEST_HEADER (?i:sanitiseRequestHeader) +ACTION_SANITISE_RESPONSE_HEADER (?i:sanitiseResponseHeader) ACTION_SETENV (?i:setenv) ACTION_SETRSC (?i:setrsc) ACTION_SETSID (?i:setsid) @@ -514,11 +514,11 @@ EQUALS_MINUS (?i:=\-) {ACTION_PAUSE} { return p::make_ACTION_PAUSE(yytext, *driver.loc.back()); } {ACTION_PREPEND} { return p::make_ACTION_PREPEND(yytext, *driver.loc.back()); } {ACTION_PROXY} { return p::make_ACTION_PROXY(yytext, *driver.loc.back()); } -{ACTION_SANATISE_ARG} { return p::make_ACTION_SANATISE_ARG(yytext, *driver.loc.back()); } -{ACTION_SANATISE_MATCHED} { return p::make_ACTION_SANATISE_MATCHED(yytext, *driver.loc.back()); } -{ACTION_SANATISE_MATCHED_BYTES} { return p::make_ACTION_SANATISE_MATCHED_BYTES(yytext, *driver.loc.back()); } -{ACTION_SANATISE_REQUEST_HEADER} { return p::make_ACTION_SANATISE_REQUEST_HEADER(yytext, *driver.loc.back()); } -{ACTION_SANATISE_RESPONSE_HEADER} { return p::make_ACTION_SANATISE_RESPONSE_HEADER(yytext, *driver.loc.back()); } +{ACTION_SANITISE_ARG} { return p::make_ACTION_SANITISE_ARG(yytext, *driver.loc.back()); } +{ACTION_SANITISE_MATCHED} { return p::make_ACTION_SANITISE_MATCHED(yytext, *driver.loc.back()); } +{ACTION_SANITISE_MATCHED_BYTES} { return p::make_ACTION_SANITISE_MATCHED_BYTES(yytext, *driver.loc.back()); } +{ACTION_SANITISE_REQUEST_HEADER} { return p::make_ACTION_SANITISE_REQUEST_HEADER(yytext, *driver.loc.back()); } +{ACTION_SANITISE_RESPONSE_HEADER} { return p::make_ACTION_SANITISE_RESPONSE_HEADER(yytext, *driver.loc.back()); } {ACTION_SETRSC}: { BEGIN(EXPECTING_ACTION_PREDICATE); return p::make_ACTION_SETRSC(yytext, *driver.loc.back()); } {ACTION_STATUS} { return p::make_ACTION_STATUS(yytext, *driver.loc.back()); }