Skip to content

Fix parsing of SecComponentSignature, SecServerSignature and SecWebAppId #3558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
meirdev wants to merge 1 commit into
base: v3/master
Choose a base branch
from
+46 −6
Open

Fix parsing of SecComponentSignature, SecServerSignature and SecWebAppId #3558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/parser/seclang-scanner.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6252,24 +6252,24 @@
/* rule 150 can match eol */
YY_RULE_SETUP
#line 751 "seclang-scanner.ll"
{ return p::make_CONFIG_COMPONENT_SIG(strchr(yytext, ' ') + 2, *driver.loc.back()); }
{ return p::make_CONFIG_COMPONENT_SIG(parserSanitizer(find_separator(yytext)), *driver.loc.back()); }
YY_BREAK
case 151:
/* rule 151 can match eol */
YY_RULE_SETUP
#line 752 "seclang-scanner.ll"
{ return p::make_CONFIG_SEC_SERVER_SIG(strchr(yytext, ' ') + 2, *driver.loc.back()); }
{ return p::make_CONFIG_SEC_SERVER_SIG(parserSanitizer(find_separator(yytext)), *driver.loc.back()); }
YY_BREAK
case 152:
/* rule 152 can match eol */
YY_RULE_SETUP
#line 753 "seclang-scanner.ll"
{ return p::make_CONFIG_SEC_WEB_APP_ID(parserSanitizer(strchr(yytext, ' ') + 2), *driver.loc.back()); }
{ return p::make_CONFIG_SEC_WEB_APP_ID(parserSanitizer(find_separator(yytext)), *driver.loc.back()); }
YY_BREAK
case 153:
YY_RULE_SETUP
#line 754 "seclang-scanner.ll"
{ return p::make_CONFIG_SEC_WEB_APP_ID(parserSanitizer(find_separator(yytext)), *driver.loc.back()); }

Check warning on line 6272 in src/parser/seclang-scanner.cc

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

The code of this "case" is a duplicate; join the "case" blocks or refactor so that all "case" blocks are unique. 


See more on https://sonarcloud.io/project/issues?id=owasp-modsecurity_ModSecurity&issues=AZ34XteFlXp17X6M1wTt&open=AZ34XteFlXp17X6M1wTt&pullRequest=3558
YY_BREAK
case 154:
YY_RULE_SETUP
Expand Down
6 changes: 3 additions & 3 deletions src/parser/seclang-scanner.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,9 +747,9 @@ EQUALS_MINUS (?i:=\-)
. { BEGIN(INITIAL); }
}

{CONFIG_COMPONENT_SIG}[ \t]+["]{FREE_TEXT}["] { return p::make_CONFIG_COMPONENT_SIG(strchr(yytext, ' ') + 2, *driver.loc.back()); }
{CONFIG_SEC_SERVER_SIG}[ \t]+["]{FREE_TEXT}["] { return p::make_CONFIG_SEC_SERVER_SIG(strchr(yytext, ' ') + 2, *driver.loc.back()); }
{CONFIG_SEC_WEB_APP_ID}[ \t]+["]{FREE_TEXT}["] { return p::make_CONFIG_SEC_WEB_APP_ID(parserSanitizer(strchr(yytext, ' ') + 2), *driver.loc.back()); }
{CONFIG_COMPONENT_SIG}[ \t]+["]{FREE_TEXT}["] { return p::make_CONFIG_COMPONENT_SIG(parserSanitizer(find_separator(yytext)), *driver.loc.back()); }
{CONFIG_SEC_SERVER_SIG}[ \t]+["]{FREE_TEXT}["] { return p::make_CONFIG_SEC_SERVER_SIG(parserSanitizer(find_separator(yytext)), *driver.loc.back()); }
{CONFIG_SEC_WEB_APP_ID}[ \t]+["]{FREE_TEXT}["] { return p::make_CONFIG_SEC_WEB_APP_ID(parserSanitizer(find_separator(yytext)), *driver.loc.back()); }
{CONFIG_SEC_WEB_APP_ID}[ \t]+{FREE_TEXT_NEW_LINE} { return p::make_CONFIG_SEC_WEB_APP_ID(parserSanitizer(find_separator(yytext)), *driver.loc.back()); }
{CONFIG_CONTENT_INJECTION} { return p::make_CONFIG_CONTENT_INJECTION(*driver.loc.back()); }
{CONFIG_DIR_AUDIT_DIR_MOD}[ \t]+{CONFIG_VALUE_NUMBER} { return p::make_CONFIG_DIR_AUDIT_DIR_MOD(parserSanitizer(find_separator(yytext)), *driver.loc.back()); }
Expand Down
40 changes: 40 additions & 0 deletions test/test-cases/regression/auditlog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,5 +883,45 @@
"SecAuditLogFileMode 0600",
"SecAuditLogType Serial"
]
},
{
"enabled": 1,
"version_min": 300000,
"version_max": 0,
"title": "auditlog : validate the SecComponentSignature value",
"client": {
"ip": "200.249.12.31",
"port": 2313
},
"server": {
"ip": "200.249.12.31",
"port": 80
},
"request": {
"headers": {
"Host": "www.modsecurity.org",
"Content-Length": "0"
},
"uri": "/index.php",
"method": "GET",
"http_version": 1.1,
"body": [
""
]
},
"expected": {
"audit_log": "[\"OWASP_CRS/4.25.0\"]",
"http_code": 200
},
"rules": [
"SecAuditEngine On",
"SecAuditLogFormat JSON",
"SecAuditLogParts ABCFHZ",
"SecComponentSignature \"OWASP_CRS/4.25.0\"",
"SecAuditLogDirMode 0766",
"SecAuditLogFileMode 0600",
"SecAuditLog /tmp/audit_component_signature.log",
"SecAuditLogType Serial"
]
}
]
Loading