Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

recovery context after internal redirect #273

Closed
wants to merge 2 commits into from
Closed

recovery context after internal redirect #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2db3f6d
recovery context after internal redirect
liudongmiao Mar 11, 2022
5b6b4d8
use context to determine whether modsecurity is enabled in log phase
Aug 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ngx_http_modsecurity_body_filter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ ngx_http_modsecurity_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
return ngx_http_next_body_filter(r, in);
}

ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity_module);
ctx = ngx_http_modsecurity_get_module_ctx(r);

dd("body filter, recovering ctx: %p", ctx);

Expand Down
2 changes: 2 additions & 0 deletions src/ngx_http_modsecurity_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ typedef struct {
unsigned processed:1;
unsigned logged:1;
unsigned intervention_triggered:1;
unsigned request_body_processed:1;
} ngx_http_modsecurity_ctx_t;


Expand Down Expand Up @@ -139,6 +140,7 @@ extern ngx_module_t ngx_http_modsecurity_module;
/* ngx_http_modsecurity_module.c */
int ngx_http_modsecurity_process_intervention (Transaction *transaction, ngx_http_request_t *r, ngx_int_t early_log);
ngx_http_modsecurity_ctx_t *ngx_http_modsecurity_create_ctx(ngx_http_request_t *r);
ngx_http_modsecurity_ctx_t *ngx_http_modsecurity_get_module_ctx(ngx_http_request_t *r);
char *ngx_str_to_char(ngx_str_t a, ngx_pool_t *p);
ngx_pool_t *ngx_http_modsecurity_pcre_malloc_init(ngx_pool_t *pool);
void ngx_http_modsecurity_pcre_malloc_done(ngx_pool_t *old_pool);
Expand Down
20 changes: 10 additions & 10 deletions src/ngx_http_modsecurity_header_filter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ ngx_http_modsecurity_store_ctx_header(ngx_http_request_t *r, ngx_str_t *name, ng
ngx_http_modsecurity_conf_t *mcf;
ngx_http_modsecurity_header_t *hdr;

ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity_module);
ctx = ngx_http_modsecurity_get_module_ctx(r);
if (ctx == NULL || ctx->sanity_headers_out == NULL) {
return NGX_ERROR;
}
Expand Down Expand Up @@ -150,7 +150,7 @@ ngx_http_modsecurity_resolv_header_server(ngx_http_request_t *r, ngx_str_t name,
ngx_str_t value;

clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity_module);
ctx = ngx_http_modsecurity_get_module_ctx(r);

if (r->headers_out.server == NULL) {
if (clcf->server_tokens) {
Expand Down Expand Up @@ -184,7 +184,7 @@ ngx_http_modsecurity_resolv_header_date(ngx_http_request_t *r, ngx_str_t name, o
ngx_http_modsecurity_ctx_t *ctx = NULL;
ngx_str_t date;

ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity_module);
ctx = ngx_http_modsecurity_get_module_ctx(r);

if (r->headers_out.date == NULL) {
date.data = ngx_cached_http_time.data;
Expand Down Expand Up @@ -214,7 +214,7 @@ ngx_http_modsecurity_resolv_header_content_length(ngx_http_request_t *r, ngx_str
ngx_str_t value;
char buf[NGX_INT64_LEN+2];

ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity_module);
ctx = ngx_http_modsecurity_get_module_ctx(r);

if (r->headers_out.content_length_n > 0)
{
Expand All @@ -241,7 +241,7 @@ ngx_http_modsecurity_resolv_header_content_type(ngx_http_request_t *r, ngx_str_t
{
ngx_http_modsecurity_ctx_t *ctx = NULL;

ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity_module);
ctx = ngx_http_modsecurity_get_module_ctx(r);

if (r->headers_out.content_type.len > 0)
{
Expand All @@ -268,7 +268,7 @@ ngx_http_modsecurity_resolv_header_last_modified(ngx_http_request_t *r, ngx_str_
u_char buf[1024], *p;
ngx_str_t value;

ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity_module);
ctx = ngx_http_modsecurity_get_module_ctx(r);

if (r->headers_out.last_modified_time == -1) {
return 1;
Expand Down Expand Up @@ -300,7 +300,7 @@ ngx_http_modsecurity_resolv_header_connection(ngx_http_request_t *r, ngx_str_t n
ngx_str_t value;

clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity_module);
ctx = ngx_http_modsecurity_get_module_ctx(r);

if (r->headers_out.status == NGX_HTTP_SWITCHING_PROTOCOLS) {
connection = "upgrade";
Expand Down Expand Up @@ -351,7 +351,7 @@ ngx_http_modsecurity_resolv_header_transfer_encoding(ngx_http_request_t *r, ngx_
if (r->chunked) {
ngx_str_t value = ngx_string("chunked");

ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity_module);
ctx = ngx_http_modsecurity_get_module_ctx(r);

#if defined(MODSECURITY_SANITY_CHECKS) && (MODSECURITY_SANITY_CHECKS)
ngx_http_modsecurity_store_ctx_header(r, &name, &value);
Expand All @@ -378,7 +378,7 @@ ngx_http_modsecurity_resolv_header_vary(ngx_http_request_t *r, ngx_str_t name, o
if (r->gzip_vary && clcf->gzip_vary) {
ngx_str_t value = ngx_string("Accept-Encoding");

ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity_module);
ctx = ngx_http_modsecurity_get_module_ctx(r);

#if defined(MODSECURITY_SANITY_CHECKS) && (MODSECURITY_SANITY_CHECKS)
ngx_http_modsecurity_store_ctx_header(r, &name, &value);
Expand Down Expand Up @@ -420,7 +420,7 @@ ngx_http_modsecurity_header_filter(ngx_http_request_t *r)

/* XXX: if NOT_MODIFIED, do we need to process it at all? see xslt_header_filter() */

ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity_module);
ctx = ngx_http_modsecurity_get_module_ctx(r);

dd("header filter, recovering ctx: %p", ctx);

Expand Down
13 changes: 3 additions & 10 deletions src/ngx_http_modsecurity_log.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,9 @@ ngx_http_modsecurity_log_handler(ngx_http_request_t *r)
{
ngx_pool_t *old_pool;
ngx_http_modsecurity_ctx_t *ctx;
ngx_http_modsecurity_conf_t *mcf;

dd("catching a new _log_ phase handler");

mcf = ngx_http_get_module_loc_conf(r, ngx_http_modsecurity_module);
if (mcf == NULL || mcf->enable != 1)
{
dd("ModSecurity not enabled... returning");
return NGX_OK;
}

/*
if (r->method != NGX_HTTP_GET &&
Expand All @@ -58,13 +51,13 @@ ngx_http_modsecurity_log_handler(ngx_http_request_t *r)
return NGX_OK;
}
*/
ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity_module);
ctx = ngx_http_modsecurity_get_module_ctx(r);

dd("recovering ctx: %p", ctx);

if (ctx == NULL) {
dd("something really bad happened here. returning NGX_ERROR");
return NGX_ERROR;
dd("ModSecurity not enabled or error occurred");
return NGX_OK;
}

if (ctx->logged) {
Expand Down
23 changes: 22 additions & 1 deletion src/ngx_http_modsecurity_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ ngx_http_modsecurity_process_intervention (Transaction *transaction, ngx_http_re

dd("processing intervention");

ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity_module);
ctx = ngx_http_modsecurity_get_module_ctx(r);
if (ctx == NULL)
{
return NGX_HTTP_INTERNAL_SERVER_ERROR;
Expand Down Expand Up @@ -306,6 +306,27 @@ ngx_http_modsecurity_create_ctx(ngx_http_request_t *r)
return ctx;
}

ngx_inline ngx_http_modsecurity_ctx_t *
ngx_http_modsecurity_get_module_ctx(ngx_http_request_t *r)
{
ngx_http_modsecurity_ctx_t *ctx;
ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity_module);
if (ctx == NULL) {
/*
* refer <nginx>/src/http/modules/ngx_http_realip_module.c
* if module context was reset, the original address
* can still be found in the cleanup handler
*/
ngx_pool_cleanup_t *cln;
for (cln = r->pool->cleanup; cln; cln = cln->next) {
if (cln->handler == ngx_http_modsecurity_cleanup) {
ctx = cln->data;
break;
}
}
}
return ctx;
}

char *
ngx_conf_set_rules(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
Expand Down
10 changes: 8 additions & 2 deletions src/ngx_http_modsecurity_pre_access.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ngx_http_modsecurity_request_read(ngx_http_request_t *r)
{
ngx_http_modsecurity_ctx_t *ctx;

ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity_module);
ctx = ngx_http_modsecurity_get_module_ctx(r);

#if defined(nginx_version) && nginx_version >= 8011
r->main->count--;
Expand Down Expand Up @@ -68,7 +68,7 @@ ngx_http_modsecurity_pre_access_handler(ngx_http_request_t *r)
}
*/

ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity_module);
ctx = ngx_http_modsecurity_get_module_ctx(r);

dd("recovering ctx: %p", ctx);

Expand All @@ -78,6 +78,11 @@ ngx_http_modsecurity_pre_access_handler(ngx_http_request_t *r)
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}

if (ctx->request_body_processed) {
// should we use r->internal or r->filter_finalize?
return NGX_DECLINED;
}

if (ctx->intervention_triggered) {
return NGX_DECLINED;
}
Expand Down Expand Up @@ -210,6 +215,7 @@ ngx_http_modsecurity_pre_access_handler(ngx_http_request_t *r)

old_pool = ngx_http_modsecurity_pcre_malloc_init(r->pool);
msc_process_request_body(ctx->modsec_transaction);
ctx->request_body_processed = 1;
ngx_http_modsecurity_pcre_malloc_done(old_pool);

ret = ngx_http_modsecurity_process_intervention(ctx->modsec_transaction, r, 0);
Expand Down
2 changes: 1 addition & 1 deletion src/ngx_http_modsecurity_rewrite.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ngx_http_modsecurity_rewrite_handler(ngx_http_request_t *r)

dd("catching a new _rewrite_ phase handler");

ctx = ngx_http_get_module_ctx(r, ngx_http_modsecurity_module);
ctx = ngx_http_modsecurity_get_module_ctx(r);

dd("recovering ctx: %p", ctx);

Expand Down