github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 05:45:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix missing parentheses in filename* parsing

Browse Source
This commit is contained in:
martinhsv 2021-05-11 13:46:50 -07:00
parent 7fccb0d225
commit 65e7e474b1
No known key found for this signature in database
GPG Key ID: F57A523574F4E928
2 changed files with 55 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/request_body_processor/multipart.cc
View File

@ -341,7 +341,7 @@ int Multipart::parse_content_disposition(const char *c_d_value, int offset) {
const char* start_of_filename = p; const char* start_of_filename = p;
while ((*p != '\0') && (*p != ';')) { while ((*p != '\0') && (*p != ';')) {
if (*p == '%') { if (*p == '%') {
if ((*(p+1) == '\0') || (!isxdigit(*(p+1))) || (!isxdigit(*p+2))) { if ((*(p+1) == '\0') || (!isxdigit(*(p+1))) || (!isxdigit(*(p+2)))) {
return -18; return -18;
} }
p += 3; p += 3;

60
test/test-cases/regression/issue-1825.json
View File

@ -2,7 +2,7 @@
{ {
"enabled":1, "enabled":1,
"version_min":300000, "version_min":300000,
"title":"multipart Content-Disposition should allow filename* field (1/6)", "title":"multipart Content-Disposition should allow filename* field (1/7)",
"client":{ "client":{
"ip":"200.249.12.31", "ip":"200.249.12.31",
"port":123 "port":123
@ -50,7 +50,7 @@
{ {
"enabled":1, "enabled":1,
"version_min":300000, "version_min":300000,
"title":"multipart Content-Disposition should allow filename* field (2/6)", "title":"multipart Content-Disposition should allow filename* field (2/7)",
"client":{ "client":{
"ip":"200.249.12.31", "ip":"200.249.12.31",
"port":123 "port":123
@ -98,7 +98,7 @@
{ {
"enabled":1, "enabled":1,
"version_min":300000, "version_min":300000,
"title":"multipart Content-Disposition should allow filename* field (3/6)", "title":"multipart Content-Disposition should allow filename* field (3/7)",
"client":{ "client":{
"ip":"200.249.12.31", "ip":"200.249.12.31",
"port":123 "port":123
@ -146,7 +146,7 @@
{ {
"enabled":1, "enabled":1,
"version_min":300000, "version_min":300000,
"title":"multipart Content-Disposition should allow filename* field (4/6)", "title":"multipart Content-Disposition should allow filename* field (4/7)",
"client":{ "client":{
"ip":"200.249.12.31", "ip":"200.249.12.31",
"port":123 "port":123
@ -194,7 +194,7 @@
{ {
"enabled":1, "enabled":1,
"version_min":300000, "version_min":300000,
"title":"multipart Content-Disposition should allow filename* field (5/6)", "title":"multipart Content-Disposition should allow filename* field (5/7)",
"client":{ "client":{
"ip":"200.249.12.31", "ip":"200.249.12.31",
"port":123 "port":123
@ -242,7 +242,7 @@
{ {
"enabled":1, "enabled":1,
"version_min":300000, "version_min":300000,
"title":"multipart Content-Disposition should allow filename* field (6/6)", "title":"multipart Content-Disposition should allow filename* field (6/7)",
"client":{ "client":{
"ip":"200.249.12.31", "ip":"200.249.12.31",
"port":123 "port":123
@ -286,6 +286,54 @@
"SecRuleEngine On", "SecRuleEngine On",
"SecRule MULTIPART_FILENAME \"@contains 0\" \"id:1,phase:2,pass,t:trim\"" "SecRule MULTIPART_FILENAME \"@contains 0\" \"id:1,phase:2,pass,t:trim\""
] ]
},
{
"enabled":1,
"version_min":300000,
"title":"multipart Content-Disposition should allow filename* field (7/7)",
"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=--------------------------756b6d74fa1a8ee2",
"Expect":"100-continue"
},
"uri":"/",
"method":"POST",
"body":[
"----------------------------756b6d74fa1a8ee2",
"Content-Disposition: form-data; name=\"name\"",
"",
"test",
"----------------------------756b6d74fa1a8ee2",
"Content-Disposition: form-data; name=\"filedata\"; filename=\"03CB1664.txt\"; filename*=utf-8''%61%62.txt",
"Content-Type: text/plain",
"",
"This is a very small test file..",
"----------------------------756b6d74fa1a8ee2--"
]
},
"response":{
"headers":"",
"body":""
},
"expected":{
"http_code":200
},
"rules":[
"SecRuleEngine On",
"SecRule REQBODY_ERROR \"!@eq 0\" \"id:1,phase:2,deny,status:403\""
]
} }
] ]