Skip to content

feat: Check if the MP header contains invalid character #3225

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
Aug 14, 2024
Merged

feat: Check if the MP header contains invalid character #3225

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
12 changes: 12 additions & 0 deletions src/request_body_processor/multipart.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,6 +918,18 @@ int Multipart::process_part_header(std::string *error, int offset) {
return false;
}

/* check if multipart header contains any invalid characters */
for (const auto& ch : header_name) {
if (ch < 33 || ch > 126) {
ms_dbg_a(m_transaction, 1,
"Multipart: Invalid part header " \
"(contains invalid character).");
error->assign("Multipart: Invalid part header "\
"(contains invalid character).");
return false;
}
}

/* extract the value value */
data++;
i++;
Expand Down
51 changes: 51 additions & 0 deletions test/test-cases/regression/request-body-parser-multipart.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3294,5 +3294,56 @@
"SecRequestBodyAccess On",
"SecRule ARGS:namea \"@streq 111\" \"phase:2,deny,id:500096\""
]
},
{
"enabled":1,
"version_min":300000,
"title":"multipart parser (invalid part header - contains invalid character)",
"client":{
"ip":"200.249.12.31",
"port":123
},
"server":{
"ip":"200.249.12.31",
"port":80
},
"request":{
"headers":{
"Host":"localhost",
"User-Agent":"curl/7.38.0",
"Accept":"*/*",
"Content-Length":"330",
"Content-Type":"multipart/form-data; boundary=a",
"Expect":"100-continue"
},
"uri":"/",
"method":"POST",
"body":[
"--a\r",
"\u000eContent-Disposition\u000e: form-data; name=\"file\"; filename=\"1.jsp\"\r",
"Content-Disposition: form-data; name=\"post\";\r",
"\r",
"<%out.print(123)%>\r",
"--a--\r"
]
},
"response":{
"headers":{
"Date":"Mon, 13 Jul 2015 20:02:41 GMT",
"Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT",
"Content-Type":"text/html"
},
"body":[
"no need."
]
},
"expected":{
"http_code":403,
"debug_log":"Multipart: Invalid part header \\(contains invalid character\\)"
},
"rules":[
"SecruleEngine On",
"SecRule REQBODY_PROCESSOR_ERROR \"@eq 1\" \"phase:2,deny,status:403,id:500077\""
]
}
]
Loading