Commit 6ec8fd9

committed

Fixed auditlog in case of internal redirect

1 parent c0ae166 commit 6ec8fd9Copy full SHA for 6ec8fd9

File tree

+16

-0

lines changed

+16

-0

lines changed

Lines changed: 1 addition & 0 deletions

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,11 @@ ngx_http_modsecurity_log_handler(ngx_http_request_t *r)`
`67`	`67`	`return NGX_ERROR;`
`68`	`68`	`}`
`69`	`69`
	`70`	`+ if (ctx->logged) {`
	`71`	`+ dd("already logged earlier");`
	`72`	`+ return NGX_OK;`
	`73`	`+ }`
	`74`	`+`
`70`	`75`	`dd("calling msc_process_logging for %p", ctx);`
`71`	`76`	`old_pool = ngx_http_modsecurity_pcre_malloc_init(r->pool);`
`72`	`77`	`msc_process_logging(ctx->modsec_transaction);`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -137,9 +137,16 @@ ngx_http_modsecurity_process_intervention (Transaction *transaction, ngx_http_re`
`137`	`137`	`intervention.url = NULL;`
`138`	`138`	`intervention.log = NULL;`
`139`	`139`	`intervention.disruptive = 0;`
	`140`	`+ ngx_http_modsecurity_ctx_t *ctx = NULL;`
`140`	`141`
`141`	`142`	`dd("processing intervention");`
`142`	`143`
	`144`	`+ ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity_module);`
	`145`	`+ if (ctx == NULL)`
	`146`	`+ {`
	`147`	`+ return NGX_HTTP_INTERNAL_SERVER_ERROR;`
	`148`	`+ }`
	`149`	`+`
`143`	`150`	`if (msc_intervention(transaction, &intervention) == 0) {`
`144`	`151`	`dd("nothing to do");`
`145`	`152`	`return 0;`
`@@ -194,6 +201,9 @@ ngx_http_modsecurity_process_intervention (Transaction *transaction, ngx_http_re`
`194`	`201`
`195`	`202`	`if (intervention.status != 200)`
`196`	`203`	`{`
	`204`	`+ ngx_http_modsecurity_log_handler(r);`
	`205`	`+ ctx->logged = 1;`
	`206`	`+`
`197`	`207`	`if (r->header_sent)`
`198`	`208`	`{`
`199`	`209`	`dd("Headers are already sent. Cannot perform the redirection at this point.");`

Comments

(0)