github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2026-01-13 15:07:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
b1v1r
2009-03-11 15:04:56 +00:00
parent 8af7f4ed41
commit d88be792ea
1 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
apache2/msc_multipart.c
View File

@@ -310,7 +310,13 @@ static int multipart_process_part_header(modsec_rec *msr, char **error_msg) {
return -1; return -1;
} }
/* extract header name */
header_name = apr_pstrmemdup(msr->mp, msr->mpd->buf, (data - msr->mpd->buf)); header_name = apr_pstrmemdup(msr->mp, msr->mpd->buf, (data - msr->mpd->buf));
if (data == msr->mpd->buf) {
*error_msg = apr_psprintf(msr->mp, "Multipart: Invalid part header (header name missing).");
return -1;
}
/* extract the value value */ /* extract the value value */
data++; data++;
@@ -548,23 +554,30 @@ static int multipart_process_boundary(modsec_rec *msr, int last_part, char **err
if (msr->mpd->mpp->value == NULL) return -1; if (msr->mpd->mpp->value == NULL) return -1;
} }
/* add the part to the list of parts */ if (msr->mpd->mpp->name) {
*(multipart_part **)apr_array_push(msr->mpd->parts) = msr->mpd->mpp; /* add the part to the list of parts */
if (msr->mpd->mpp->type == MULTIPART_FILE) { *(multipart_part **)apr_array_push(msr->mpd->parts) = msr->mpd->mpp;
if (msr->txcfg->debuglog_level >= 9) { if (msr->mpd->mpp->type == MULTIPART_FILE) {
msr_log(msr, 9, "Multipart: Added file part %pp to the list: name \"%s\" " if (msr->txcfg->debuglog_level >= 9) {
"file name \"%s\" (offset %u, length %u)", msr_log(msr, 9, "Multipart: Added file part %pp to the list: name \"%s\" "
msr->mpd->mpp, log_escape(msr->mp, msr->mpd->mpp->name), "file name \"%s\" (offset %u, length %u)",
log_escape(msr->mp, msr->mpd->mpp->filename), msr->mpd->mpp, log_escape(msr->mp, msr->mpd->mpp->name),
msr->mpd->mpp->offset, msr->mpd->mpp->length); log_escape(msr->mp, msr->mpd->mpp->filename),
msr->mpd->mpp->offset, msr->mpd->mpp->length);
}
}
else {
if (msr->txcfg->debuglog_level >= 9) {
msr_log(msr, 9, "Multipart: Added part %pp to the list: name \"%s\" "
"(offset %u, length %u)", msr->mpd->mpp, log_escape(msr->mp, msr->mpd->mpp->name),
msr->mpd->mpp->offset, msr->mpd->mpp->length);
}
} }
} }
else { else {
if (msr->txcfg->debuglog_level >= 9) { msr_log(msr, 3, "Multipart: Skipping invalid part %pp (part name missing): "
msr_log(msr, 9, "Multipart: Added part %pp to the list: name \"%s\" " "(offset %u, length %u)", msr->mpd->mpp,
"(offset %u, length %u)", msr->mpd->mpp, log_escape(msr->mp, msr->mpd->mpp->name), msr->mpd->mpp->offset, msr->mpd->mpp->length);
msr->mpd->mpp->offset, msr->mpd->mpp->length);
}
} }
msr->mpd->mpp = NULL; msr->mpd->mpp = NULL;