Mercurial > hg > nginx-vendor-current
diff src/imap/ngx_imap_auth_http_module.c @ 260:0effe91f6083 NGINX_0_5_0
nginx 0.5.0
*) Change: the parameters in the "%name" form in the "log_format"
directive are not supported anymore.
*) Change: the "proxy_upstream_max_fails",
"proxy_upstream_fail_timeout", "fastcgi_upstream_max_fails",
"fastcgi_upstream_fail_timeout", "memcached_upstream_max_fails", and
"memcached_upstream_fail_timeout" directives are not supported
anymore.
*) Feature: the "server" directive in the "upstream" context supports
the "max_fails", "fail_timeout", and "down" parameters.
*) Feature: the "ip_hash" directive inside the "upstream" block.
*) Feature: the WAIT status in the "Auth-Status" header line of the
IMAP/POP3 proxy authentication server response.
*) Bugfix: nginx could not be built on 64-bit platforms; bug appeared
in 0.4.14.
| author | Igor Sysoev <http://sysoev.ru> |
|---|---|
| date | Mon, 04 Dec 2006 00:00:00 +0300 |
| parents | 6ae1357b7b7c |
| children | 251bcd11a5b8 |
line wrap: on
line diff
--- a/src/imap/ngx_imap_auth_http_module.c +++ b/src/imap/ngx_imap_auth_http_module.c @@ -12,7 +12,7 @@ typedef struct { - ngx_peers_t *peers; + ngx_peer_addr_t *peer; ngx_msec_t timeout; @@ -175,7 +175,10 @@ ngx_imap_auth_http_init(ngx_imap_session ngx_imap_set_ctx(s, ctx, ngx_imap_auth_http_module); - ctx->peer.peers = ahcf->peers; + ctx->peer.sockaddr = ahcf->peer->sockaddr; + ctx->peer.socklen = ahcf->peer->socklen; + ctx->peer.name = &ahcf->peer->name; + ctx->peer.get = ngx_event_get_peer; ctx->peer.log = s->connection->log; ctx->peer.log_error = NGX_ERROR_ERR; @@ -229,8 +232,7 @@ ngx_imap_auth_http_write_handler(ngx_eve if (wev->timedout) { ngx_log_error(NGX_LOG_ERR, wev->log, NGX_ETIMEDOUT, - "auth http server %V timed out", - &ctx->peer.peers->peer[0].name); + "auth http server %V timed out", ctx->peer.name); ngx_close_connection(ctx->peer.connection); ngx_destroy_pool(ctx->pool); ngx_imap_session_internal_server_error(s); @@ -293,8 +295,7 @@ ngx_imap_auth_http_read_handler(ngx_even if (rev->timedout) { ngx_log_error(NGX_LOG_ERR, rev->log, NGX_ETIMEDOUT, - "auth http server %V timed out", - &ctx->peer.peers->peer[0].name); + "auth http server %V timed out", ctx->peer.name); ngx_close_connection(ctx->peer.connection); ngx_destroy_pool(ctx->pool); ngx_imap_session_internal_server_error(s); @@ -413,7 +414,7 @@ ngx_imap_auth_http_ignore_status_line(ng ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, "auth http server &V sent invalid response", - &ctx->peer.peers->peer[0].name); + ctx->peer.name); ngx_close_connection(ctx->peer.connection); ngx_destroy_pool(ctx->pool); ngx_imap_session_internal_server_error(s); @@ -447,7 +448,7 @@ ngx_imap_auth_http_process_headers(ngx_i time_t timer; size_t len, size; ngx_int_t rc, port, n; - ngx_peers_t *peers; + ngx_peer_addr_t *peer; struct sockaddr_in *sin; ngx_log_debug0(NGX_LOG_DEBUG_IMAP, s->connection->log, 0, @@ -488,6 +489,16 @@ ngx_imap_auth_http_process_headers(ngx_i continue; } + if (len == 4 + && ctx->header_start[0] == 'W' + && ctx->header_start[1] == 'A' + && ctx->header_start[2] == 'I' + && ctx->header_start[3] == 'T') + { + s->auth_wait = 1; + continue; + } + ctx->errmsg.len = len; ctx->errmsg.data = ctx->header_start; @@ -632,10 +643,27 @@ ngx_imap_auth_http_process_headers(ngx_i return; } + if (s->auth_wait) { + timer = ctx->sleep; + + ngx_destroy_pool(ctx->pool); + + if (timer == 0) { + ngx_imap_auth_http_init(s); + return; + } + + ngx_add_timer(s->connection->read, timer * 1000); + + s->connection->read->handler = ngx_imap_auth_sleep_handler; + + return; + } + if (ctx->addr.len == 0 || ctx->port.len == 0) { ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, "auth http server %V did not send server or port", - &ctx->peer.peers->peer[0].name); + ctx->peer.name); ngx_destroy_pool(ctx->pool); ngx_imap_session_internal_server_error(s); return; @@ -644,14 +672,14 @@ ngx_imap_auth_http_process_headers(ngx_i if (s->passwd.data == NULL) { ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, "auth http server %V did not send password", - &ctx->peer.peers->peer[0].name); + ctx->peer.name); ngx_destroy_pool(ctx->pool); ngx_imap_session_internal_server_error(s); return; } - peers = ngx_pcalloc(s->connection->pool, sizeof(ngx_peers_t)); - if (peers == NULL) { + peer = ngx_pcalloc(s->connection->pool, sizeof(ngx_peer_addr_t)); + if (peer == NULL) { ngx_destroy_pool(ctx->pool); ngx_imap_session_internal_server_error(s); return; @@ -671,7 +699,7 @@ ngx_imap_auth_http_process_headers(ngx_i ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, "auth http server %V sent invalid server " "port:\"%V\"", - &ctx->peer.peers->peer[0].name, &ctx->port); + ctx->peer.name, &ctx->port); ngx_destroy_pool(ctx->pool); ngx_imap_session_internal_server_error(s); return; @@ -685,23 +713,21 @@ ngx_imap_auth_http_process_headers(ngx_i ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, "auth http server %V sent invalid server " "address:\"%V\"", - &ctx->peer.peers->peer[0].name, &ctx->addr); + ctx->peer.name, &ctx->addr); ngx_destroy_pool(ctx->pool); ngx_imap_session_internal_server_error(s); return; } - peers->number = 1; - - peers->peer[0].sockaddr = (struct sockaddr *) sin; - peers->peer[0].socklen = sizeof(struct sockaddr_in); + peer->sockaddr = (struct sockaddr *) sin; + peer->socklen = sizeof(struct sockaddr_in); len = ctx->addr.len + 1 + ctx->port.len; - peers->peer[0].name.len = len; + peer->name.len = len; - peers->peer[0].name.data = ngx_palloc(s->connection->pool, len); - if (peers->peer[0].name.data == NULL) { + peer->name.data = ngx_palloc(s->connection->pool, len); + if (peer->name.data == NULL) { ngx_destroy_pool(ctx->pool); ngx_imap_session_internal_server_error(s); return; @@ -709,17 +735,14 @@ ngx_imap_auth_http_process_headers(ngx_i len = ctx->addr.len; - ngx_memcpy(peers->peer[0].name.data, ctx->addr.data, len); - - peers->peer[0].name.data[len++] = ':'; + ngx_memcpy(peer->name.data, ctx->addr.data, len); - ngx_memcpy(peers->peer[0].name.data + len, - ctx->port.data, ctx->port.len); + peer->name.data[len++] = ':'; - peers->peer[0].uri_separator = ""; + ngx_memcpy(peer->name.data + len, ctx->port.data, ctx->port.len); ngx_destroy_pool(ctx->pool); - ngx_imap_proxy_init(s, peers); + ngx_imap_proxy_init(s, peer); return; } @@ -732,7 +755,7 @@ ngx_imap_auth_http_process_headers(ngx_i ngx_log_error(NGX_LOG_ERR, s->connection->log, 0, "auth http server %V sent invalid header in response", - &ctx->peer.peers->peer[0].name); + ctx->peer.name); ngx_close_connection(ctx->peer.connection); ngx_destroy_pool(ctx->pool); ngx_imap_session_internal_server_error(s); @@ -758,6 +781,12 @@ ngx_imap_auth_sleep_handler(ngx_event_t rev->timedout = 0; + if (s->auth_wait) { + s->auth_wait = 0; + ngx_imap_auth_http_init(s); + return; + } + if (s->protocol == NGX_IMAP_POP3_PROTOCOL) { s->imap_state = ngx_pop3_start; s->connection->read->handler = ngx_pop3_auth_state; @@ -1209,8 +1238,8 @@ ngx_imap_auth_http_merge_conf(ngx_conf_t ngx_uint_t i; ngx_table_elt_t *header; - if (conf->peers == NULL) { - conf->peers = prev->peers; + if (conf->peer == NULL) { + conf->peer = prev->peer; conf->host_header = prev->host_header; conf->uri = prev->uri; } @@ -1264,6 +1293,7 @@ ngx_imap_auth_http(ngx_conf_t *cf, ngx_c u.url = value[1]; u.default_portn = 80; u.uri_part = 1; + u.one_addr = 1; if (ngx_parse_url(cf, &u) != NGX_OK) { if (u.err) { @@ -1272,8 +1302,7 @@ ngx_imap_auth_http(ngx_conf_t *cf, ngx_c } } - ahcf->peers = u.peers; - ahcf->peers->number = 1; + ahcf->peer = u.addrs; ahcf->host_header = u.host_header; ahcf->uri = u.uri;