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

Merge pull request #3226 from airween/v2/mpinvcharreqbody

Browse Source 
feat: Check if the MP header contains invalid character
This commit is contained in:
Ervin Hegedus 2024-08-14 09:31:20 +02:00 committed by GitHub
commit 8cfb9112fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apache2/msc_multipart.c
View File

@ -402,7 +402,7 @@ static int multipart_process_part_header(modsec_rec *msr, char **error_msg) {
if (msr->mpd->mpp->last_header_line != NULL) { if (msr->mpd->mpp->last_header_line != NULL) {
*(char **)apr_array_push(msr->mpd->mpp->header_lines) = msr->mpd->mpp->last_header_line; *(char **)apr_array_push(msr->mpd->mpp->header_lines) = msr->mpd->mpp->last_header_line;
msr_log(msr, 9, "Multipart: Added part header line \"%s\"", msr->mpd->mpp->last_header_line); msr_log(msr, 9, "Multipart: Added part header line \"%s\"", msr->mpd->mpp->last_header_line);
} }
data = msr->mpd->buf; data = msr->mpd->buf;
@ -424,6 +424,16 @@ static int multipart_process_part_header(modsec_rec *msr, char **error_msg) {
return -1; return -1;
} }
/* check if multipart header contains any invalid characters */
char *ch = header_name;
while(*ch != '\0') {
if (*ch < 33 || *ch > 126) {
*error_msg = apr_psprintf(msr->mp, "Multipart: Invalid part header (contains invalid character).");
return -1;
}
ch++;
}
/* extract the value value */ /* extract the value value */
data++; data++;
while((*data == '\t') || (*data == ' ')) data++; while((*data == '\t') || (*data == ' ')) data++;

1
apache2/re_variables.c
View File

@ -616,7 +616,6 @@ static int var_reqbody_processor_error_msg_generate(modsec_rec *msr, msre_var *v
{ {
assert(msr != NULL); assert(msr != NULL);
assert(var != NULL); assert(var != NULL);
assert(rule != NULL);
assert(vartab != NULL); assert(vartab != NULL);
assert(mptmp != NULL); assert(mptmp != NULL);
msre_var *rvar = apr_pmemdup(mptmp, var, sizeof(msre_var)); msre_var *rvar = apr_pmemdup(mptmp, var, sizeof(msre_var));