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

Fix dict element regular expression selection on SecRuleUpdateTargetByTag

Browse Source
This commit is contained in:
Felipe Zimmerle
2019-05-31 01:40:08 -03:00
parent 5472362313
commit 1b8d69da02
3 changed files with 252 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

494
src/parser/seclang-scanner.cc
View File

File diff suppressed because it is too large Load Diff

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

@@ -1051,6 +1051,7 @@ EQUALS_MINUS (?i:=\-)
<EXPECTING_VAR_PARAMETER>{ <EXPECTING_VAR_PARAMETER>{
[\/]{DICT_ELEMENT_NO_PIPE}[\/] { BEGIN_PREVIOUS(); yyless(yyleng); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); }
[\/]{DICT_ELEMENT_NO_PIPE}[\/][ ] { BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } [\/]{DICT_ELEMENT_NO_PIPE}[\/][ ] { BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); }
[\/]{DICT_ELEMENT_NO_PIPE}[\/][|] { BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); } [\/]{DICT_ELEMENT_NO_PIPE}[\/][|] { BEGIN_PREVIOUS(); yyless(yyleng - 1); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 1, yyleng-2), *driver.loc.back()); }
['][\/]{DICT_ELEMENT_WITH_PIPE}[\/]['] { BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); } ['][\/]{DICT_ELEMENT_WITH_PIPE}[\/]['] { BEGIN_PREVIOUS(); yyless(yyleng - 0); return p::make_DICT_ELEMENT_REGEXP(std::string(yytext, 2, yyleng-4), *driver.loc.back()); }

2
test/test-cases/regression/config-update-target-by-tag.json
View File

@@ -155,7 +155,7 @@
}, },
"rules":[ "rules":[
"SecRuleEngine On", "SecRuleEngine On",
"SecRuleUpdateTargetByTag test !ARGS:'/ke/'", "SecRuleUpdateTargetByTag test !ARGS:/ke/",
"SecRule ARGS \"@contains value\" \"id:1,pass,t:trim,tag:'test',deny\"" "SecRule ARGS \"@contains value\" \"id:1,pass,t:trim,tag:'test',deny\""
] ]
} }