annotate ngx_http_catch_body_filter_module.c @ 5:ae29daca3f0e default tip

Explicit use of "proxy_request_buffering on" in tests. This allows to avoid spurious tests failures in test runs with request buffering switched off by default.
author Maxim Dounin <mdounin@mdounin.ru>
date Fri, 06 Mar 2015 17:44:38 +0300
parents 04788ce8dae7
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
1
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
2 /*
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
3 * Copyright (C) Maxim Dounin
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
4 */
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
5
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
6 #include <ngx_config.h>
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
7 #include <ngx_core.h>
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
8 #include <ngx_http.h>
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
9
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
10
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
11 typedef struct {
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
12 ngx_flag_t enable;
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
13 } ngx_http_catch_body_conf_t;
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
14
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
15
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
16 static void *ngx_http_catch_body_create_conf(ngx_conf_t *cf);
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
17 static char *ngx_http_catch_body_merge_conf(ngx_conf_t *cf, void *parent,
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
18 void *child);
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
19 static ngx_int_t ngx_http_catch_body_init(ngx_conf_t *cf);
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
20
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
21
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
22 static ngx_command_t ngx_http_catch_body_commands[] = {
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
23
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
24 { ngx_string("catch_body"),
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
25 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
26 ngx_conf_set_flag_slot,
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
27 NGX_HTTP_LOC_CONF_OFFSET,
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
28 offsetof(ngx_http_catch_body_conf_t, enable),
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
29 NULL },
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
30
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
31 ngx_null_command
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
32 };
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
33
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
34
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
35 static ngx_http_module_t ngx_http_catch_body_module_ctx = {
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
36 NULL, /* preconfiguration */
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
37 ngx_http_catch_body_init, /* postconfiguration */
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
38
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
39 NULL, /* create main configuration */
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
40 NULL, /* init main configuration */
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
41
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
42 NULL, /* create server configuration */
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
43 NULL, /* merge server configuration */
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
44
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
45 ngx_http_catch_body_create_conf, /* create location configuration */
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
46 ngx_http_catch_body_merge_conf /* merge location configuration */
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
47 };
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
48
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
49
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
50 ngx_module_t ngx_http_catch_body_filter_module = {
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
51 NGX_MODULE_V1,
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
52 &ngx_http_catch_body_module_ctx, /* module context */
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
53 ngx_http_catch_body_commands, /* module directives */
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
54 NGX_HTTP_MODULE, /* module type */
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
55 NULL, /* init master */
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
56 NULL, /* init module */
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
57 NULL, /* init process */
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
58 NULL, /* init thread */
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
59 NULL, /* exit thread */
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
60 NULL, /* exit process */
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
61 NULL, /* exit master */
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
62 NGX_MODULE_V1_PADDING
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
63 };
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
64
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
65
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
66 static ngx_http_request_body_filter_pt ngx_http_next_request_body_filter;
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
67
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
68
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
69 static ngx_int_t
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
70 ngx_http_catch_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
71 {
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
72 u_char *p;
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
73 ngx_chain_t *cl;
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
74 ngx_http_catch_body_conf_t *conf;
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
75
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
76 conf = ngx_http_get_module_loc_conf(r, ngx_http_catch_body_filter_module);
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
77
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
78 if (!conf->enable) {
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
79 return ngx_http_next_request_body_filter(r, in);
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
80 }
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
81
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
82 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
83 "catch request body filter");
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
84
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
85 for (cl = in; cl; cl = cl->next) {
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
86
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
87 p = cl->buf->pos;
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
88
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
89 for (p = cl->buf->pos; p < cl->buf->last; p++) {
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
90
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
91 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
92 "catch body in:%02Xd:%c", *p, *p);
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
93
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
94 if (*p == 'X') {
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
95 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
96 "catch body: found");
2
04788ce8dae7 Close connection on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents: 0
diff changeset
97
04788ce8dae7 Close connection on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents: 0
diff changeset
98 /*
04788ce8dae7 Close connection on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents: 0
diff changeset
99 * As we return NGX_HTTP_FORBIDDEN, the r->keepalive flag
04788ce8dae7 Close connection on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents: 0
diff changeset
100 * won't be reset by ngx_http_special_response_handler().
04788ce8dae7 Close connection on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents: 0
diff changeset
101 * Make sure to reset it to prevent processing of unread
04788ce8dae7 Close connection on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents: 0
diff changeset
102 * parts of the request body.
04788ce8dae7 Close connection on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents: 0
diff changeset
103 */
04788ce8dae7 Close connection on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents: 0
diff changeset
104
04788ce8dae7 Close connection on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents: 0
diff changeset
105 r->keepalive = 0;
04788ce8dae7 Close connection on errors.
Maxim Dounin <mdounin@mdounin.ru>
parents: 0
diff changeset
106
0
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
107 return NGX_HTTP_FORBIDDEN;
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
108 }
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
109 }
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
110 }
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
111
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
112 return ngx_http_next_request_body_filter(r, in);
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
113 }
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
114
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
115
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
116 static void *
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
117 ngx_http_catch_body_create_conf(ngx_conf_t *cf)
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
118 {
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
119 ngx_http_catch_body_conf_t *conf;
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
120
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
121 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_catch_body_conf_t));
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
122 if (conf == NULL) {
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
123 return NULL;
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
124 }
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
125
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
126 conf->enable = NGX_CONF_UNSET;
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
127
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
128 return conf;
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
129 }
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
130
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
131
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
132 static char *
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
133 ngx_http_catch_body_merge_conf(ngx_conf_t *cf, void *parent, void *child)
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
134 {
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
135 ngx_http_catch_body_conf_t *prev = parent;
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
136 ngx_http_catch_body_conf_t *conf = child;
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
137
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
138 ngx_conf_merge_value(conf->enable, prev->enable, 0);
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
139
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
140 return NGX_CONF_OK;
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
141 }
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
142
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
143
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
144 static ngx_int_t
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
145 ngx_http_catch_body_init(ngx_conf_t *cf)
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
146 {
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
147 ngx_http_next_request_body_filter = ngx_http_top_request_body_filter;
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
148 ngx_http_top_request_body_filter = ngx_http_catch_body_filter;
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
149
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
150 return NGX_OK;
5dcad7ad8eda Initial import.
Maxim Dounin <mdounin@mdounin.ru>
parents:
diff changeset
151 }