modsecurity: do not run for subreqs and after internal redirect

pracj3am · pracj3am · commit 0faad3a8a198 · 2022-02-28T15:30:23.000+01:00
diff --git a/src/ngx_http_modsecurity_pre_access.c b/src/ngx_http_modsecurity_pre_access.c
@@ -45,7 +45,7 @@ ngx_http_modsecurity_pre_access_handler(ngx_http_request_t *r)
     ngx_pool_t                  *old_pool;
     ngx_http_modsecurity_ctx_t  *ctx;
 
-    if (r->error_page) {
+    if (r != r->main || r->internal) {
         return NGX_DECLINED;
     }
 
diff --git a/src/ngx_http_modsecurity_rewrite.c b/src/ngx_http_modsecurity_rewrite.c
@@ -51,7 +51,7 @@ ngx_http_modsecurity_rewrite_handler_internal(ngx_http_request_t *r)
     ngx_http_modsecurity_conf_t       *mcf;
     ngx_http_modsecurity_main_conf_t  *mmcf;
 
-    if (r->error_page) {
+    if (r != r->main || r->internal) {
         return NGX_DECLINED;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ ngx_http_modsecurity_pre_access_handler(ngx_http_request_t *r)`
`45`	`45`	`ngx_pool_t *old_pool;`
`46`	`46`	`ngx_http_modsecurity_ctx_t *ctx;`
`47`	`47`
`48`		`- if (r->error_page) {`
	`48`	`+ if (r != r->main \|\| r->internal) {`
`49`	`49`	`return NGX_DECLINED;`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ ngx_http_modsecurity_rewrite_handler_internal(ngx_http_request_t *r)`
`51`	`51`	`ngx_http_modsecurity_conf_t *mcf;`
`52`	`52`	`ngx_http_modsecurity_main_conf_t *mmcf;`
`53`	`53`
`54`		`- if (r->error_page) {`
	`54`	`+ if (r != r->main \|\| r->internal) {`
`55`	`55`	`return NGX_DECLINED;`
`56`	`56`	`}`
`57`	`57`