Mercurial > hg > nginx
annotate src/mail/ngx_mail_auth_http_module.c @ 5134:c788e54090de
Mail: IPv6 backends (ticket #323).
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Mon, 25 Mar 2013 13:38:59 +0000 |
parents | eaf95350d75c |
children | 2220de0521ca |
rev | line source |
---|---|
521 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4412 | 4 * Copyright (C) Nginx, Inc. |
521 | 5 */ |
6 | |
7 | |
8 #include <ngx_config.h> | |
9 #include <ngx_core.h> | |
10 #include <ngx_event.h> | |
11 #include <ngx_event_connect.h> | |
1136 | 12 #include <ngx_mail.h> |
521 | 13 |
14 | |
15 typedef struct { | |
3269
f0d596e84634
rename ngx_peer_addr_t to ngx_addr_t
Igor Sysoev <igor@sysoev.ru>
parents:
3267
diff
changeset
|
16 ngx_addr_t *peer; |
521 | 17 |
527 | 18 ngx_msec_t timeout; |
521 | 19 |
527 | 20 ngx_str_t host_header; |
21 ngx_str_t uri; | |
573 | 22 ngx_str_t header; |
23 | |
24 ngx_array_t *headers; | |
1392 | 25 |
26 u_char *file; | |
27 ngx_uint_t line; | |
1136 | 28 } ngx_mail_auth_http_conf_t; |
521 | 29 |
30 | |
1136 | 31 typedef struct ngx_mail_auth_http_ctx_s ngx_mail_auth_http_ctx_t; |
527 | 32 |
1136 | 33 typedef void (*ngx_mail_auth_http_handler_pt)(ngx_mail_session_t *s, |
34 ngx_mail_auth_http_ctx_t *ctx); | |
527 | 35 |
1136 | 36 struct ngx_mail_auth_http_ctx_s { |
527 | 37 ngx_buf_t *request; |
38 ngx_buf_t *response; | |
39 ngx_peer_connection_t peer; | |
40 | |
1136 | 41 ngx_mail_auth_http_handler_pt handler; |
527 | 42 |
43 ngx_uint_t state; | |
44 | |
45 u_char *header_name_start; | |
46 u_char *header_name_end; | |
47 u_char *header_start; | |
48 u_char *header_end; | |
49 | |
50 ngx_str_t addr; | |
51 ngx_str_t port; | |
52 ngx_str_t err; | |
567 | 53 ngx_str_t errmsg; |
1136 | 54 ngx_str_t errcode; |
527 | 55 |
547 | 56 time_t sleep; |
527 | 57 |
547 | 58 ngx_pool_t *pool; |
527 | 59 }; |
521 | 60 |
61 | |
1136 | 62 static void ngx_mail_auth_http_write_handler(ngx_event_t *wev); |
63 static void ngx_mail_auth_http_read_handler(ngx_event_t *rev); | |
64 static void ngx_mail_auth_http_ignore_status_line(ngx_mail_session_t *s, | |
65 ngx_mail_auth_http_ctx_t *ctx); | |
66 static void ngx_mail_auth_http_process_headers(ngx_mail_session_t *s, | |
67 ngx_mail_auth_http_ctx_t *ctx); | |
68 static void ngx_mail_auth_sleep_handler(ngx_event_t *rev); | |
69 static ngx_int_t ngx_mail_auth_http_parse_header_line(ngx_mail_session_t *s, | |
70 ngx_mail_auth_http_ctx_t *ctx); | |
71 static void ngx_mail_auth_http_block_read(ngx_event_t *rev); | |
72 static void ngx_mail_auth_http_dummy_handler(ngx_event_t *ev); | |
73 static ngx_buf_t *ngx_mail_auth_http_create_request(ngx_mail_session_t *s, | |
74 ngx_pool_t *pool, ngx_mail_auth_http_conf_t *ahcf); | |
75 static ngx_int_t ngx_mail_auth_http_escape(ngx_pool_t *pool, ngx_str_t *text, | |
633 | 76 ngx_str_t *escaped); |
521 | 77 |
1136 | 78 static void *ngx_mail_auth_http_create_conf(ngx_conf_t *cf); |
79 static char *ngx_mail_auth_http_merge_conf(ngx_conf_t *cf, void *parent, | |
521 | 80 void *child); |
1136 | 81 static char *ngx_mail_auth_http(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
82 static char *ngx_mail_auth_http_header(ngx_conf_t *cf, ngx_command_t *cmd, | |
573 | 83 void *conf); |
521 | 84 |
85 | |
1136 | 86 static ngx_command_t ngx_mail_auth_http_commands[] = { |
521 | 87 |
88 { ngx_string("auth_http"), | |
1136 | 89 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, |
90 ngx_mail_auth_http, | |
91 NGX_MAIL_SRV_CONF_OFFSET, | |
521 | 92 0, |
93 NULL }, | |
94 | |
95 { ngx_string("auth_http_timeout"), | |
1136 | 96 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, |
521 | 97 ngx_conf_set_msec_slot, |
1136 | 98 NGX_MAIL_SRV_CONF_OFFSET, |
99 offsetof(ngx_mail_auth_http_conf_t, timeout), | |
521 | 100 NULL }, |
101 | |
573 | 102 { ngx_string("auth_http_header"), |
1136 | 103 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE2, |
104 ngx_mail_auth_http_header, | |
105 NGX_MAIL_SRV_CONF_OFFSET, | |
573 | 106 0, |
107 NULL }, | |
108 | |
521 | 109 ngx_null_command |
110 }; | |
111 | |
112 | |
1136 | 113 static ngx_mail_module_t ngx_mail_auth_http_module_ctx = { |
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1478
diff
changeset
|
114 NULL, /* protocol */ |
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1478
diff
changeset
|
115 |
521 | 116 NULL, /* create main configuration */ |
117 NULL, /* init main configuration */ | |
118 | |
1136 | 119 ngx_mail_auth_http_create_conf, /* create server configuration */ |
120 ngx_mail_auth_http_merge_conf /* merge server configuration */ | |
521 | 121 }; |
122 | |
123 | |
1136 | 124 ngx_module_t ngx_mail_auth_http_module = { |
521 | 125 NGX_MODULE_V1, |
1136 | 126 &ngx_mail_auth_http_module_ctx, /* module context */ |
127 ngx_mail_auth_http_commands, /* module directives */ | |
128 NGX_MAIL_MODULE, /* module type */ | |
541 | 129 NULL, /* init master */ |
521 | 130 NULL, /* init module */ |
541 | 131 NULL, /* init process */ |
132 NULL, /* init thread */ | |
133 NULL, /* exit thread */ | |
134 NULL, /* exit process */ | |
135 NULL, /* exit master */ | |
136 NGX_MODULE_V1_PADDING | |
521 | 137 }; |
138 | |
139 | |
1136 | 140 static ngx_str_t ngx_mail_auth_http_method[] = { |
141 ngx_string("plain"), | |
809 | 142 ngx_string("plain"), |
2748
2477b28eaccb
fix Auth-Method, the bug has been introduced in r2496
Igor Sysoev <igor@sysoev.ru>
parents:
2388
diff
changeset
|
143 ngx_string("plain"), |
809 | 144 ngx_string("apop"), |
2309 | 145 ngx_string("cram-md5"), |
146 ngx_string("none") | |
800 | 147 }; |
521 | 148 |
1136 | 149 static ngx_str_t ngx_mail_smtp_errcode = ngx_string("535 5.7.0"); |
521 | 150 |
1477 | 151 |
521 | 152 void |
1136 | 153 ngx_mail_auth_http_init(ngx_mail_session_t *s) |
521 | 154 { |
155 ngx_int_t rc; | |
547 | 156 ngx_pool_t *pool; |
1136 | 157 ngx_mail_auth_http_ctx_t *ctx; |
158 ngx_mail_auth_http_conf_t *ahcf; | |
521 | 159 |
541 | 160 s->connection->log->action = "in http auth state"; |
161 | |
547 | 162 pool = ngx_create_pool(2048, s->connection->log); |
163 if (pool == NULL) { | |
1136 | 164 ngx_mail_session_internal_server_error(s); |
521 | 165 return; |
166 } | |
167 | |
1136 | 168 ctx = ngx_pcalloc(pool, sizeof(ngx_mail_auth_http_ctx_t)); |
547 | 169 if (ctx == NULL) { |
170 ngx_destroy_pool(pool); | |
1136 | 171 ngx_mail_session_internal_server_error(s); |
547 | 172 return; |
173 } | |
174 | |
175 ctx->pool = pool; | |
176 | |
1136 | 177 ahcf = ngx_mail_get_module_srv_conf(s, ngx_mail_auth_http_module); |
521 | 178 |
1136 | 179 ctx->request = ngx_mail_auth_http_create_request(s, pool, ahcf); |
521 | 180 if (ctx->request == NULL) { |
547 | 181 ngx_destroy_pool(ctx->pool); |
1136 | 182 ngx_mail_session_internal_server_error(s); |
521 | 183 return; |
184 } | |
185 | |
1136 | 186 ngx_mail_set_ctx(s, ctx, ngx_mail_auth_http_module); |
521 | 187 |
884 | 188 ctx->peer.sockaddr = ahcf->peer->sockaddr; |
189 ctx->peer.socklen = ahcf->peer->socklen; | |
190 ctx->peer.name = &ahcf->peer->name; | |
191 ctx->peer.get = ngx_event_get_peer; | |
521 | 192 ctx->peer.log = s->connection->log; |
193 ctx->peer.log_error = NGX_ERROR_ERR; | |
194 | |
195 rc = ngx_event_connect_peer(&ctx->peer); | |
196 | |
543 | 197 if (rc == NGX_ERROR || rc == NGX_BUSY || rc == NGX_DECLINED) { |
862
6044cea025fa
fix segfault when connect() failed
Igor Sysoev <igor@sysoev.ru>
parents:
856
diff
changeset
|
198 if (ctx->peer.connection) { |
6044cea025fa
fix segfault when connect() failed
Igor Sysoev <igor@sysoev.ru>
parents:
856
diff
changeset
|
199 ngx_close_connection(ctx->peer.connection); |
6044cea025fa
fix segfault when connect() failed
Igor Sysoev <igor@sysoev.ru>
parents:
856
diff
changeset
|
200 } |
6044cea025fa
fix segfault when connect() failed
Igor Sysoev <igor@sysoev.ru>
parents:
856
diff
changeset
|
201 |
547 | 202 ngx_destroy_pool(ctx->pool); |
1136 | 203 ngx_mail_session_internal_server_error(s); |
521 | 204 return; |
205 } | |
206 | |
207 ctx->peer.connection->data = s; | |
208 ctx->peer.connection->pool = s->connection->pool; | |
209 | |
1136 | 210 s->connection->read->handler = ngx_mail_auth_http_block_read; |
211 ctx->peer.connection->read->handler = ngx_mail_auth_http_read_handler; | |
212 ctx->peer.connection->write->handler = ngx_mail_auth_http_write_handler; | |
521 | 213 |
1136 | 214 ctx->handler = ngx_mail_auth_http_ignore_status_line; |
527 | 215 |
541 | 216 ngx_add_timer(ctx->peer.connection->read, ahcf->timeout); |
217 ngx_add_timer(ctx->peer.connection->write, ahcf->timeout); | |
218 | |
521 | 219 if (rc == NGX_OK) { |
1136 | 220 ngx_mail_auth_http_write_handler(ctx->peer.connection->write); |
521 | 221 return; |
222 } | |
223 } | |
224 | |
225 | |
226 static void | |
1136 | 227 ngx_mail_auth_http_write_handler(ngx_event_t *wev) |
521 | 228 { |
229 ssize_t n, size; | |
230 ngx_connection_t *c; | |
1136 | 231 ngx_mail_session_t *s; |
232 ngx_mail_auth_http_ctx_t *ctx; | |
233 ngx_mail_auth_http_conf_t *ahcf; | |
521 | 234 |
235 c = wev->data; | |
236 s = c->data; | |
237 | |
1136 | 238 ctx = ngx_mail_get_module_ctx(s, ngx_mail_auth_http_module); |
521 | 239 |
1136 | 240 ngx_log_debug0(NGX_LOG_DEBUG_MAIL, wev->log, 0, |
241 "mail auth http write handler"); | |
521 | 242 |
577 | 243 if (wev->timedout) { |
521 | 244 ngx_log_error(NGX_LOG_ERR, wev->log, NGX_ETIMEDOUT, |
884 | 245 "auth http server %V timed out", ctx->peer.name); |
1478 | 246 ngx_close_connection(c); |
547 | 247 ngx_destroy_pool(ctx->pool); |
1136 | 248 ngx_mail_session_internal_server_error(s); |
521 | 249 return; |
250 } | |
251 | |
252 size = ctx->request->last - ctx->request->pos; | |
253 | |
254 n = ngx_send(c, ctx->request->pos, size); | |
255 | |
256 if (n == NGX_ERROR) { | |
1478 | 257 ngx_close_connection(c); |
547 | 258 ngx_destroy_pool(ctx->pool); |
1136 | 259 ngx_mail_session_internal_server_error(s); |
521 | 260 return; |
261 } | |
262 | |
263 if (n > 0) { | |
264 ctx->request->pos += n; | |
265 | |
266 if (n == size) { | |
1136 | 267 wev->handler = ngx_mail_auth_http_dummy_handler; |
521 | 268 |
269 if (wev->timer_set) { | |
270 ngx_del_timer(wev); | |
271 } | |
272 | |
2388
722b5aff05ae
use "!= NGX_OK" instead of "== NGX_ERROR"
Igor Sysoev <igor@sysoev.ru>
parents:
2310
diff
changeset
|
273 if (ngx_handle_write_event(wev, 0) != NGX_OK) { |
1478 | 274 ngx_close_connection(c); |
799
9737d6fb1ac6
disable write level event while waiting auth server response
Igor Sysoev <igor@sysoev.ru>
parents:
633
diff
changeset
|
275 ngx_destroy_pool(ctx->pool); |
1136 | 276 ngx_mail_session_internal_server_error(s); |
799
9737d6fb1ac6
disable write level event while waiting auth server response
Igor Sysoev <igor@sysoev.ru>
parents:
633
diff
changeset
|
277 } |
9737d6fb1ac6
disable write level event while waiting auth server response
Igor Sysoev <igor@sysoev.ru>
parents:
633
diff
changeset
|
278 |
521 | 279 return; |
280 } | |
281 } | |
282 | |
283 if (!wev->timer_set) { | |
1136 | 284 ahcf = ngx_mail_get_module_srv_conf(s, ngx_mail_auth_http_module); |
521 | 285 ngx_add_timer(wev, ahcf->timeout); |
286 } | |
287 } | |
288 | |
289 | |
290 static void | |
1136 | 291 ngx_mail_auth_http_read_handler(ngx_event_t *rev) |
521 | 292 { |
525 | 293 ssize_t n, size; |
521 | 294 ngx_connection_t *c; |
1136 | 295 ngx_mail_session_t *s; |
296 ngx_mail_auth_http_ctx_t *ctx; | |
521 | 297 |
298 c = rev->data; | |
299 s = c->data; | |
300 | |
1136 | 301 ngx_log_debug0(NGX_LOG_DEBUG_MAIL, rev->log, 0, |
302 "mail auth http read handler"); | |
521 | 303 |
1136 | 304 ctx = ngx_mail_get_module_ctx(s, ngx_mail_auth_http_module); |
525 | 305 |
577 | 306 if (rev->timedout) { |
525 | 307 ngx_log_error(NGX_LOG_ERR, rev->log, NGX_ETIMEDOUT, |
884 | 308 "auth http server %V timed out", ctx->peer.name); |
1478 | 309 ngx_close_connection(c); |
547 | 310 ngx_destroy_pool(ctx->pool); |
1136 | 311 ngx_mail_session_internal_server_error(s); |
525 | 312 return; |
313 } | |
314 | |
315 if (ctx->response == NULL) { | |
547 | 316 ctx->response = ngx_create_temp_buf(ctx->pool, 1024); |
525 | 317 if (ctx->response == NULL) { |
1478 | 318 ngx_close_connection(c); |
547 | 319 ngx_destroy_pool(ctx->pool); |
1136 | 320 ngx_mail_session_internal_server_error(s); |
525 | 321 return; |
322 } | |
323 } | |
324 | |
527 | 325 size = ctx->response->end - ctx->response->last; |
525 | 326 |
327 n = ngx_recv(c, ctx->response->pos, size); | |
328 | |
527 | 329 if (n > 0) { |
330 ctx->response->last += n; | |
331 | |
332 ctx->handler(s, ctx); | |
333 return; | |
334 } | |
335 | |
336 if (n == NGX_AGAIN) { | |
525 | 337 return; |
338 } | |
339 | |
1478 | 340 ngx_close_connection(c); |
547 | 341 ngx_destroy_pool(ctx->pool); |
1136 | 342 ngx_mail_session_internal_server_error(s); |
527 | 343 } |
525 | 344 |
345 | |
527 | 346 static void |
1136 | 347 ngx_mail_auth_http_ignore_status_line(ngx_mail_session_t *s, |
348 ngx_mail_auth_http_ctx_t *ctx) | |
527 | 349 { |
350 u_char *p, ch; | |
351 enum { | |
352 sw_start = 0, | |
353 sw_H, | |
354 sw_HT, | |
355 sw_HTT, | |
356 sw_HTTP, | |
357 sw_skip, | |
358 sw_almost_done | |
359 } state; | |
360 | |
1136 | 361 ngx_log_debug0(NGX_LOG_DEBUG_MAIL, s->connection->log, 0, |
362 "mail auth http process status line"); | |
527 | 363 |
364 state = ctx->state; | |
365 | |
366 for (p = ctx->response->pos; p < ctx->response->last; p++) { | |
367 ch = *p; | |
368 | |
369 switch (state) { | |
370 | |
371 /* "HTTP/" */ | |
372 case sw_start: | |
373 if (ch == 'H') { | |
374 state = sw_H; | |
375 break; | |
376 } | |
377 goto next; | |
378 | |
379 case sw_H: | |
380 if (ch == 'T') { | |
381 state = sw_HT; | |
382 break; | |
383 } | |
384 goto next; | |
385 | |
386 case sw_HT: | |
387 if (ch == 'T') { | |
388 state = sw_HTT; | |
389 break; | |
390 } | |
391 goto next; | |
392 | |
393 case sw_HTT: | |
394 if (ch == 'P') { | |
395 state = sw_HTTP; | |
396 break; | |
397 } | |
398 goto next; | |
399 | |
400 case sw_HTTP: | |
401 if (ch == '/') { | |
402 state = sw_skip; | |
403 break; | |
404 } | |
405 goto next; | |
406 | |
407 /* any text until end of line */ | |
408 case sw_skip: | |
409 switch (ch) { | |
410 case CR: | |
411 state = sw_almost_done; | |
412 | |
413 break; | |
577 | 414 case LF: |
527 | 415 goto done; |
416 } | |
417 break; | |
418 | |
419 /* end of status line */ | |
420 case sw_almost_done: | |
421 if (ch == LF) { | |
422 goto done; | |
423 } | |
424 | |
425 ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, | |
541 | 426 "auth http server &V sent invalid response", |
884 | 427 ctx->peer.name); |
527 | 428 ngx_close_connection(ctx->peer.connection); |
547 | 429 ngx_destroy_pool(ctx->pool); |
1136 | 430 ngx_mail_session_internal_server_error(s); |
527 | 431 return; |
432 } | |
433 } | |
434 | |
435 ctx->response->pos = p; | |
436 ctx->state = state; | |
437 | |
438 return; | |
439 | |
440 next: | |
441 | |
442 p = ctx->response->start - 1; | |
443 | |
444 done: | |
445 | |
446 ctx->response->pos = p + 1; | |
447 ctx->state = 0; | |
1136 | 448 ctx->handler = ngx_mail_auth_http_process_headers; |
527 | 449 ctx->handler(s, ctx); |
450 } | |
525 | 451 |
452 | |
527 | 453 static void |
1136 | 454 ngx_mail_auth_http_process_headers(ngx_mail_session_t *s, |
455 ngx_mail_auth_http_ctx_t *ctx) | |
527 | 456 { |
5134
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
457 u_char *p; |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
458 time_t timer; |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
459 size_t len, size; |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
460 ngx_int_t rc, port, n; |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
461 ngx_addr_t *peer; |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
462 struct sockaddr_in *sin; |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
463 #if (NGX_HAVE_INET6) |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
464 struct sockaddr_in6 *sin6; |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
465 #endif |
525 | 466 |
1136 | 467 ngx_log_debug0(NGX_LOG_DEBUG_MAIL, s->connection->log, 0, |
468 "mail auth http process headers"); | |
527 | 469 |
470 for ( ;; ) { | |
1136 | 471 rc = ngx_mail_auth_http_parse_header_line(s, ctx); |
527 | 472 |
473 if (rc == NGX_OK) { | |
474 | |
475 #if (NGX_DEBUG) | |
476 { | |
477 ngx_str_t key, value; | |
478 | |
479 key.len = ctx->header_name_end - ctx->header_name_start; | |
480 key.data = ctx->header_name_start; | |
481 value.len = ctx->header_end - ctx->header_start; | |
482 value.data = ctx->header_start; | |
483 | |
1136 | 484 ngx_log_debug2(NGX_LOG_DEBUG_MAIL, s->connection->log, 0, |
485 "mail auth http header: \"%V: %V\"", | |
527 | 486 &key, &value); |
487 } | |
488 #endif | |
489 | |
490 len = ctx->header_name_end - ctx->header_name_start; | |
491 | |
492 if (len == sizeof("Auth-Status") - 1 | |
1107
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
493 && ngx_strncasecmp(ctx->header_name_start, |
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
494 (u_char *) "Auth-Status", |
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
495 sizeof("Auth-Status") - 1) |
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
496 == 0) |
527 | 497 { |
498 len = ctx->header_end - ctx->header_start; | |
499 | |
500 if (len == 2 | |
501 && ctx->header_start[0] == 'O' | |
502 && ctx->header_start[1] == 'K') | |
503 { | |
504 continue; | |
505 } | |
506 | |
883 | 507 if (len == 4 |
508 && ctx->header_start[0] == 'W' | |
509 && ctx->header_start[1] == 'A' | |
510 && ctx->header_start[2] == 'I' | |
511 && ctx->header_start[3] == 'T') | |
512 { | |
513 s->auth_wait = 1; | |
514 continue; | |
515 } | |
516 | |
567 | 517 ctx->errmsg.len = len; |
518 ctx->errmsg.data = ctx->header_start; | |
519 | |
1136 | 520 switch (s->protocol) { |
521 | |
522 case NGX_MAIL_POP3_PROTOCOL: | |
854
1673f197bc62
fix segfault when many auth failures occurred
Igor Sysoev <igor@sysoev.ru>
parents:
809
diff
changeset
|
523 size = sizeof("-ERR ") - 1 + len + sizeof(CRLF) - 1; |
1136 | 524 break; |
527 | 525 |
1136 | 526 case NGX_MAIL_IMAP_PROTOCOL: |
854
1673f197bc62
fix segfault when many auth failures occurred
Igor Sysoev <igor@sysoev.ru>
parents:
809
diff
changeset
|
527 size = s->tag.len + sizeof("NO ") - 1 + len |
527 | 528 + sizeof(CRLF) - 1; |
1136 | 529 break; |
530 | |
531 default: /* NGX_MAIL_SMTP_PROTOCOL */ | |
532 ctx->err = ctx->errmsg; | |
533 continue; | |
527 | 534 } |
535 | |
2061
b0a1c84725cf
change useless ngx_pcalloc() to ngx_pnalloc()
Igor Sysoev <igor@sysoev.ru>
parents:
2049
diff
changeset
|
536 p = ngx_pnalloc(s->connection->pool, size); |
527 | 537 if (p == NULL) { |
543 | 538 ngx_close_connection(ctx->peer.connection); |
547 | 539 ngx_destroy_pool(ctx->pool); |
1136 | 540 ngx_mail_session_internal_server_error(s); |
527 | 541 return; |
542 } | |
543 | |
544 ctx->err.data = p; | |
545 | |
1136 | 546 switch (s->protocol) { |
527 | 547 |
1136 | 548 case NGX_MAIL_POP3_PROTOCOL: |
549 *p++ = '-'; *p++ = 'E'; *p++ = 'R'; *p++ = 'R'; *p++ = ' '; | |
550 break; | |
551 | |
552 case NGX_MAIL_IMAP_PROTOCOL: | |
527 | 553 p = ngx_cpymem(p, s->tag.data, s->tag.len); |
1136 | 554 *p++ = 'N'; *p++ = 'O'; *p++ = ' '; |
555 break; | |
556 | |
557 default: /* NGX_MAIL_SMTP_PROTOCOL */ | |
558 break; | |
527 | 559 } |
560 | |
561 p = ngx_cpymem(p, ctx->header_start, len); | |
562 *p++ = CR; *p++ = LF; | |
563 | |
564 ctx->err.len = p - ctx->err.data; | |
565 | |
566 continue; | |
567 } | |
568 | |
569 if (len == sizeof("Auth-Server") - 1 | |
1107
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
570 && ngx_strncasecmp(ctx->header_name_start, |
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
571 (u_char *) "Auth-Server", |
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
572 sizeof("Auth-Server") - 1) |
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
573 == 0) |
527 | 574 { |
575 ctx->addr.len = ctx->header_end - ctx->header_start; | |
576 ctx->addr.data = ctx->header_start; | |
577 | |
578 continue; | |
579 } | |
580 | |
581 if (len == sizeof("Auth-Port") - 1 | |
1107
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
582 && ngx_strncasecmp(ctx->header_name_start, |
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
583 (u_char *) "Auth-Port", |
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
584 sizeof("Auth-Port") - 1) |
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
585 == 0) |
527 | 586 { |
587 ctx->port.len = ctx->header_end - ctx->header_start; | |
588 ctx->port.data = ctx->header_start; | |
589 | |
590 continue; | |
591 } | |
592 | |
593 if (len == sizeof("Auth-User") - 1 | |
1107
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
594 && ngx_strncasecmp(ctx->header_name_start, |
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
595 (u_char *) "Auth-User", |
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
596 sizeof("Auth-User") - 1) |
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
597 == 0) |
527 | 598 { |
599 s->login.len = ctx->header_end - ctx->header_start; | |
567 | 600 |
2049 | 601 s->login.data = ngx_pnalloc(s->connection->pool, s->login.len); |
567 | 602 if (s->login.data == NULL) { |
603 ngx_close_connection(ctx->peer.connection); | |
604 ngx_destroy_pool(ctx->pool); | |
1136 | 605 ngx_mail_session_internal_server_error(s); |
567 | 606 return; |
607 } | |
608 | |
609 ngx_memcpy(s->login.data, ctx->header_start, s->login.len); | |
527 | 610 |
611 continue; | |
612 } | |
613 | |
800 | 614 if (len == sizeof("Auth-Pass") - 1 |
1107
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
615 && ngx_strncasecmp(ctx->header_name_start, |
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
616 (u_char *) "Auth-Pass", |
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
617 sizeof("Auth-Pass") - 1) |
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
618 == 0) |
800 | 619 { |
620 s->passwd.len = ctx->header_end - ctx->header_start; | |
621 | |
2049 | 622 s->passwd.data = ngx_pnalloc(s->connection->pool, |
623 s->passwd.len); | |
800 | 624 if (s->passwd.data == NULL) { |
625 ngx_close_connection(ctx->peer.connection); | |
626 ngx_destroy_pool(ctx->pool); | |
1136 | 627 ngx_mail_session_internal_server_error(s); |
800 | 628 return; |
629 } | |
630 | |
631 ngx_memcpy(s->passwd.data, ctx->header_start, s->passwd.len); | |
632 | |
633 continue; | |
634 } | |
635 | |
527 | 636 if (len == sizeof("Auth-Wait") - 1 |
1107
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
637 && ngx_strncasecmp(ctx->header_name_start, |
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
638 (u_char *) "Auth-Wait", |
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
639 sizeof("Auth-Wait") - 1) |
db7c468c447d
ngx_strcasecmp()/ngx_strncasecmp()
Igor Sysoev <igor@sysoev.ru>
parents:
906
diff
changeset
|
640 == 0) |
527 | 641 { |
642 n = ngx_atoi(ctx->header_start, | |
643 ctx->header_end - ctx->header_start); | |
644 | |
645 if (n != NGX_ERROR) { | |
646 ctx->sleep = n; | |
647 } | |
648 | |
649 continue; | |
650 } | |
651 | |
1136 | 652 if (len == sizeof("Auth-Error-Code") - 1 |
653 && ngx_strncasecmp(ctx->header_name_start, | |
654 (u_char *) "Auth-Error-Code", | |
655 sizeof("Auth-Error-Code") - 1) | |
656 == 0) | |
657 { | |
658 ctx->errcode.len = ctx->header_end - ctx->header_start; | |
659 | |
2049 | 660 ctx->errcode.data = ngx_pnalloc(s->connection->pool, |
661 ctx->errcode.len); | |
1136 | 662 if (ctx->errcode.data == NULL) { |
663 ngx_close_connection(ctx->peer.connection); | |
664 ngx_destroy_pool(ctx->pool); | |
665 ngx_mail_session_internal_server_error(s); | |
666 return; | |
667 } | |
668 | |
669 ngx_memcpy(ctx->errcode.data, ctx->header_start, | |
670 ctx->errcode.len); | |
671 | |
672 continue; | |
673 } | |
674 | |
527 | 675 /* ignore other headers */ |
676 | |
677 continue; | |
678 } | |
679 | |
680 if (rc == NGX_DONE) { | |
1136 | 681 ngx_log_debug0(NGX_LOG_DEBUG_MAIL, s->connection->log, 0, |
682 "mail auth http header done"); | |
527 | 683 |
684 ngx_close_connection(ctx->peer.connection); | |
685 | |
686 if (ctx->err.len) { | |
1136 | 687 |
567 | 688 ngx_log_error(NGX_LOG_INFO, s->connection->log, 0, |
689 "client login failed: \"%V\"", &ctx->errmsg); | |
690 | |
1136 | 691 if (s->protocol == NGX_MAIL_SMTP_PROTOCOL) { |
692 | |
693 if (ctx->errcode.len == 0) { | |
694 ctx->errcode = ngx_mail_smtp_errcode; | |
695 } | |
696 | |
697 ctx->err.len = ctx->errcode.len + ctx->errmsg.len | |
698 + sizeof(" " CRLF) - 1; | |
699 | |
2049 | 700 p = ngx_pnalloc(s->connection->pool, ctx->err.len); |
1166 | 701 if (p == NULL) { |
702 ngx_close_connection(ctx->peer.connection); | |
703 ngx_destroy_pool(ctx->pool); | |
704 ngx_mail_session_internal_server_error(s); | |
705 return; | |
706 } | |
1136 | 707 |
1166 | 708 ctx->err.data = p; |
1136 | 709 |
1166 | 710 p = ngx_cpymem(p, ctx->errcode.data, ctx->errcode.len); |
1136 | 711 *p++ = ' '; |
1166 | 712 p = ngx_cpymem(p, ctx->errmsg.data, ctx->errmsg.len); |
1136 | 713 *p++ = CR; *p = LF; |
714 } | |
715 | |
539 | 716 s->out = ctx->err; |
547 | 717 timer = ctx->sleep; |
527 | 718 |
547 | 719 ngx_destroy_pool(ctx->pool); |
720 | |
721 if (timer == 0) { | |
539 | 722 s->quit = 1; |
1136 | 723 ngx_mail_send(s->connection->write); |
541 | 724 return; |
725 } | |
539 | 726 |
1640 | 727 ngx_add_timer(s->connection->read, (ngx_msec_t) (timer * 1000)); |
527 | 728 |
1136 | 729 s->connection->read->handler = ngx_mail_auth_sleep_handler; |
527 | 730 |
731 return; | |
732 } | |
733 | |
883 | 734 if (s->auth_wait) { |
735 timer = ctx->sleep; | |
736 | |
737 ngx_destroy_pool(ctx->pool); | |
738 | |
739 if (timer == 0) { | |
1136 | 740 ngx_mail_auth_http_init(s); |
883 | 741 return; |
742 } | |
743 | |
1640 | 744 ngx_add_timer(s->connection->read, (ngx_msec_t) (timer * 1000)); |
883 | 745 |
1136 | 746 s->connection->read->handler = ngx_mail_auth_sleep_handler; |
883 | 747 |
748 return; | |
749 } | |
750 | |
527 | 751 if (ctx->addr.len == 0 || ctx->port.len == 0) { |
752 ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, | |
541 | 753 "auth http server %V did not send server or port", |
884 | 754 ctx->peer.name); |
547 | 755 ngx_destroy_pool(ctx->pool); |
1136 | 756 ngx_mail_session_internal_server_error(s); |
527 | 757 return; |
758 } | |
759 | |
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1478
diff
changeset
|
760 if (s->passwd.data == NULL |
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1478
diff
changeset
|
761 && s->protocol != NGX_MAIL_SMTP_PROTOCOL) |
1136 | 762 { |
800 | 763 ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, |
764 "auth http server %V did not send password", | |
884 | 765 ctx->peer.name); |
800 | 766 ngx_destroy_pool(ctx->pool); |
1136 | 767 ngx_mail_session_internal_server_error(s); |
800 | 768 return; |
769 } | |
770 | |
3269
f0d596e84634
rename ngx_peer_addr_t to ngx_addr_t
Igor Sysoev <igor@sysoev.ru>
parents:
3267
diff
changeset
|
771 peer = ngx_pcalloc(s->connection->pool, sizeof(ngx_addr_t)); |
884 | 772 if (peer == NULL) { |
547 | 773 ngx_destroy_pool(ctx->pool); |
1136 | 774 ngx_mail_session_internal_server_error(s); |
527 | 775 return; |
776 } | |
777 | |
5134
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
778 rc = ngx_parse_addr(s->connection->pool, peer, |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
779 ctx->addr.data, ctx->addr.len); |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
780 |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
781 switch (rc) { |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
782 case NGX_OK: |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
783 break; |
2855
a96a8c916b0c
mail proxy listen IPv6 support
Igor Sysoev <igor@sysoev.ru>
parents:
2748
diff
changeset
|
784 |
5134
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
785 case NGX_DECLINED: |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
786 ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
787 "auth http server %V sent invalid server " |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
788 "address:\"%V\"", |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
789 ctx->peer.name, &ctx->addr); |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
790 /* fall through */ |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
791 |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
792 default: |
547 | 793 ngx_destroy_pool(ctx->pool); |
1136 | 794 ngx_mail_session_internal_server_error(s); |
527 | 795 return; |
796 } | |
797 | |
798 port = ngx_atoi(ctx->port.data, ctx->port.len); | |
4227 | 799 if (port == NGX_ERROR || port < 1 || port > 65535) { |
527 | 800 ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, |
541 | 801 "auth http server %V sent invalid server " |
802 "port:\"%V\"", | |
884 | 803 ctx->peer.name, &ctx->port); |
547 | 804 ngx_destroy_pool(ctx->pool); |
1136 | 805 ngx_mail_session_internal_server_error(s); |
527 | 806 return; |
807 } | |
808 | |
5134
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
809 switch (peer->sockaddr->sa_family) { |
527 | 810 |
5134
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
811 #if (NGX_HAVE_INET6) |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
812 case AF_INET6: |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
813 sin6 = (struct sockaddr_in6 *) peer->sockaddr; |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
814 sin6->sin6_port = htons((in_port_t) port); |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
815 break; |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
816 #endif |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
817 |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
818 default: /* AF_INET */ |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
819 sin = (struct sockaddr_in *) peer->sockaddr; |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
820 sin->sin_port = htons((in_port_t) port); |
c788e54090de
Mail: IPv6 backends (ticket #323).
Ruslan Ermilov <ru@nginx.com>
parents:
4971
diff
changeset
|
821 break; |
527 | 822 } |
823 | |
824 len = ctx->addr.len + 1 + ctx->port.len; | |
825 | |
884 | 826 peer->name.len = len; |
527 | 827 |
2049 | 828 peer->name.data = ngx_pnalloc(s->connection->pool, len); |
884 | 829 if (peer->name.data == NULL) { |
547 | 830 ngx_destroy_pool(ctx->pool); |
1136 | 831 ngx_mail_session_internal_server_error(s); |
527 | 832 return; |
833 } | |
834 | |
835 len = ctx->addr.len; | |
836 | |
884 | 837 ngx_memcpy(peer->name.data, ctx->addr.data, len); |
527 | 838 |
884 | 839 peer->name.data[len++] = ':'; |
527 | 840 |
884 | 841 ngx_memcpy(peer->name.data + len, ctx->port.data, ctx->port.len); |
527 | 842 |
547 | 843 ngx_destroy_pool(ctx->pool); |
1136 | 844 ngx_mail_proxy_init(s, peer); |
527 | 845 |
846 return; | |
847 } | |
848 | |
849 if (rc == NGX_AGAIN ) { | |
850 return; | |
851 } | |
852 | |
853 /* rc == NGX_ERROR */ | |
854 | |
855 ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, | |
541 | 856 "auth http server %V sent invalid header in response", |
884 | 857 ctx->peer.name); |
527 | 858 ngx_close_connection(ctx->peer.connection); |
547 | 859 ngx_destroy_pool(ctx->pool); |
1136 | 860 ngx_mail_session_internal_server_error(s); |
527 | 861 |
862 return; | |
863 } | |
864 } | |
865 | |
521 | 866 |
527 | 867 static void |
1136 | 868 ngx_mail_auth_sleep_handler(ngx_event_t *rev) |
527 | 869 { |
543 | 870 ngx_connection_t *c; |
1136 | 871 ngx_mail_session_t *s; |
872 ngx_mail_core_srv_conf_t *cscf; | |
527 | 873 |
1136 | 874 ngx_log_debug0(NGX_LOG_DEBUG_MAIL, rev->log, 0, "mail auth sleep handler"); |
527 | 875 |
876 c = rev->data; | |
877 s = c->data; | |
878 | |
879 if (rev->timedout) { | |
880 | |
881 rev->timedout = 0; | |
882 | |
883 | 883 if (s->auth_wait) { |
884 s->auth_wait = 0; | |
1136 | 885 ngx_mail_auth_http_init(s); |
883 | 886 return; |
887 } | |
888 | |
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1478
diff
changeset
|
889 cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module); |
527 | 890 |
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1478
diff
changeset
|
891 rev->handler = cscf->protocol->auth_state; |
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1478
diff
changeset
|
892 |
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1478
diff
changeset
|
893 s->mail_state = 0; |
1136 | 894 s->auth_method = NGX_MAIL_AUTH_PLAIN; |
800 | 895 |
543 | 896 c->log->action = "in auth state"; |
897 | |
1477 | 898 ngx_mail_send(c->write); |
543 | 899 |
583 | 900 if (c->destroyed) { |
543 | 901 return; |
902 } | |
903 | |
904 ngx_add_timer(rev, cscf->timeout); | |
905 | |
527 | 906 if (rev->ready) { |
1477 | 907 rev->handler(rev); |
527 | 908 return; |
909 } | |
910 | |
2388
722b5aff05ae
use "!= NGX_OK" instead of "== NGX_ERROR"
Igor Sysoev <igor@sysoev.ru>
parents:
2310
diff
changeset
|
911 if (ngx_handle_read_event(rev, 0) != NGX_OK) { |
1477 | 912 ngx_mail_close_connection(c); |
527 | 913 } |
914 | |
915 return; | |
916 } | |
917 | |
918 if (rev->active) { | |
2388
722b5aff05ae
use "!= NGX_OK" instead of "== NGX_ERROR"
Igor Sysoev <igor@sysoev.ru>
parents:
2310
diff
changeset
|
919 if (ngx_handle_read_event(rev, 0) != NGX_OK) { |
1477 | 920 ngx_mail_close_connection(c); |
527 | 921 } |
922 } | |
923 } | |
924 | |
925 | |
926 static ngx_int_t | |
1136 | 927 ngx_mail_auth_http_parse_header_line(ngx_mail_session_t *s, |
928 ngx_mail_auth_http_ctx_t *ctx) | |
527 | 929 { |
930 u_char c, ch, *p; | |
931 enum { | |
932 sw_start = 0, | |
933 sw_name, | |
934 sw_space_before_value, | |
935 sw_value, | |
936 sw_space_after_value, | |
577 | 937 sw_almost_done, |
527 | 938 sw_header_almost_done |
939 } state; | |
940 | |
577 | 941 state = ctx->state; |
527 | 942 |
943 for (p = ctx->response->pos; p < ctx->response->last; p++) { | |
944 ch = *p; | |
945 | |
946 switch (state) { | |
947 | |
948 /* first char */ | |
949 case sw_start: | |
950 | |
951 switch (ch) { | |
952 case CR: | |
577 | 953 ctx->header_end = p; |
527 | 954 state = sw_header_almost_done; |
955 break; | |
577 | 956 case LF: |
527 | 957 ctx->header_end = p; |
958 goto header_done; | |
959 default: | |
960 state = sw_name; | |
961 ctx->header_name_start = p; | |
962 | |
963 c = (u_char) (ch | 0x20); | |
964 if (c >= 'a' && c <= 'z') { | |
965 break; | |
966 } | |
967 | |
968 if (ch >= '0' && ch <= '9') { | |
969 break; | |
970 } | |
971 | |
972 return NGX_ERROR; | |
973 } | |
974 break; | |
975 | |
976 /* header name */ | |
977 case sw_name: | |
978 c = (u_char) (ch | 0x20); | |
979 if (c >= 'a' && c <= 'z') { | |
980 break; | |
981 } | |
982 | |
983 if (ch == ':') { | |
984 ctx->header_name_end = p; | |
985 state = sw_space_before_value; | |
986 break; | |
987 } | |
988 | |
989 if (ch == '-') { | |
990 break; | |
991 } | |
992 | |
993 if (ch >= '0' && ch <= '9') { | |
994 break; | |
995 } | |
996 | |
997 if (ch == CR) { | |
998 ctx->header_name_end = p; | |
999 ctx->header_start = p; | |
1000 ctx->header_end = p; | |
1001 state = sw_almost_done; | |
1002 break; | |
1003 } | |
1004 | |
1005 if (ch == LF) { | |
1006 ctx->header_name_end = p; | |
1007 ctx->header_start = p; | |
1008 ctx->header_end = p; | |
1009 goto done; | |
1010 } | |
1011 | |
1012 return NGX_ERROR; | |
1013 | |
1014 /* space* before header value */ | |
1015 case sw_space_before_value: | |
1016 switch (ch) { | |
1017 case ' ': | |
1018 break; | |
1019 case CR: | |
1020 ctx->header_start = p; | |
1021 ctx->header_end = p; | |
1022 state = sw_almost_done; | |
1023 break; | |
1024 case LF: | |
1025 ctx->header_start = p; | |
1026 ctx->header_end = p; | |
1027 goto done; | |
1028 default: | |
1029 ctx->header_start = p; | |
1030 state = sw_value; | |
1031 break; | |
1032 } | |
1033 break; | |
1034 | |
1035 /* header value */ | |
1036 case sw_value: | |
1037 switch (ch) { | |
1038 case ' ': | |
1039 ctx->header_end = p; | |
1040 state = sw_space_after_value; | |
1041 break; | |
1042 case CR: | |
1043 ctx->header_end = p; | |
1044 state = sw_almost_done; | |
1045 break; | |
1046 case LF: | |
1047 ctx->header_end = p; | |
1048 goto done; | |
1049 } | |
1050 break; | |
1051 | |
1052 /* space* before end of header line */ | |
1053 case sw_space_after_value: | |
1054 switch (ch) { | |
1055 case ' ': | |
1056 break; | |
1057 case CR: | |
1058 state = sw_almost_done; | |
1059 break; | |
1060 case LF: | |
1061 goto done; | |
1062 default: | |
1063 state = sw_value; | |
1064 break; | |
1065 } | |
1066 break; | |
1067 | |
1068 /* end of header line */ | |
1069 case sw_almost_done: | |
1070 switch (ch) { | |
1071 case LF: | |
1072 goto done; | |
1073 default: | |
1074 return NGX_ERROR; | |
1075 } | |
1076 | |
1077 /* end of header */ | |
1078 case sw_header_almost_done: | |
1079 switch (ch) { | |
1080 case LF: | |
1081 goto header_done; | |
1082 default: | |
1083 return NGX_ERROR; | |
1084 } | |
1085 } | |
1086 } | |
1087 | |
1088 ctx->response->pos = p; | |
1089 ctx->state = state; | |
1090 | |
1091 return NGX_AGAIN; | |
1092 | |
1093 done: | |
1094 | |
1095 ctx->response->pos = p + 1; | |
1096 ctx->state = sw_start; | |
1097 | |
1098 return NGX_OK; | |
1099 | |
1100 header_done: | |
1101 | |
1102 ctx->response->pos = p + 1; | |
1103 ctx->state = sw_start; | |
1104 | |
1105 return NGX_DONE; | |
521 | 1106 } |
1107 | |
1108 | |
1109 static void | |
1136 | 1110 ngx_mail_auth_http_block_read(ngx_event_t *rev) |
521 | 1111 { |
1112 ngx_connection_t *c; | |
1136 | 1113 ngx_mail_session_t *s; |
1114 ngx_mail_auth_http_ctx_t *ctx; | |
521 | 1115 |
1136 | 1116 ngx_log_debug0(NGX_LOG_DEBUG_MAIL, rev->log, 0, |
1117 "mail auth http block read"); | |
521 | 1118 |
2388
722b5aff05ae
use "!= NGX_OK" instead of "== NGX_ERROR"
Igor Sysoev <igor@sysoev.ru>
parents:
2310
diff
changeset
|
1119 if (ngx_handle_read_event(rev, 0) != NGX_OK) { |
521 | 1120 c = rev->data; |
1121 s = c->data; | |
1122 | |
1136 | 1123 ctx = ngx_mail_get_module_ctx(s, ngx_mail_auth_http_module); |
521 | 1124 |
525 | 1125 ngx_close_connection(ctx->peer.connection); |
547 | 1126 ngx_destroy_pool(ctx->pool); |
1136 | 1127 ngx_mail_session_internal_server_error(s); |
521 | 1128 } |
1129 } | |
1130 | |
1131 | |
1132 static void | |
1136 | 1133 ngx_mail_auth_http_dummy_handler(ngx_event_t *ev) |
521 | 1134 { |
1136 | 1135 ngx_log_debug0(NGX_LOG_DEBUG_MAIL, ev->log, 0, |
1136 "mail auth http dummy handler"); | |
521 | 1137 } |
1138 | |
1139 | |
1140 static ngx_buf_t * | |
1136 | 1141 ngx_mail_auth_http_create_request(ngx_mail_session_t *s, ngx_pool_t *pool, |
1142 ngx_mail_auth_http_conf_t *ahcf) | |
521 | 1143 { |
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1478
diff
changeset
|
1144 size_t len; |
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1478
diff
changeset
|
1145 ngx_buf_t *b; |
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1478
diff
changeset
|
1146 ngx_str_t login, passwd; |
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1478
diff
changeset
|
1147 ngx_mail_core_srv_conf_t *cscf; |
633 | 1148 |
1136 | 1149 if (ngx_mail_auth_http_escape(pool, &s->login, &login) != NGX_OK) { |
633 | 1150 return NULL; |
1151 } | |
1152 | |
1136 | 1153 if (ngx_mail_auth_http_escape(pool, &s->passwd, &passwd) != NGX_OK) { |
633 | 1154 return NULL; |
1155 } | |
521 | 1156 |
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1478
diff
changeset
|
1157 cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module); |
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1478
diff
changeset
|
1158 |
521 | 1159 len = sizeof("GET ") - 1 + ahcf->uri.len + sizeof(" HTTP/1.0" CRLF) - 1 |
1160 + sizeof("Host: ") - 1 + ahcf->host_header.len + sizeof(CRLF) - 1 | |
856
0197d6aae54e
use correct auth method length
Igor Sysoev <igor@sysoev.ru>
parents:
854
diff
changeset
|
1161 + sizeof("Auth-Method: ") - 1 |
1136 | 1162 + ngx_mail_auth_http_method[s->auth_method].len |
856
0197d6aae54e
use correct auth method length
Igor Sysoev <igor@sysoev.ru>
parents:
854
diff
changeset
|
1163 + sizeof(CRLF) - 1 |
633 | 1164 + sizeof("Auth-User: ") - 1 + login.len + sizeof(CRLF) - 1 |
1165 + sizeof("Auth-Pass: ") - 1 + passwd.len + sizeof(CRLF) - 1 | |
800 | 1166 + sizeof("Auth-Salt: ") - 1 + s->salt.len |
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1478
diff
changeset
|
1167 + sizeof("Auth-Protocol: ") - 1 + cscf->protocol->name.len |
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1478
diff
changeset
|
1168 + sizeof(CRLF) - 1 |
527 | 1169 + sizeof("Auth-Login-Attempt: ") - 1 + NGX_INT_T_LEN |
1170 + sizeof(CRLF) - 1 | |
521 | 1171 + sizeof("Client-IP: ") - 1 + s->connection->addr_text.len |
1172 + sizeof(CRLF) - 1 | |
2309 | 1173 + sizeof("Client-Host: ") - 1 + s->host.len + sizeof(CRLF) - 1 |
1174 + sizeof("Auth-SMTP-Helo: ") - 1 + s->smtp_helo.len | |
1175 + sizeof("Auth-SMTP-From: ") - 1 + s->smtp_from.len | |
1176 + sizeof("Auth-SMTP-To: ") - 1 + s->smtp_to.len | |
1285
0c10dc6a8e74
fix memory allocation for auth_http_header
Igor Sysoev <igor@sysoev.ru>
parents:
1166
diff
changeset
|
1177 + ahcf->header.len |
521 | 1178 + sizeof(CRLF) - 1; |
1179 | |
547 | 1180 b = ngx_create_temp_buf(pool, len); |
521 | 1181 if (b == NULL) { |
1182 return NULL; | |
1183 } | |
1184 | |
1185 b->last = ngx_cpymem(b->last, "GET ", sizeof("GET ") - 1); | |
573 | 1186 b->last = ngx_copy(b->last, ahcf->uri.data, ahcf->uri.len); |
521 | 1187 b->last = ngx_cpymem(b->last, " HTTP/1.0" CRLF, |
1188 sizeof(" HTTP/1.0" CRLF) - 1); | |
1189 | |
1190 b->last = ngx_cpymem(b->last, "Host: ", sizeof("Host: ") - 1); | |
573 | 1191 b->last = ngx_copy(b->last, ahcf->host_header.data, |
521 | 1192 ahcf->host_header.len); |
1193 *b->last++ = CR; *b->last++ = LF; | |
1194 | |
800 | 1195 b->last = ngx_cpymem(b->last, "Auth-Method: ", |
1196 sizeof("Auth-Method: ") - 1); | |
1197 b->last = ngx_cpymem(b->last, | |
1136 | 1198 ngx_mail_auth_http_method[s->auth_method].data, |
1199 ngx_mail_auth_http_method[s->auth_method].len); | |
800 | 1200 *b->last++ = CR; *b->last++ = LF; |
521 | 1201 |
1202 b->last = ngx_cpymem(b->last, "Auth-User: ", sizeof("Auth-User: ") - 1); | |
633 | 1203 b->last = ngx_copy(b->last, login.data, login.len); |
521 | 1204 *b->last++ = CR; *b->last++ = LF; |
1205 | |
1206 b->last = ngx_cpymem(b->last, "Auth-Pass: ", sizeof("Auth-Pass: ") - 1); | |
633 | 1207 b->last = ngx_copy(b->last, passwd.data, passwd.len); |
521 | 1208 *b->last++ = CR; *b->last++ = LF; |
1209 | |
1136 | 1210 if (s->auth_method != NGX_MAIL_AUTH_PLAIN && s->salt.len) { |
800 | 1211 b->last = ngx_cpymem(b->last, "Auth-Salt: ", sizeof("Auth-Salt: ") - 1); |
1212 b->last = ngx_copy(b->last, s->salt.data, s->salt.len); | |
1213 | |
1214 s->passwd.data = NULL; | |
1215 } | |
1216 | |
521 | 1217 b->last = ngx_cpymem(b->last, "Auth-Protocol: ", |
1218 sizeof("Auth-Protocol: ") - 1); | |
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1478
diff
changeset
|
1219 b->last = ngx_cpymem(b->last, cscf->protocol->name.data, |
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1478
diff
changeset
|
1220 cscf->protocol->name.len); |
521 | 1221 *b->last++ = CR; *b->last++ = LF; |
1222 | |
527 | 1223 b->last = ngx_sprintf(b->last, "Auth-Login-Attempt: %ui" CRLF, |
1224 s->login_attempt); | |
1225 | |
521 | 1226 b->last = ngx_cpymem(b->last, "Client-IP: ", sizeof("Client-IP: ") - 1); |
573 | 1227 b->last = ngx_copy(b->last, s->connection->addr_text.data, |
2309 | 1228 s->connection->addr_text.len); |
521 | 1229 *b->last++ = CR; *b->last++ = LF; |
1230 | |
2309 | 1231 if (s->host.len) { |
1232 b->last = ngx_cpymem(b->last, "Client-Host: ", | |
1233 sizeof("Client-Host: ") - 1); | |
1234 b->last = ngx_copy(b->last, s->host.data, s->host.len); | |
1235 *b->last++ = CR; *b->last++ = LF; | |
1236 } | |
1237 | |
1238 if (s->auth_method == NGX_MAIL_AUTH_NONE) { | |
1239 | |
1240 /* HELO, MAIL FROM, and RCPT TO can't contain CRLF, no need to escape */ | |
1241 | |
1242 b->last = ngx_cpymem(b->last, "Auth-SMTP-Helo: ", | |
1243 sizeof("Auth-SMTP-Helo: ") - 1); | |
1244 b->last = ngx_copy(b->last, s->smtp_helo.data, s->smtp_helo.len); | |
1245 *b->last++ = CR; *b->last++ = LF; | |
1246 | |
1247 b->last = ngx_cpymem(b->last, "Auth-SMTP-From: ", | |
1248 sizeof("Auth-SMTP-From: ") - 1); | |
1249 b->last = ngx_copy(b->last, s->smtp_from.data, s->smtp_from.len); | |
1250 *b->last++ = CR; *b->last++ = LF; | |
1251 | |
1252 b->last = ngx_cpymem(b->last, "Auth-SMTP-To: ", | |
1253 sizeof("Auth-SMTP-To: ") - 1); | |
1254 b->last = ngx_copy(b->last, s->smtp_to.data, s->smtp_to.len); | |
1255 *b->last++ = CR; *b->last++ = LF; | |
1256 | |
1257 } | |
1258 | |
573 | 1259 if (ahcf->header.len) { |
1260 b->last = ngx_copy(b->last, ahcf->header.data, ahcf->header.len); | |
1261 } | |
1262 | |
521 | 1263 /* add "\r\n" at the header end */ |
1264 *b->last++ = CR; *b->last++ = LF; | |
1265 | |
1136 | 1266 #if (NGX_DEBUG_MAIL_PASSWD) |
521 | 1267 { |
1268 ngx_str_t l; | |
1269 | |
1270 l.len = b->last - b->pos; | |
1271 l.data = b->pos; | |
1136 | 1272 ngx_log_debug1(NGX_LOG_DEBUG_MAIL, s->connection->log, 0, |
1273 "mail auth http header:\n\"%V\"", &l); | |
521 | 1274 } |
1275 #endif | |
1276 | |
1277 return b; | |
1278 } | |
1279 | |
1280 | |
633 | 1281 static ngx_int_t |
1136 | 1282 ngx_mail_auth_http_escape(ngx_pool_t *pool, ngx_str_t *text, ngx_str_t *escaped) |
633 | 1283 { |
1405
fdd064faf26a
escape " ", "%", and %00-%1F in login and password
Igor Sysoev <igor@sysoev.ru>
parents:
1392
diff
changeset
|
1284 u_char *p; |
fdd064faf26a
escape " ", "%", and %00-%1F in login and password
Igor Sysoev <igor@sysoev.ru>
parents:
1392
diff
changeset
|
1285 uintptr_t n; |
633 | 1286 |
1405
fdd064faf26a
escape " ", "%", and %00-%1F in login and password
Igor Sysoev <igor@sysoev.ru>
parents:
1392
diff
changeset
|
1287 n = ngx_escape_uri(NULL, text->data, text->len, NGX_ESCAPE_MAIL_AUTH); |
633 | 1288 |
1289 if (n == 0) { | |
1290 *escaped = *text; | |
1291 return NGX_OK; | |
1292 } | |
1293 | |
1294 escaped->len = text->len + n * 2; | |
1295 | |
2049 | 1296 p = ngx_pnalloc(pool, escaped->len); |
633 | 1297 if (p == NULL) { |
1298 return NGX_ERROR; | |
1299 } | |
1300 | |
1405
fdd064faf26a
escape " ", "%", and %00-%1F in login and password
Igor Sysoev <igor@sysoev.ru>
parents:
1392
diff
changeset
|
1301 (void) ngx_escape_uri(p, text->data, text->len, NGX_ESCAPE_MAIL_AUTH); |
633 | 1302 |
1405
fdd064faf26a
escape " ", "%", and %00-%1F in login and password
Igor Sysoev <igor@sysoev.ru>
parents:
1392
diff
changeset
|
1303 escaped->data = p; |
633 | 1304 |
1305 return NGX_OK; | |
1306 } | |
1307 | |
1308 | |
521 | 1309 static void * |
1136 | 1310 ngx_mail_auth_http_create_conf(ngx_conf_t *cf) |
577 | 1311 { |
1136 | 1312 ngx_mail_auth_http_conf_t *ahcf; |
577 | 1313 |
1136 | 1314 ahcf = ngx_pcalloc(cf->pool, sizeof(ngx_mail_auth_http_conf_t)); |
521 | 1315 if (ahcf == NULL) { |
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
2855
diff
changeset
|
1316 return NULL; |
521 | 1317 } |
1318 | |
1319 ahcf->timeout = NGX_CONF_UNSET_MSEC; | |
1320 | |
1392 | 1321 ahcf->file = cf->conf_file->file.name.data; |
1322 ahcf->line = cf->conf_file->line; | |
1323 | |
521 | 1324 return ahcf; |
1325 } | |
1326 | |
1327 | |
1328 static char * | |
1136 | 1329 ngx_mail_auth_http_merge_conf(ngx_conf_t *cf, void *parent, void *child) |
521 | 1330 { |
1136 | 1331 ngx_mail_auth_http_conf_t *prev = parent; |
1332 ngx_mail_auth_http_conf_t *conf = child; | |
521 | 1333 |
573 | 1334 u_char *p; |
1335 size_t len; | |
1336 ngx_uint_t i; | |
1337 ngx_table_elt_t *header; | |
1338 | |
884 | 1339 if (conf->peer == NULL) { |
1340 conf->peer = prev->peer; | |
521 | 1341 conf->host_header = prev->host_header; |
1342 conf->uri = prev->uri; | |
1392 | 1343 |
1344 if (conf->peer == NULL) { | |
1345 ngx_log_error(NGX_LOG_EMERG, cf->log, 0, | |
4812
785ae4de268b
Corrected the directive name in the ngx_mail_auth_http_module error message.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
1346 "no \"auth_http\" is defined for server in %s:%ui", |
1392 | 1347 conf->file, conf->line); |
1348 | |
1349 return NGX_CONF_ERROR; | |
1350 } | |
521 | 1351 } |
1352 | |
1353 ngx_conf_merge_msec_value(conf->timeout, prev->timeout, 60000); | |
1354 | |
573 | 1355 if (conf->headers == NULL) { |
1356 conf->headers = prev->headers; | |
1357 conf->header = prev->header; | |
1358 } | |
1359 | |
1360 if (conf->headers && conf->header.len == 0) { | |
1361 len = 0; | |
1362 header = conf->headers->elts; | |
1363 for (i = 0; i < conf->headers->nelts; i++) { | |
1364 len += header[i].key.len + 2 + header[i].value.len + 2; | |
1365 } | |
1366 | |
2049 | 1367 p = ngx_pnalloc(cf->pool, len); |
573 | 1368 if (p == NULL) { |
1369 return NGX_CONF_ERROR; | |
1370 } | |
1371 | |
1372 conf->header.len = len; | |
1373 conf->header.data = p; | |
1374 | |
1375 for (i = 0; i < conf->headers->nelts; i++) { | |
1376 p = ngx_cpymem(p, header[i].key.data, header[i].key.len); | |
1377 *p++ = ':'; *p++ = ' '; | |
1378 p = ngx_cpymem(p, header[i].value.data, header[i].value.len); | |
1379 *p++ = CR; *p++ = LF; | |
1380 } | |
1381 } | |
1382 | |
521 | 1383 return NGX_CONF_OK; |
1384 } | |
1385 | |
1386 | |
1387 static char * | |
1136 | 1388 ngx_mail_auth_http(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
577 | 1389 { |
1136 | 1390 ngx_mail_auth_http_conf_t *ahcf = conf; |
521 | 1391 |
805
8ee450f30c25
now the "auth_http" directive uses ngx_parse_url()
Igor Sysoev <igor@sysoev.ru>
parents:
800
diff
changeset
|
1392 ngx_str_t *value; |
8ee450f30c25
now the "auth_http" directive uses ngx_parse_url()
Igor Sysoev <igor@sysoev.ru>
parents:
800
diff
changeset
|
1393 ngx_url_t u; |
573 | 1394 |
521 | 1395 value = cf->args->elts; |
1396 | |
805
8ee450f30c25
now the "auth_http" directive uses ngx_parse_url()
Igor Sysoev <igor@sysoev.ru>
parents:
800
diff
changeset
|
1397 ngx_memzero(&u, sizeof(ngx_url_t)); |
521 | 1398 |
805
8ee450f30c25
now the "auth_http" directive uses ngx_parse_url()
Igor Sysoev <igor@sysoev.ru>
parents:
800
diff
changeset
|
1399 u.url = value[1]; |
906 | 1400 u.default_port = 80; |
805
8ee450f30c25
now the "auth_http" directive uses ngx_parse_url()
Igor Sysoev <igor@sysoev.ru>
parents:
800
diff
changeset
|
1401 u.uri_part = 1; |
577 | 1402 |
1391
4eed21047e4d
allow "http://" in auth_http URL
Igor Sysoev <igor@sysoev.ru>
parents:
1390
diff
changeset
|
1403 if (ngx_strncmp(u.url.data, "http://", 7) == 0) { |
4eed21047e4d
allow "http://" in auth_http URL
Igor Sysoev <igor@sysoev.ru>
parents:
1390
diff
changeset
|
1404 u.url.len -= 7; |
4eed21047e4d
allow "http://" in auth_http URL
Igor Sysoev <igor@sysoev.ru>
parents:
1390
diff
changeset
|
1405 u.url.data += 7; |
4eed21047e4d
allow "http://" in auth_http URL
Igor Sysoev <igor@sysoev.ru>
parents:
1390
diff
changeset
|
1406 } |
4eed21047e4d
allow "http://" in auth_http URL
Igor Sysoev <igor@sysoev.ru>
parents:
1390
diff
changeset
|
1407 |
1559
fe11e2a3946d
use pool instead of ngx_conf_t
Igor Sysoev <igor@sysoev.ru>
parents:
1487
diff
changeset
|
1408 if (ngx_parse_url(cf->pool, &u) != NGX_OK) { |
805
8ee450f30c25
now the "auth_http" directive uses ngx_parse_url()
Igor Sysoev <igor@sysoev.ru>
parents:
800
diff
changeset
|
1409 if (u.err) { |
8ee450f30c25
now the "auth_http" directive uses ngx_parse_url()
Igor Sysoev <igor@sysoev.ru>
parents:
800
diff
changeset
|
1410 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
8ee450f30c25
now the "auth_http" directive uses ngx_parse_url()
Igor Sysoev <igor@sysoev.ru>
parents:
800
diff
changeset
|
1411 "%s in auth_http \"%V\"", u.err, &u.url); |
8ee450f30c25
now the "auth_http" directive uses ngx_parse_url()
Igor Sysoev <igor@sysoev.ru>
parents:
800
diff
changeset
|
1412 } |
1390 | 1413 |
1414 return NGX_CONF_ERROR; | |
805
8ee450f30c25
now the "auth_http" directive uses ngx_parse_url()
Igor Sysoev <igor@sysoev.ru>
parents:
800
diff
changeset
|
1415 } |
521 | 1416 |
884 | 1417 ahcf->peer = u.addrs; |
521 | 1418 |
3406
a2a5812cf4f4
use "localhost" in "Host" header line, if unix socket is used in "auth_http"
Igor Sysoev <igor@sysoev.ru>
parents:
3269
diff
changeset
|
1419 if (u.family != AF_UNIX) { |
a2a5812cf4f4
use "localhost" in "Host" header line, if unix socket is used in "auth_http"
Igor Sysoev <igor@sysoev.ru>
parents:
3269
diff
changeset
|
1420 ahcf->host_header = u.host; |
a2a5812cf4f4
use "localhost" in "Host" header line, if unix socket is used in "auth_http"
Igor Sysoev <igor@sysoev.ru>
parents:
3269
diff
changeset
|
1421 |
a2a5812cf4f4
use "localhost" in "Host" header line, if unix socket is used in "auth_http"
Igor Sysoev <igor@sysoev.ru>
parents:
3269
diff
changeset
|
1422 } else { |
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3406
diff
changeset
|
1423 ngx_str_set(&ahcf->host_header, "localhost"); |
3406
a2a5812cf4f4
use "localhost" in "Host" header line, if unix socket is used in "auth_http"
Igor Sysoev <igor@sysoev.ru>
parents:
3269
diff
changeset
|
1424 } |
a2a5812cf4f4
use "localhost" in "Host" header line, if unix socket is used in "auth_http"
Igor Sysoev <igor@sysoev.ru>
parents:
3269
diff
changeset
|
1425 |
805
8ee450f30c25
now the "auth_http" directive uses ngx_parse_url()
Igor Sysoev <igor@sysoev.ru>
parents:
800
diff
changeset
|
1426 ahcf->uri = u.uri; |
521 | 1427 |
559 | 1428 if (ahcf->uri.len == 0) { |
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3406
diff
changeset
|
1429 ngx_str_set(&ahcf->uri, "/"); |
555 | 1430 } |
1431 | |
521 | 1432 return NGX_CONF_OK; |
1433 } | |
573 | 1434 |
1435 | |
1436 static char * | |
1136 | 1437 ngx_mail_auth_http_header(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
577 | 1438 { |
1136 | 1439 ngx_mail_auth_http_conf_t *ahcf = conf; |
573 | 1440 |
1441 ngx_str_t *value; | |
1442 ngx_table_elt_t *header; | |
1443 | |
1444 if (ahcf->headers == NULL) { | |
1445 ahcf->headers = ngx_array_create(cf->pool, 1, sizeof(ngx_table_elt_t)); | |
1446 if (ahcf->headers == NULL) { | |
1447 return NGX_CONF_ERROR; | |
1448 } | |
1449 } | |
1450 | |
1451 header = ngx_array_push(ahcf->headers); | |
1452 if (header == NULL) { | |
1453 return NGX_CONF_ERROR; | |
1454 } | |
1455 | |
1456 value = cf->args->elts; | |
1457 | |
1458 header->key = value[1]; | |
1459 header->value = value[2]; | |
1460 | |
1461 return NGX_CONF_OK; | |
1462 } |