Skip to content

Correct whitespace handling for Include directive #2800

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

Merged
merged 1 commit into from
Sep 14, 2022
Merged

Correct whitespace handling for Include directive #2800

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
2 changes: 2 additions & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
v3.x.y - YYYY-MMM-DD (to be released)
-------------------------------------

- Correct whitespace handling for Include directive
[Issue #2800 - @877509395, @martinhsv]


v3.0.8 - 2022-Sep-07
Expand Down
21 changes: 11 additions & 10 deletions src/parser/seclang-scanner.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5104,7 +5104,7 @@ static const flex_int16_t yy_rule_linenum[544] =
1179, 1180, 1181, 1182, 1184, 1185, 1186, 1187, 1189, 1190,
1191, 1192, 1194, 1196, 1197, 1199, 1200, 1201, 1202, 1204,
1209, 1210, 1211, 1215, 1216, 1217, 1222, 1224, 1225, 1226,
1245, 1272, 1302
1245, 1273, 1303
} ;

/* The intent behind this definition is that it'll catch
Expand Down Expand Up @@ -8530,7 +8530,8 @@ YY_RULE_SETUP
#line 1245 "seclang-scanner.ll"
{
std::string err;
const char *file = strchr(yytext, ' ') + 1;
const char *tmpStr = yytext + strlen("include");
const char *file = tmpStr + strspn( tmpStr, " \t");
std::string fi = modsecurity::utils::find_resource(file, *driver.loc.back()->end.filename, &err);
if (fi.empty() == true) {
BEGIN(INITIAL);
Expand All @@ -8557,12 +8558,12 @@ YY_RULE_SETUP
YY_BREAK
case 542:
YY_RULE_SETUP
#line 1272 "seclang-scanner.ll"
#line 1273 "seclang-scanner.ll"
{
std::string err;
const char *file = strchr(yytext, ' ') + 1;
char *f = strdup(file + 1);
f[strlen(f)-1] = '\0';
const char *tmpStr = yytext + strlen("include");
const char *file = tmpStr + strspn( tmpStr, " \t");
char *f = strdup(file);
std::string fi = modsecurity::utils::find_resource(f, *driver.loc.back()->end.filename, &err);
if (fi.empty() == true) {
BEGIN(INITIAL);
Expand Down Expand Up @@ -8591,7 +8592,7 @@ YY_RULE_SETUP
case 543:
/* rule 543 can match eol */
YY_RULE_SETUP
#line 1302 "seclang-scanner.ll"
#line 1303 "seclang-scanner.ll"
{
HttpsClient c;
std::string key;
Expand Down Expand Up @@ -8629,10 +8630,10 @@ YY_RULE_SETUP
YY_BREAK
case 544:
YY_RULE_SETUP
#line 1338 "seclang-scanner.ll"
#line 1339 "seclang-scanner.ll"
ECHO;
YY_BREAK
#line 8636 "seclang-scanner.cc"
#line 8637 "seclang-scanner.cc"

case YY_END_OF_BUFFER:
{
Expand Down Expand Up @@ -9737,7 +9738,7 @@ void yyfree (void * ptr )

/* %ok-for-header */

#line 1338 "seclang-scanner.ll"
#line 1339 "seclang-scanner.ll"


namespace modsecurity {
Expand Down
9 changes: 5 additions & 4 deletions src/parser/seclang-scanner.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1243,7 +1243,8 @@ EQUALS_MINUS (?i:=\-)

{CONFIG_INCLUDE}[ \t]+{CONFIG_VALUE_PATH} {
std::string err;
const char *file = strchr(yytext, ' ') + 1;
const char *tmpStr = yytext + strlen("include");
const char *file = tmpStr + strspn( tmpStr, " \t");
std::string fi = modsecurity::utils::find_resource(file, *driver.loc.back()->end.filename, &err);
if (fi.empty() == true) {
BEGIN(INITIAL);
Expand All @@ -1270,9 +1271,9 @@ EQUALS_MINUS (?i:=\-)

{CONFIG_INCLUDE}[ \t]+["]{CONFIG_VALUE_PATH}["] {
std::string err;
const char *file = strchr(yytext, ' ') + 1;
char *f = strdup(file + 1);
f[strlen(f)-1] = '\0';
const char *tmpStr = yytext + strlen("include");
const char *file = tmpStr + strspn( tmpStr, " \t");
char *f = strdup(file);
std::string fi = modsecurity::utils::find_resource(f, *driver.loc.back()->end.filename, &err);
if (fi.empty() == true) {
BEGIN(INITIAL);
Expand Down