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

Do not process subrequests in phase 2. See #135.

Browse Source
This commit is contained in:
brectanus 2007-09-26 18:03:08 +00:00
parent 426ce1aea7
commit 72f8149338
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -2,6 +2,8 @@
?? ??? 2007 - 2.5.0-dev3 ?? ??? 2007 - 2.5.0-dev3
------------------------ ------------------------
* Do not process subrequests in phase 2.
* Fixed deprecatevar:var=N/S action so that it decrements N every S seconds * Fixed deprecatevar:var=N/S action so that it decrements N every S seconds
as documented instead of decrementing by a rate. as documented instead of decrementing by a rate.

27
apache2/mod_security2.c
View File

@ -581,6 +581,13 @@ static int hook_request_late(request_rec *r) {
modsec_rec *msr = NULL; modsec_rec *msr = NULL;
int rc; int rc;
/* This function needs to run only once per transaction
* (i.e. subrequests and redirects are excluded).
*/
if ((r->main != NULL)||(r->prev != NULL)) {
return DECLINED;
}
/* Find the transaction context and make sure /* Find the transaction context and make sure
* we are supposed to proceed. * we are supposed to proceed.
*/ */
@ -594,25 +601,7 @@ static int hook_request_late(request_rec *r) {
/* Has this phase been completed already? */ /* Has this phase been completed already? */
if (msr->phase_request_body_complete) { if (msr->phase_request_body_complete) {
/* If we are redirecting and there was no previous response it is msr_log(msr, 1, "Internal Error: Attempted to process the request body more than once.");
* an error page request and we ignore it.
*/
if ( (msr->r->prev != NULL)
&& ((msr->r->prev->headers_out == NULL) || (apr_is_empty_table(msr->r->prev->headers_out))) )
{
msr_log(msr, 9, "Allowing internally redirected error document: %s", msr->r->uri);
return DECLINED;
}
if (msr->was_intercepted) {
msr_log(msr, 4, "Phase REQUEST_BODY request already intercepted. Intercepting additional request.");
return perform_interception(msr);
}
if (msr->txcfg->debuglog_level >= 4) {
msr_log(msr, 4, "Phase REQUEST_BODY already complete, skipping.");
}
return DECLINED; return DECLINED;
} }
msr->phase_request_body_complete = 1; msr->phase_request_body_complete = 1;