Mercurial > hg > nginx
changeset 5398:04e43d03e153
Mail: smtp pipelining support.
Basically, this does the following two changes (and corresponding
modifications of related code):
1. Does not reset session buffer unless it's reached it's end, and always
wait for LF to terminate command (even if we detected invalid command).
2. Record command name to make it available for handlers (since now we
can't assume that command starts from s->buffer->start).
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 30 Sep 2013 22:09:57 +0400 |
| parents | ae73d7a4fcde |
| children | d3e09aa03a7a |
| files | src/mail/ngx_mail.h src/mail/ngx_mail_handler.c src/mail/ngx_mail_parse.c src/mail/ngx_mail_proxy_module.c src/mail/ngx_mail_smtp_handler.c |
| diffstat | 5 files changed, 71 insertions(+), 63 deletions(-) [+] |
line wrap: on
line diff
--- a/src/mail/ngx_mail.h Mon Sep 30 22:09:54 2013 +0400 +++ b/src/mail/ngx_mail.h Mon Sep 30 22:09:57 2013 +0400 @@ -234,6 +234,8 @@ ngx_str_t smtp_from; ngx_str_t smtp_to; + ngx_str_t cmd; + ngx_uint_t command; ngx_array_t args;
--- a/src/mail/ngx_mail_handler.c Mon Sep 30 22:09:54 2013 +0400 +++ b/src/mail/ngx_mail_handler.c Mon Sep 30 22:09:57 2013 +0400 @@ -620,7 +620,9 @@ return NGX_ERROR; } - return NGX_AGAIN; + if (s->buffer->pos == s->buffer->last) { + return NGX_AGAIN; + } } cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module); @@ -661,8 +663,12 @@ ngx_mail_auth(ngx_mail_session_t *s, ngx_connection_t *c) { s->args.nelts = 0; - s->buffer->pos = s->buffer->start; - s->buffer->last = s->buffer->start; + + if (s->buffer->pos == s->buffer->last) { + s->buffer->pos = s->buffer->start; + s->buffer->last = s->buffer->start; + } + s->state = 0; if (c->read->timer_set) {
--- a/src/mail/ngx_mail_parse.c Mon Sep 30 22:09:54 2013 +0400 +++ b/src/mail/ngx_mail_parse.c Mon Sep 30 22:09:57 2013 +0400 @@ -626,6 +626,8 @@ ngx_str_t *arg; enum { sw_start = 0, + sw_command, + sw_invalid, sw_spaces_before_argument, sw_argument, sw_almost_done @@ -640,8 +642,14 @@ /* SMTP command */ case sw_start: + s->cmd_start = p; + state = sw_command; + + /* fall through */ + + case sw_command: if (ch == ' ' || ch == CR || ch == LF) { - c = s->buffer->start; + c = s->cmd_start; if (p - c == 4) { @@ -719,6 +727,9 @@ goto invalid; } + s->cmd.data = s->cmd_start; + s->cmd.len = p - s->cmd_start; + switch (ch) { case ' ': state = sw_spaces_before_argument; @@ -738,6 +749,9 @@ break; + case sw_invalid: + goto invalid; + case sw_spaces_before_argument: switch (ch) { case ' ': @@ -824,9 +838,21 @@ invalid: - s->state = sw_start; + s->state = sw_invalid; s->arg_start = NULL; + /* skip invalid command till LF */ + + for (p = s->buffer->pos; p < s->buffer->last; p++) { + if (*p == LF) { + s->state = sw_start; + p++; + break; + } + } + + s->buffer->pos = p; + return NGX_MAIL_PARSE_INVALID_COMMAND; }
--- a/src/mail/ngx_mail_proxy_module.c Mon Sep 30 22:09:54 2013 +0400 +++ b/src/mail/ngx_mail_proxy_module.c Mon Sep 30 22:09:57 2013 +0400 @@ -657,7 +657,12 @@ c->log->action = NULL; ngx_log_error(NGX_LOG_INFO, c->log, 0, "client logged in"); - ngx_mail_proxy_handler(s->connection->write); + if (s->buffer->pos == s->buffer->last) { + ngx_mail_proxy_handler(s->connection->write); + + } else { + ngx_mail_proxy_handler(c->write); + } return;
--- a/src/mail/ngx_mail_smtp_handler.c Mon Sep 30 22:09:54 2013 +0400 +++ b/src/mail/ngx_mail_smtp_handler.c Mon Sep 30 22:09:57 2013 +0400 @@ -486,6 +486,10 @@ } } + if (s->buffer->pos < s->buffer->last) { + s->blocked = 1; + } + switch (rc) { case NGX_DONE: @@ -505,11 +509,14 @@ case NGX_OK: s->args.nelts = 0; - s->buffer->pos = s->buffer->start; - s->buffer->last = s->buffer->start; + + if (s->buffer->pos == s->buffer->last) { + s->buffer->pos = s->buffer->start; + s->buffer->last = s->buffer->start; + } if (s->state) { - s->arg_start = s->buffer->start; + s->arg_start = s->buffer->pos; } ngx_mail_send(c->write); @@ -652,9 +659,7 @@ static ngx_int_t ngx_mail_smtp_mail(ngx_mail_session_t *s, ngx_connection_t *c) { - u_char ch; - ngx_str_t l; - ngx_uint_t i; + ngx_str_t *arg, cmd; ngx_mail_smtp_srv_conf_t *sscf; sscf = ngx_mail_get_module_srv_conf(s, ngx_mail_smtp_module); @@ -672,37 +677,20 @@ return NGX_OK; } - l.len = s->buffer->last - s->buffer->start; - l.data = s->buffer->start; - - for (i = 0; i < l.len; i++) { - ch = l.data[i]; - - if (ch != CR && ch != LF) { - continue; - } - - l.data[i] = ' '; - } + arg = s->args.elts; + arg += s->args.nelts - 1; - while (i) { - if (l.data[i - 1] != ' ') { - break; - } + cmd.len = arg->data + arg->len - s->cmd.data; + cmd.data = s->cmd.data; - i--; - } + s->smtp_from.len = cmd.len; - l.len = i; - - s->smtp_from.len = l.len; - - s->smtp_from.data = ngx_pnalloc(c->pool, l.len); + s->smtp_from.data = ngx_pnalloc(c->pool, cmd.len); if (s->smtp_from.data == NULL) { return NGX_ERROR; } - ngx_memcpy(s->smtp_from.data, l.data, l.len); + ngx_memcpy(s->smtp_from.data, cmd.data, cmd.len); ngx_log_debug1(NGX_LOG_DEBUG_MAIL, c->log, 0, "smtp mail from:\"%V\"", &s->smtp_from); @@ -716,46 +704,27 @@ static ngx_int_t ngx_mail_smtp_rcpt(ngx_mail_session_t *s, ngx_connection_t *c) { - u_char ch; - ngx_str_t l; - ngx_uint_t i; + ngx_str_t *arg, cmd; if (s->smtp_from.len == 0) { ngx_str_set(&s->out, smtp_bad_sequence); return NGX_OK; } - l.len = s->buffer->last - s->buffer->start; - l.data = s->buffer->start; - - for (i = 0; i < l.len; i++) { - ch = l.data[i]; - - if (ch != CR && ch != LF) { - continue; - } - - l.data[i] = ' '; - } + arg = s->args.elts; + arg += s->args.nelts - 1; - while (i) { - if (l.data[i - 1] != ' ') { - break; - } + cmd.len = arg->data + arg->len - s->cmd.data; + cmd.data = s->cmd.data; - i--; - } + s->smtp_to.len = cmd.len; - l.len = i; - - s->smtp_to.len = l.len; - - s->smtp_to.data = ngx_pnalloc(c->pool, l.len); + s->smtp_to.data = ngx_pnalloc(c->pool, cmd.len); if (s->smtp_to.data == NULL) { return NGX_ERROR; } - ngx_memcpy(s->smtp_to.data, l.data, l.len); + ngx_memcpy(s->smtp_to.data, cmd.data, cmd.len); ngx_log_debug1(NGX_LOG_DEBUG_MAIL, c->log, 0, "smtp rcpt to:\"%V\"", &s->smtp_to);