Skip to content

Commit c2bc695

Browse files
author
Felipe Zimmerle
committed
parser: Fix typo on SanitiseArgs
Related to: #715 and #1889
1 parent 9c73c09 commit c2bc695

File tree

5 files changed

+102
-102
lines changed

5 files changed

+102
-102
lines changed

‎src/parser/seclang-parser.cc

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -281,11 +281,11 @@ namespace yy {
281281
case 180: // "Proxy"
282282
case 181: // "Redirect"
283283
case 182: // "Rev"
284-
case 183: // "SanatiseArg"
285-
case 184: // "SanatiseMatched"
286-
case 185: // "SanatiseMatchedBytes"
287-
case 186: // "SanatiseRequestHeader"
288-
case 187: // "SanatiseResponseHeader"
284+
case 183: // "SanitiseArg"
285+
case 184: // "SanitiseMatched"
286+
case 185: // "SanitiseMatchedBytes"
287+
case 186: // "SanitiseRequestHeader"
288+
case 187: // "SanitiseResponseHeader"
289289
case 188: // "SetEnv"
290290
case 189: // "SetRsc"
291291
case 190: // "SetSid"
@@ -518,11 +518,11 @@ namespace yy {
518518
case 180: // "Proxy"
519519
case 181: // "Redirect"
520520
case 182: // "Rev"
521-
case 183: // "SanatiseArg"
522-
case 184: // "SanatiseMatched"
523-
case 185: // "SanatiseMatchedBytes"
524-
case 186: // "SanatiseRequestHeader"
525-
case 187: // "SanatiseResponseHeader"
521+
case 183: // "SanitiseArg"
522+
case 184: // "SanitiseMatched"
523+
case 185: // "SanitiseMatchedBytes"
524+
case 186: // "SanitiseRequestHeader"
525+
case 187: // "SanitiseResponseHeader"
526526
case 188: // "SetEnv"
527527
case 189: // "SetRsc"
528528
case 190: // "SetSid"
@@ -758,11 +758,11 @@ namespace yy {
758758
case 180: // "Proxy"
759759
case 181: // "Redirect"
760760
case 182: // "Rev"
761-
case 183: // "SanatiseArg"
762-
case 184: // "SanatiseMatched"
763-
case 185: // "SanatiseMatchedBytes"
764-
case 186: // "SanatiseRequestHeader"
765-
case 187: // "SanatiseResponseHeader"
761+
case 183: // "SanitiseArg"
762+
case 184: // "SanitiseMatched"
763+
case 185: // "SanitiseMatchedBytes"
764+
case 186: // "SanitiseRequestHeader"
765+
case 187: // "SanitiseResponseHeader"
766766
case 188: // "SetEnv"
767767
case 189: // "SetRsc"
768768
case 190: // "SetSid"
@@ -1217,11 +1217,11 @@ namespace yy {
12171217
case 180: // "Proxy"
12181218
case 181: // "Redirect"
12191219
case 182: // "Rev"
1220-
case 183: // "SanatiseArg"
1221-
case 184: // "SanatiseMatched"
1222-
case 185: // "SanatiseMatchedBytes"
1223-
case 186: // "SanatiseRequestHeader"
1224-
case 187: // "SanatiseResponseHeader"
1220+
case 183: // "SanitiseArg"
1221+
case 184: // "SanitiseMatched"
1222+
case 185: // "SanitiseMatchedBytes"
1223+
case 186: // "SanitiseRequestHeader"
1224+
case 187: // "SanitiseResponseHeader"
12251225
case 188: // "SetEnv"
12261226
case 189: // "SetRsc"
12271227
case 190: // "SetSid"
@@ -4736,39 +4736,39 @@ namespace yy {
47364736
case 375:
47374737
#line 2696 "seclang-parser.yy" // lalr1.cc:856
47384738
{
4739-
ACTION_NOT_SUPPORTED("SanatiseArg", yystack_[1].location);
4739+
ACTION_NOT_SUPPORTED("SanitiseArg", yystack_[1].location);
47404740
}
47414741
#line 4742 "seclang-parser.cc" // lalr1.cc:856
47424742
break;
47434743

47444744
case 376:
47454745
#line 2700 "seclang-parser.yy" // lalr1.cc:856
47464746
{
4747-
ACTION_NOT_SUPPORTED("SanatiseMatched", yystack_[1].location);
4747+
ACTION_NOT_SUPPORTED("SanitiseMatched", yystack_[1].location);
47484748
}
47494749
#line 4750 "seclang-parser.cc" // lalr1.cc:856
47504750
break;
47514751

47524752
case 377:
47534753
#line 2704 "seclang-parser.yy" // lalr1.cc:856
47544754
{
4755-
ACTION_NOT_SUPPORTED("SanatiseMatchedBytes", yystack_[1].location);
4755+
ACTION_NOT_SUPPORTED("SanitiseMatchedBytes", yystack_[1].location);
47564756
}
47574757
#line 4758 "seclang-parser.cc" // lalr1.cc:856
47584758
break;
47594759

47604760
case 378:
47614761
#line 2708 "seclang-parser.yy" // lalr1.cc:856
47624762
{
4763-
ACTION_NOT_SUPPORTED("SanatiseRequestHeader", yystack_[1].location);
4763+
ACTION_NOT_SUPPORTED("SanitiseRequestHeader", yystack_[1].location);
47644764
}
47654765
#line 4766 "seclang-parser.cc" // lalr1.cc:856
47664766
break;
47674767

47684768
case 379:
47694769
#line 2712 "seclang-parser.yy" // lalr1.cc:856
47704770
{
4771-
ACTION_NOT_SUPPORTED("SanatiseResponseHeader", yystack_[1].location);
4771+
ACTION_NOT_SUPPORTED("SanitiseResponseHeader", yystack_[1].location);
47724772
}
47734773
#line 4774 "seclang-parser.cc" // lalr1.cc:856
47744774
break;
@@ -6531,8 +6531,8 @@ namespace yy {
65316531
"\"InitCol\"", "\"Log\"", "\"LogData\"", "\"Maturity\"", "\"Msg\"",
65326532
"\"MultiMatch\"", "\"NoAuditLog\"", "\"NoLog\"", "\"Pass\"", "\"Pause\"",
65336533
"\"Phase\"", "\"Prepend\"", "\"Proxy\"", "\"Redirect\"", "\"Rev\"",
6534-
"\"SanatiseArg\"", "\"SanatiseMatched\"", "\"SanatiseMatchedBytes\"",
6535-
"\"SanatiseRequestHeader\"", "\"SanatiseResponseHeader\"", "\"SetEnv\"",
6534+
"\"SanitiseArg\"", "\"SanitiseMatched\"", "\"SanitiseMatchedBytes\"",
6535+
"\"SanitiseRequestHeader\"", "\"SanitiseResponseHeader\"", "\"SetEnv\"",
65366536
"\"SetRsc\"", "\"SetSid\"", "\"SetUID\"", "\"Severity\"", "\"Skip\"",
65376537
"\"SkipAfter\"", "\"Status\"", "\"Tag\"",
65386538
"\"ACTION_TRANSFORMATION_BASE_64_ENCODE\"",

‎src/parser/seclang-parser.hh

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -663,11 +663,11 @@ namespace yy {
663663
// "Proxy"
664664
// "Redirect"
665665
// "Rev"
666-
// "SanatiseArg"
667-
// "SanatiseMatched"
668-
// "SanatiseMatchedBytes"
669-
// "SanatiseRequestHeader"
670-
// "SanatiseResponseHeader"
666+
// "SanitiseArg"
667+
// "SanitiseMatched"
668+
// "SanitiseMatchedBytes"
669+
// "SanitiseRequestHeader"
670+
// "SanitiseResponseHeader"
671671
// "SetEnv"
672672
// "SetRsc"
673673
// "SetSid"
@@ -1045,11 +1045,11 @@ namespace yy {
10451045
TOK_ACTION_PROXY = 435,
10461046
TOK_ACTION_REDIRECT = 436,
10471047
TOK_ACTION_REV = 437,
1048-
TOK_ACTION_SANATISE_ARG = 438,
1049-
TOK_ACTION_SANATISE_MATCHED = 439,
1050-
TOK_ACTION_SANATISE_MATCHED_BYTES = 440,
1051-
TOK_ACTION_SANATISE_REQUEST_HEADER = 441,
1052-
TOK_ACTION_SANATISE_RESPONSE_HEADER = 442,
1048+
TOK_ACTION_SANITISE_ARG = 438,
1049+
TOK_ACTION_SANITISE_MATCHED = 439,
1050+
TOK_ACTION_SANITISE_MATCHED_BYTES = 440,
1051+
TOK_ACTION_SANITISE_REQUEST_HEADER = 441,
1052+
TOK_ACTION_SANITISE_RESPONSE_HEADER = 442,
10531053
TOK_ACTION_SETENV = 443,
10541054
TOK_ACTION_SETRSC = 444,
10551055
TOK_ACTION_SETSID = 445,
@@ -2045,23 +2045,23 @@ namespace yy {
20452045

20462046
static inline
20472047
symbol_type
2048-
make_ACTION_SANATISE_ARG (const std::string& v, const location_type& l);
2048+
make_ACTION_SANITISE_ARG (const std::string& v, const location_type& l);
20492049

20502050
static inline
20512051
symbol_type
2052-
make_ACTION_SANATISE_MATCHED (const std::string& v, const location_type& l);
2052+
make_ACTION_SANITISE_MATCHED (const std::string& v, const location_type& l);
20532053

20542054
static inline
20552055
symbol_type
2056-
make_ACTION_SANATISE_MATCHED_BYTES (const std::string& v, const location_type& l);
2056+
make_ACTION_SANITISE_MATCHED_BYTES (const std::string& v, const location_type& l);
20572057

20582058
static inline
20592059
symbol_type
2060-
make_ACTION_SANATISE_REQUEST_HEADER (const std::string& v, const location_type& l);
2060+
make_ACTION_SANITISE_REQUEST_HEADER (const std::string& v, const location_type& l);
20612061

20622062
static inline
20632063
symbol_type
2064-
make_ACTION_SANATISE_RESPONSE_HEADER (const std::string& v, const location_type& l);
2064+
make_ACTION_SANITISE_RESPONSE_HEADER (const std::string& v, const location_type& l);
20652065

20662066
static inline
20672067
symbol_type
@@ -3027,11 +3027,11 @@ namespace yy {
30273027
case 180: // "Proxy"
30283028
case 181: // "Redirect"
30293029
case 182: // "Rev"
3030-
case 183: // "SanatiseArg"
3031-
case 184: // "SanatiseMatched"
3032-
case 185: // "SanatiseMatchedBytes"
3033-
case 186: // "SanatiseRequestHeader"
3034-
case 187: // "SanatiseResponseHeader"
3030+
case 183: // "SanitiseArg"
3031+
case 184: // "SanitiseMatched"
3032+
case 185: // "SanitiseMatchedBytes"
3033+
case 186: // "SanitiseRequestHeader"
3034+
case 187: // "SanitiseResponseHeader"
30353035
case 188: // "SetEnv"
30363036
case 189: // "SetRsc"
30373037
case 190: // "SetSid"
@@ -3268,11 +3268,11 @@ namespace yy {
32683268
case 180: // "Proxy"
32693269
case 181: // "Redirect"
32703270
case 182: // "Rev"
3271-
case 183: // "SanatiseArg"
3272-
case 184: // "SanatiseMatched"
3273-
case 185: // "SanatiseMatchedBytes"
3274-
case 186: // "SanatiseRequestHeader"
3275-
case 187: // "SanatiseResponseHeader"
3271+
case 183: // "SanitiseArg"
3272+
case 184: // "SanitiseMatched"
3273+
case 185: // "SanitiseMatchedBytes"
3274+
case 186: // "SanitiseRequestHeader"
3275+
case 187: // "SanitiseResponseHeader"
32763276
case 188: // "SetEnv"
32773277
case 189: // "SetRsc"
32783278
case 190: // "SetSid"
@@ -3582,11 +3582,11 @@ namespace yy {
35823582
case 180: // "Proxy"
35833583
case 181: // "Redirect"
35843584
case 182: // "Rev"
3585-
case 183: // "SanatiseArg"
3586-
case 184: // "SanatiseMatched"
3587-
case 185: // "SanatiseMatchedBytes"
3588-
case 186: // "SanatiseRequestHeader"
3589-
case 187: // "SanatiseResponseHeader"
3585+
case 183: // "SanitiseArg"
3586+
case 184: // "SanitiseMatched"
3587+
case 185: // "SanitiseMatchedBytes"
3588+
case 186: // "SanitiseRequestHeader"
3589+
case 187: // "SanitiseResponseHeader"
35903590
case 188: // "SetEnv"
35913591
case 189: // "SetRsc"
35923592
case 190: // "SetSid"
@@ -3829,11 +3829,11 @@ namespace yy {
38293829
case 180: // "Proxy"
38303830
case 181: // "Redirect"
38313831
case 182: // "Rev"
3832-
case 183: // "SanatiseArg"
3833-
case 184: // "SanatiseMatched"
3834-
case 185: // "SanatiseMatchedBytes"
3835-
case 186: // "SanatiseRequestHeader"
3836-
case 187: // "SanatiseResponseHeader"
3832+
case 183: // "SanitiseArg"
3833+
case 184: // "SanitiseMatched"
3834+
case 185: // "SanitiseMatchedBytes"
3835+
case 186: // "SanitiseRequestHeader"
3836+
case 187: // "SanitiseResponseHeader"
38373837
case 188: // "SetEnv"
38383838
case 189: // "SetRsc"
38393839
case 190: // "SetSid"
@@ -5196,33 +5196,33 @@ namespace yy {
51965196
}
51975197

51985198
seclang_parser::symbol_type
5199-
seclang_parser::make_ACTION_SANATISE_ARG (const std::string& v, const location_type& l)
5199+
seclang_parser::make_ACTION_SANITISE_ARG (const std::string& v, const location_type& l)
52005200
{
5201-
return symbol_type (token::TOK_ACTION_SANATISE_ARG, v, l);
5201+
return symbol_type (token::TOK_ACTION_SANITISE_ARG, v, l);
52025202
}
52035203

52045204
seclang_parser::symbol_type
5205-
seclang_parser::make_ACTION_SANATISE_MATCHED (const std::string& v, const location_type& l)
5205+
seclang_parser::make_ACTION_SANITISE_MATCHED (const std::string& v, const location_type& l)
52065206
{
5207-
return symbol_type (token::TOK_ACTION_SANATISE_MATCHED, v, l);
5207+
return symbol_type (token::TOK_ACTION_SANITISE_MATCHED, v, l);
52085208
}
52095209

52105210
seclang_parser::symbol_type
5211-
seclang_parser::make_ACTION_SANATISE_MATCHED_BYTES (const std::string& v, const location_type& l)
5211+
seclang_parser::make_ACTION_SANITISE_MATCHED_BYTES (const std::string& v, const location_type& l)
52125212
{
5213-
return symbol_type (token::TOK_ACTION_SANATISE_MATCHED_BYTES, v, l);
5213+
return symbol_type (token::TOK_ACTION_SANITISE_MATCHED_BYTES, v, l);
52145214
}
52155215

52165216
seclang_parser::symbol_type
5217-
seclang_parser::make_ACTION_SANATISE_REQUEST_HEADER (const std::string& v, const location_type& l)
5217+
seclang_parser::make_ACTION_SANITISE_REQUEST_HEADER (const std::string& v, const location_type& l)
52185218
{
5219-
return symbol_type (token::TOK_ACTION_SANATISE_REQUEST_HEADER, v, l);
5219+
return symbol_type (token::TOK_ACTION_SANITISE_REQUEST_HEADER, v, l);
52205220
}
52215221

52225222
seclang_parser::symbol_type
5223-
seclang_parser::make_ACTION_SANATISE_RESPONSE_HEADER (const std::string& v, const location_type& l)
5223+
seclang_parser::make_ACTION_SANITISE_RESPONSE_HEADER (const std::string& v, const location_type& l)
52245224
{
5225-
return symbol_type (token::TOK_ACTION_SANATISE_RESPONSE_HEADER, v, l);
5225+
return symbol_type (token::TOK_ACTION_SANITISE_RESPONSE_HEADER, v, l);
52265226
}
52275227

52285228
seclang_parser::symbol_type

‎src/parser/seclang-parser.yy

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -552,11 +552,11 @@ using modsecurity::operators::Operator;
552552
ACTION_PROXY "Proxy"
553553
ACTION_REDIRECT "Redirect"
554554
ACTION_REV "Rev"
555-
ACTION_SANATISE_ARG "SanatiseArg"
556-
ACTION_SANATISE_MATCHED "SanatiseMatched"
557-
ACTION_SANATISE_MATCHED_BYTES "SanatiseMatchedBytes"
558-
ACTION_SANATISE_REQUEST_HEADER "SanatiseRequestHeader"
559-
ACTION_SANATISE_RESPONSE_HEADER "SanatiseResponseHeader"
555+
ACTION_SANITISE_ARG "SanitiseArg"
556+
ACTION_SANITISE_MATCHED "SanitiseMatched"
557+
ACTION_SANITISE_MATCHED_BYTES "SanitiseMatchedBytes"
558+
ACTION_SANITISE_REQUEST_HEADER "SanitiseRequestHeader"
559+
ACTION_SANITISE_RESPONSE_HEADER "SanitiseResponseHeader"
560560
ACTION_SETENV "SetEnv"
561561
ACTION_SETRSC "SetRsc"
562562
ACTION_SETSID "SetSid"
@@ -2692,25 +2692,25 @@ act:
26922692
{
26932693
ACTION_CONTAINER($$, new actions::Rev($1));
26942694
}
2695-
| ACTION_SANATISE_ARG
2695+
| ACTION_SANITISE_ARG
26962696
{
2697-
ACTION_NOT_SUPPORTED("SanatiseArg", @0);
2697+
ACTION_NOT_SUPPORTED("SanitiseArg", @0);
26982698
}
2699-
| ACTION_SANATISE_MATCHED
2699+
| ACTION_SANITISE_MATCHED
27002700
{
2701-
ACTION_NOT_SUPPORTED("SanatiseMatched", @0);
2701+
ACTION_NOT_SUPPORTED("SanitiseMatched", @0);
27022702
}
2703-
| ACTION_SANATISE_MATCHED_BYTES
2703+
| ACTION_SANITISE_MATCHED_BYTES
27042704
{
2705-
ACTION_NOT_SUPPORTED("SanatiseMatchedBytes", @0);
2705+
ACTION_NOT_SUPPORTED("SanitiseMatchedBytes", @0);
27062706
}
2707-
| ACTION_SANATISE_REQUEST_HEADER
2707+
| ACTION_SANITISE_REQUEST_HEADER
27082708
{
2709-
ACTION_NOT_SUPPORTED("SanatiseRequestHeader", @0);
2709+
ACTION_NOT_SUPPORTED("SanitiseRequestHeader", @0);
27102710
}
2711-
| ACTION_SANATISE_RESPONSE_HEADER
2711+
| ACTION_SANITISE_RESPONSE_HEADER
27122712
{
2713-
ACTION_NOT_SUPPORTED("SanatiseResponseHeader", @0);
2713+
ACTION_NOT_SUPPORTED("SanitiseResponseHeader", @0);
27142714
}
27152715
| ACTION_SETENV
27162716
{

‎src/parser/seclang-scanner.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6002,27 +6002,27 @@ YY_RULE_SETUP
60026002
case 17:
60036003
YY_RULE_SETUP
60046004
#line 518 "seclang-scanner.ll"
6005-
{ return p::make_ACTION_SANATISE_ARG(yytext, *driver.loc.back()); }
6005+
{ return p::make_ACTION_SANITISE_ARG(yytext, *driver.loc.back()); }
60066006
YY_BREAK
60076007
case 18:
60086008
YY_RULE_SETUP
60096009
#line 519 "seclang-scanner.ll"
6010-
{ return p::make_ACTION_SANATISE_MATCHED(yytext, *driver.loc.back()); }
6010+
{ return p::make_ACTION_SANITISE_MATCHED(yytext, *driver.loc.back()); }
60116011
YY_BREAK
60126012
case 19:
60136013
YY_RULE_SETUP
60146014
#line 520 "seclang-scanner.ll"
6015-
{ return p::make_ACTION_SANATISE_MATCHED_BYTES(yytext, *driver.loc.back()); }
6015+
{ return p::make_ACTION_SANITISE_MATCHED_BYTES(yytext, *driver.loc.back()); }
60166016
YY_BREAK
60176017
case 20:
60186018
YY_RULE_SETUP
60196019
#line 521 "seclang-scanner.ll"
6020-
{ return p::make_ACTION_SANATISE_REQUEST_HEADER(yytext, *driver.loc.back()); }
6020+
{ return p::make_ACTION_SANITISE_REQUEST_HEADER(yytext, *driver.loc.back()); }
60216021
YY_BREAK
60226022
case 21:
60236023
YY_RULE_SETUP
60246024
#line 522 "seclang-scanner.ll"
6025-
{ return p::make_ACTION_SANATISE_RESPONSE_HEADER(yytext, *driver.loc.back()); }
6025+
{ return p::make_ACTION_SANITISE_RESPONSE_HEADER(yytext, *driver.loc.back()); }
60266026
YY_BREAK
60276027
case 22:
60286028
YY_RULE_SETUP

0 commit comments

Comments
 (0)