nginx: src/mail/ngx_mail_smtp

annotate src/mail/ngx_mail_smtp_handler.c @ 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	42f874c0b970
children	07dd5bd222ac

rev	line source
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 423 diff changeset	1
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 423 diff changeset	2 /*
444 42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright Igor Sysoev <igor@sysoev.ru> parents: 441 diff changeset	3 * Copyright (C) Igor Sysoev
4412 d620f497c50f Copyright updated. Maxim Konovalov <maxim@nginx.com> parents: 3516 diff changeset	4 * Copyright (C) Nginx, Inc.
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 423 diff changeset	5 */
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 423 diff changeset	6
413 de9d4726e28a nginx-0.0.10-2004-08-31-23:05:39 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	7
de9d4726e28a nginx-0.0.10-2004-08-31-23:05:39 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	8 #include <ngx_config.h>
de9d4726e28a nginx-0.0.10-2004-08-31-23:05:39 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	9 #include <ngx_core.h>
de9d4726e28a nginx-0.0.10-2004-08-31-23:05:39 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	10 #include <ngx_event.h>
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	11 #include <ngx_mail.h>
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	12 #include <ngx_mail_smtp_module.h>
417 0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	13
0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	14
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	15 static void ngx_mail_smtp_resolve_addr_handler(ngx_resolver_ctx_t *ctx);
2488 ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	16 static void ngx_mail_smtp_resolve_name(ngx_event_t *rev);
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	17 static void ngx_mail_smtp_resolve_name_handler(ngx_resolver_ctx_t *ctx);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	18 static void ngx_mail_smtp_greeting(ngx_mail_session_t s, ngx_connection_t c);
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	19 static void ngx_mail_smtp_invalid_pipelining(ngx_event_t *rev);
1483 46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	20 static ngx_int_t ngx_mail_smtp_create_buffer(ngx_mail_session_t *s,
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	21 ngx_connection_t *c);
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	22
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	23 static ngx_int_t ngx_mail_smtp_helo(ngx_mail_session_t s, ngx_connection_t c);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	24 static ngx_int_t ngx_mail_smtp_auth(ngx_mail_session_t s, ngx_connection_t c);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	25 static ngx_int_t ngx_mail_smtp_mail(ngx_mail_session_t s, ngx_connection_t c);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	26 static ngx_int_t ngx_mail_smtp_starttls(ngx_mail_session_t *s,
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	27 ngx_connection_t *c);
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	28 static ngx_int_t ngx_mail_smtp_rset(ngx_mail_session_t s, ngx_connection_t c);
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	29 static ngx_int_t ngx_mail_smtp_rcpt(ngx_mail_session_t s, ngx_connection_t c);
413 de9d4726e28a nginx-0.0.10-2004-08-31-23:05:39 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	30
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	31 static ngx_int_t ngx_mail_smtp_discard_command(ngx_mail_session_t *s,
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	32 ngx_connection_t c, char err);
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	33 static void ngx_mail_smtp_log_rejected_command(ngx_mail_session_t *s,
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	34 ngx_connection_t c, char err);
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	35
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	36
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	37 static u_char smtp_ok[] = "250 2.0.0 OK" CRLF;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	38 static u_char smtp_bye[] = "221 2.0.0 Bye" CRLF;
1762 7806f453183e fix STARTTLS prompt in SMTP Igor Sysoev <igor@sysoev.ru> parents: 1704 diff changeset	39 static u_char smtp_starttls[] = "220 2.0.0 Start TLS" CRLF;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	40 static u_char smtp_next[] = "334 " CRLF;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	41 static u_char smtp_username[] = "334 VXNlcm5hbWU6" CRLF;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	42 static u_char smtp_password[] = "334 UGFzc3dvcmQ6" CRLF;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	43 static u_char smtp_invalid_command[] = "500 5.5.1 Invalid command" CRLF;
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	44 static u_char smtp_invalid_pipelining[] =
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	45 "503 5.5.0 Improper use of SMTP command pipelining" CRLF;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	46 static u_char smtp_invalid_argument[] = "501 5.5.4 Invalid argument" CRLF;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	47 static u_char smtp_auth_required[] = "530 5.7.1 Authentication required" CRLF;
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	48 static u_char smtp_bad_sequence[] = "503 5.5.1 Bad sequence of commands" CRLF;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	49
521 6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	50
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	51 static ngx_str_t smtp_unavailable = ngx_string("[UNAVAILABLE]");
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	52 static ngx_str_t smtp_tempunavail = ngx_string("[TEMPUNAVAIL]");
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	53
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	54
521 6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	55 void
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	56 ngx_mail_smtp_init_session(ngx_mail_session_t s, ngx_connection_t c)
413 de9d4726e28a nginx-0.0.10-2004-08-31-23:05:39 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	57 {
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	58 struct sockaddr_in *sin;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	59 ngx_resolver_ctx_t *ctx;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	60 ngx_mail_core_srv_conf_t *cscf;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	61
1896 4c060e30476b do not resolve SMTP clients by default Igor Sysoev <igor@sysoev.ru> parents: 1892 diff changeset	62 cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module);
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	63
1896 4c060e30476b do not resolve SMTP clients by default Igor Sysoev <igor@sysoev.ru> parents: 1892 diff changeset	64 if (cscf->resolver == NULL) {
4c060e30476b do not resolve SMTP clients by default Igor Sysoev <igor@sysoev.ru> parents: 1892 diff changeset	65 s->host = smtp_unavailable;
4c060e30476b do not resolve SMTP clients by default Igor Sysoev <igor@sysoev.ru> parents: 1892 diff changeset	66 ngx_mail_smtp_greeting(s, c);
4c060e30476b do not resolve SMTP clients by default Igor Sysoev <igor@sysoev.ru> parents: 1892 diff changeset	67 return;
4c060e30476b do not resolve SMTP clients by default Igor Sysoev <igor@sysoev.ru> parents: 1892 diff changeset	68 }
4c060e30476b do not resolve SMTP clients by default Igor Sysoev <igor@sysoev.ru> parents: 1892 diff changeset	69
2855 a96a8c916b0c mail proxy listen IPv6 support Igor Sysoev <igor@sysoev.ru> parents: 2495 diff changeset	70 if (c->sockaddr->sa_family != AF_INET) {
a96a8c916b0c mail proxy listen IPv6 support Igor Sysoev <igor@sysoev.ru> parents: 2495 diff changeset	71 s->host = smtp_tempunavail;
a96a8c916b0c mail proxy listen IPv6 support Igor Sysoev <igor@sysoev.ru> parents: 2495 diff changeset	72 ngx_mail_smtp_greeting(s, c);
a96a8c916b0c mail proxy listen IPv6 support Igor Sysoev <igor@sysoev.ru> parents: 2495 diff changeset	73 return;
a96a8c916b0c mail proxy listen IPv6 support Igor Sysoev <igor@sysoev.ru> parents: 2495 diff changeset	74 }
a96a8c916b0c mail proxy listen IPv6 support Igor Sysoev <igor@sysoev.ru> parents: 2495 diff changeset	75
1896 4c060e30476b do not resolve SMTP clients by default Igor Sysoev <igor@sysoev.ru> parents: 1892 diff changeset	76 c->log->action = "in resolving client address";
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	77
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	78 ctx = ngx_resolve_start(cscf->resolver, NULL);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	79 if (ctx == NULL) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	80 ngx_mail_close_connection(c);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	81 return;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	82 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	83
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	84 /* AF_INET only */
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	85
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	86 sin = (struct sockaddr_in *) c->sockaddr;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	87
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	88 ctx->addr = sin->sin_addr.s_addr;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	89 ctx->handler = ngx_mail_smtp_resolve_addr_handler;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	90 ctx->data = s;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	91 ctx->timeout = cscf->resolver_timeout;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	92
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	93 if (ngx_resolve_addr(ctx) != NGX_OK) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	94 ngx_mail_close_connection(c);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	95 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	96 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	97
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	98
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	99 static void
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	100 ngx_mail_smtp_resolve_addr_handler(ngx_resolver_ctx_t *ctx)
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	101 {
2488 ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	102 ngx_connection_t *c;
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	103 ngx_mail_session_t *s;
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	104
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	105 s = ctx->data;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	106 c = s->connection;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	107
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	108 if (ctx->state) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	109 ngx_log_error(NGX_LOG_ERR, c->log, 0,
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	110 "%V could not be resolved (%i: %s)",
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	111 &c->addr_text, ctx->state,
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	112 ngx_resolver_strerror(ctx->state));
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	113
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	114 if (ctx->state == NGX_RESOLVE_NXDOMAIN) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	115 s->host = smtp_unavailable;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	116
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	117 } else {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	118 s->host = smtp_tempunavail;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	119 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	120
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	121 ngx_resolve_addr_done(ctx);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	122
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	123 ngx_mail_smtp_greeting(s, s->connection);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	124
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	125 return;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	126 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	127
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	128 c->log->action = "in resolving client hostname";
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	129
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	130 s->host.data = ngx_pstrdup(c->pool, &ctx->name);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	131 if (s->host.data == NULL) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	132 ngx_resolve_addr_done(ctx);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	133 ngx_mail_close_connection(c);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	134 return;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	135 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	136
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	137 s->host.len = ctx->name.len;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	138
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	139 ngx_resolve_addr_done(ctx);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	140
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	141 ngx_log_debug1(NGX_LOG_DEBUG_MAIL, c->log, 0,
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	142 "address resolved: %V", &s->host);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	143
2488 ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	144 c->read->handler = ngx_mail_smtp_resolve_name;
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	145
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	146 ngx_post_event(c->read, &ngx_posted_events);
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	147 }
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	148
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	149
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	150 static void
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	151 ngx_mail_smtp_resolve_name(ngx_event_t *rev)
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	152 {
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	153 ngx_connection_t *c;
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	154 ngx_mail_session_t *s;
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	155 ngx_resolver_ctx_t *ctx;
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	156 ngx_mail_core_srv_conf_t *cscf;
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	157
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	158 c = rev->data;
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	159 s = c->data;
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	160
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	161 cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	162
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	163 ctx = ngx_resolve_start(cscf->resolver, NULL);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	164 if (ctx == NULL) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	165 ngx_mail_close_connection(c);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	166 return;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	167 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	168
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	169 ctx->name = s->host;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	170 ctx->type = NGX_RESOLVE_A;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	171 ctx->handler = ngx_mail_smtp_resolve_name_handler;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	172 ctx->data = s;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	173 ctx->timeout = cscf->resolver_timeout;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	174
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	175 if (ngx_resolve_name(ctx) != NGX_OK) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	176 ngx_mail_close_connection(c);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	177 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	178 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	179
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	180
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	181 static void
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	182 ngx_mail_smtp_resolve_name_handler(ngx_resolver_ctx_t *ctx)
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	183 {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	184 in_addr_t addr;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	185 ngx_uint_t i;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	186 ngx_connection_t *c;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	187 struct sockaddr_in *sin;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	188 ngx_mail_session_t *s;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	189
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	190 s = ctx->data;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	191 c = s->connection;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	192
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	193 if (ctx->state) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	194 ngx_log_error(NGX_LOG_ERR, c->log, 0,
3299 0b6277a58a2d ) fix resolving an empty name ("."), Igor Sysoev <igor@sysoev.ru>* parents: 3298 diff changeset	195 "\"%V\" could not be resolved (%i: %s)",
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	196 &ctx->name, ctx->state,
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	197 ngx_resolver_strerror(ctx->state));
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	198
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	199 if (ctx->state == NGX_RESOLVE_NXDOMAIN) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	200 s->host = smtp_unavailable;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	201
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	202 } else {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	203 s->host = smtp_tempunavail;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	204 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	205
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	206 } else {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	207
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	208 /* AF_INET only */
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	209
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	210 sin = (struct sockaddr_in *) c->sockaddr;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	211
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	212 for (i = 0; i < ctx->naddrs; i++) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	213
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	214 addr = ctx->addrs[i];
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	215
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	216 ngx_log_debug4(NGX_LOG_DEBUG_MAIL, c->log, 0,
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	217 "name was resolved to %ud.%ud.%ud.%ud",
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	218 (ntohl(addr) >> 24) & 0xff,
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	219 (ntohl(addr) >> 16) & 0xff,
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	220 (ntohl(addr) >> 8) & 0xff,
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	221 ntohl(addr) & 0xff);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	222
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	223 if (addr == sin->sin_addr.s_addr) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	224 goto found;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	225 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	226 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	227
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	228 s->host = smtp_unavailable;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	229 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	230
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	231 found:
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	232
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	233 ngx_resolve_name_done(ctx);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	234
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	235 ngx_mail_smtp_greeting(s, c);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	236 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	237
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	238
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	239 static void
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	240 ngx_mail_smtp_greeting(ngx_mail_session_t s, ngx_connection_t c)
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	241 {
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	242 ngx_msec_t timeout;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	243 ngx_mail_core_srv_conf_t *cscf;
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	244 ngx_mail_smtp_srv_conf_t *sscf;
641 5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	245
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	246 ngx_log_debug1(NGX_LOG_DEBUG_MAIL, c->log, 0,
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	247 "smtp greeting for \"%V\"", &s->host);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	248
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	249 cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module);
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	250 sscf = ngx_mail_get_module_srv_conf(s, ngx_mail_smtp_module);
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	251
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	252 timeout = sscf->greeting_delay ? sscf->greeting_delay : cscf->timeout;
1486 0e7074ef7303 style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 1485 diff changeset	253 ngx_add_timer(c->read, timeout);
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	254
2388 722b5aff05ae use "!= NGX_OK" instead of "== NGX_ERROR" Igor Sysoev <igor@sysoev.ru> parents: 2309 diff changeset	255 if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	256 ngx_mail_close_connection(c);
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	257 }
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	258
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	259 if (sscf->greeting_delay) {
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	260 c->read->handler = ngx_mail_smtp_invalid_pipelining;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	261 return;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	262 }
1480 a231e37a19ab move event handling to protocol specific code, Igor Sysoev <igor@sysoev.ru> parents: 1479 diff changeset	263
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	264 c->read->handler = ngx_mail_smtp_init_protocol;
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	265
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	266 s->out = sscf->greeting;
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	267
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	268 ngx_mail_send(c->write);
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	269 }
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	270
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	271
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	272 static void
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	273 ngx_mail_smtp_invalid_pipelining(ngx_event_t *rev)
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	274 {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	275 ngx_connection_t *c;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	276 ngx_mail_session_t *s;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	277 ngx_mail_core_srv_conf_t *cscf;
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	278 ngx_mail_smtp_srv_conf_t *sscf;
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	279
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	280 c = rev->data;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	281 s = c->data;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	282
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	283 c->log->action = "in delay pipelining state";
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	284
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	285 if (rev->timedout) {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	286
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	287 ngx_log_debug0(NGX_LOG_DEBUG_MAIL, c->log, 0, "delay greeting");
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	288
1484 c788d2b877be fix r1482 Igor Sysoev <igor@sysoev.ru> parents: 1483 diff changeset	289 rev->timedout = 0;
c788d2b877be fix r1482 Igor Sysoev <igor@sysoev.ru> parents: 1483 diff changeset	290
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	291 cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module);
1480 a231e37a19ab move event handling to protocol specific code, Igor Sysoev <igor@sysoev.ru> parents: 1479 diff changeset	292
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	293 c->read->handler = ngx_mail_smtp_init_protocol;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	294
1486 0e7074ef7303 style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 1485 diff changeset	295 ngx_add_timer(c->read, cscf->timeout);
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	296
2388 722b5aff05ae use "!= NGX_OK" instead of "== NGX_ERROR" Igor Sysoev <igor@sysoev.ru> parents: 2309 diff changeset	297 if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	298 ngx_mail_close_connection(c);
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	299 return;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	300 }
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	301
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	302 sscf = ngx_mail_get_module_srv_conf(s, ngx_mail_smtp_module);
f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	303
f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	304 s->out = sscf->greeting;
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	305
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	306 } else {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	307
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	308 ngx_log_debug0(NGX_LOG_DEBUG_MAIL, c->log, 0, "invalid pipelining");
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	309
1483 46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	310 if (s->buffer == NULL) {
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	311 if (ngx_mail_smtp_create_buffer(s, c) != NGX_OK) {
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	312 return;
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	313 }
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	314 }
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	315
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	316 if (ngx_mail_smtp_discard_command(s, c,
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	317 "client was rejected before greeting: \"%V\"")
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	318 != NGX_OK)
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	319 {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	320 return;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	321 }
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	322
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	323 ngx_str_set(&s->out, smtp_invalid_pipelining);
5396 42f874c0b970 Mail: added session close on smtp_greeting_delay violation. Maxim Dounin <mdounin@mdounin.ru> parents: 4412 diff changeset	324 s->quit = 1;
1480 a231e37a19ab move event handling to protocol specific code, Igor Sysoev <igor@sysoev.ru> parents: 1479 diff changeset	325 }
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	326
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	327 ngx_mail_send(c->write);
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	328 }
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	329
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	330
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	331 void
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	332 ngx_mail_smtp_init_protocol(ngx_event_t *rev)
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	333 {
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	334 ngx_connection_t *c;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	335 ngx_mail_session_t *s;
417 0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	336
0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	337 c = rev->data;
0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	338
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	339 c->log->action = "in auth state";
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	340
423 fda5987b188d nginx-0.0.10-2004-09-13-20:18:09 import Igor Sysoev <igor@sysoev.ru> parents: 422 diff changeset	341 if (rev->timedout) {
fda5987b188d nginx-0.0.10-2004-09-13-20:18:09 import Igor Sysoev <igor@sysoev.ru> parents: 422 diff changeset	342 ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "client timed out");
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	343 c->timedout = 1;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	344 ngx_mail_close_connection(c);
423 fda5987b188d nginx-0.0.10-2004-09-13-20:18:09 import Igor Sysoev <igor@sysoev.ru> parents: 422 diff changeset	345 return;
fda5987b188d nginx-0.0.10-2004-09-13-20:18:09 import Igor Sysoev <igor@sysoev.ru> parents: 422 diff changeset	346 }
420 33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	347
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	348 s = c->data;
521 6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	349
1483 46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	350 if (s->buffer == NULL) {
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	351 if (ngx_mail_smtp_create_buffer(s, c) != NGX_OK) {
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	352 return;
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	353 }
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	354 }
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	355
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	356 s->mail_state = ngx_smtp_start;
1477 59e1caf2be94 style fix and optimizations Igor Sysoev <igor@sysoev.ru> parents: 1476 diff changeset	357 c->read->handler = ngx_mail_smtp_auth_state;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	358
1477 59e1caf2be94 style fix and optimizations Igor Sysoev <igor@sysoev.ru> parents: 1476 diff changeset	359 ngx_mail_smtp_auth_state(rev);
521 6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	360 }
6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	361
6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	362
1483 46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	363 static ngx_int_t
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	364 ngx_mail_smtp_create_buffer(ngx_mail_session_t s, ngx_connection_t c)
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	365 {
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	366 ngx_mail_smtp_srv_conf_t *sscf;
1483 46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	367
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	368 if (ngx_array_init(&s->args, c->pool, 2, sizeof(ngx_str_t)) == NGX_ERROR) {
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	369 ngx_mail_session_internal_server_error(s);
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	370 return NGX_ERROR;
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	371 }
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	372
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	373 sscf = ngx_mail_get_module_srv_conf(s, ngx_mail_smtp_module);
1483 46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	374
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	375 s->buffer = ngx_create_temp_buf(c->pool, sscf->client_buffer_size);
1483 46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	376 if (s->buffer == NULL) {
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	377 ngx_mail_session_internal_server_error(s);
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	378 return NGX_ERROR;
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	379 }
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	380
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	381 return NGX_OK;
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	382 }
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	383
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	384
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	385 void
1477 59e1caf2be94 style fix and optimizations Igor Sysoev <igor@sysoev.ru> parents: 1476 diff changeset	386 ngx_mail_smtp_auth_state(ngx_event_t *rev)
420 33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	387 {
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	388 ngx_int_t rc;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	389 ngx_connection_t *c;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	390 ngx_mail_session_t *s;
420 33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	391
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	392 c = rev->data;
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	393 s = c->data;
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	394
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	395 ngx_log_debug0(NGX_LOG_DEBUG_MAIL, c->log, 0, "smtp auth state");
421 01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	396
423 fda5987b188d nginx-0.0.10-2004-09-13-20:18:09 import Igor Sysoev <igor@sysoev.ru> parents: 422 diff changeset	397 if (rev->timedout) {
fda5987b188d nginx-0.0.10-2004-09-13-20:18:09 import Igor Sysoev <igor@sysoev.ru> parents: 422 diff changeset	398 ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT, "client timed out");
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	399 c->timedout = 1;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	400 ngx_mail_close_connection(c);
423 fda5987b188d nginx-0.0.10-2004-09-13-20:18:09 import Igor Sysoev <igor@sysoev.ru> parents: 422 diff changeset	401 return;
fda5987b188d nginx-0.0.10-2004-09-13-20:18:09 import Igor Sysoev <igor@sysoev.ru> parents: 422 diff changeset	402 }
420 33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	403
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	404 if (s->out.len) {
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	405 ngx_log_debug0(NGX_LOG_DEBUG_MAIL, c->log, 0, "smtp send handler busy");
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	406 s->blocked = 1;
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	407 return;
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	408 }
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	409
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	410 s->blocked = 0;
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	411
1482 4606dce4f416 optimizations Igor Sysoev <igor@sysoev.ru> parents: 1481 diff changeset	412 rc = ngx_mail_read_command(s, c);
420 33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	413
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	414 if (rc == NGX_AGAIN \|\| rc == NGX_ERROR) {
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	415 return;
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	416 }
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	417
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	418 ngx_str_set(&s->out, smtp_ok);
421 01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	419
01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	420 if (rc == NGX_OK) {
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	421 switch (s->mail_state) {
421 01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	422
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	423 case ngx_smtp_start:
421 01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	424
01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	425 switch (s->command) {
01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	426
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	427 case NGX_SMTP_HELO:
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	428 case NGX_SMTP_EHLO:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	429 rc = ngx_mail_smtp_helo(s, c);
809 da9c1521319d AUTH PLAIN LOGIN CRAM-MD5 Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	430 break;
da9c1521319d AUTH PLAIN LOGIN CRAM-MD5 Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	431
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	432 case NGX_SMTP_AUTH:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	433 rc = ngx_mail_smtp_auth(s, c);
800 887d8dec72dc APOP Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	434 break;
887d8dec72dc APOP Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	435
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	436 case NGX_SMTP_QUIT:
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	437 s->quit = 1;
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	438 ngx_str_set(&s->out, smtp_bye);
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	439 break;
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	440
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	441 case NGX_SMTP_MAIL:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	442 rc = ngx_mail_smtp_mail(s, c);
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	443 break;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	444
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	445 case NGX_SMTP_RCPT:
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	446 rc = ngx_mail_smtp_rcpt(s, c);
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	447 break;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	448
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	449 case NGX_SMTP_RSET:
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	450 rc = ngx_mail_smtp_rset(s, c);
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	451 break;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	452
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	453 case NGX_SMTP_NOOP:
421 01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	454 break;
1322 27f2299e0d80 SMTP STARTTLS Igor Sysoev <igor@sysoev.ru> parents: 1286 diff changeset	455
27f2299e0d80 SMTP STARTTLS Igor Sysoev <igor@sysoev.ru> parents: 1286 diff changeset	456 case NGX_SMTP_STARTTLS:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	457 rc = ngx_mail_smtp_starttls(s, c);
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	458 ngx_str_set(&s->out, smtp_starttls);
1322 27f2299e0d80 SMTP STARTTLS Igor Sysoev <igor@sysoev.ru> parents: 1286 diff changeset	459 break;
27f2299e0d80 SMTP STARTTLS Igor Sysoev <igor@sysoev.ru> parents: 1286 diff changeset	460
27f2299e0d80 SMTP STARTTLS Igor Sysoev <igor@sysoev.ru> parents: 1286 diff changeset	461 default:
27f2299e0d80 SMTP STARTTLS Igor Sysoev <igor@sysoev.ru> parents: 1286 diff changeset	462 rc = NGX_MAIL_PARSE_INVALID_COMMAND;
27f2299e0d80 SMTP STARTTLS Igor Sysoev <igor@sysoev.ru> parents: 1286 diff changeset	463 break;
421 01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	464 }
01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	465
01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	466 break;
01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	467
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	468 case ngx_smtp_auth_login_username:
2495 a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2488 diff changeset	469 rc = ngx_mail_auth_login_username(s, c, 0);
809 da9c1521319d AUTH PLAIN LOGIN CRAM-MD5 Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	470
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	471 ngx_str_set(&s->out, smtp_password);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	472 s->mail_state = ngx_smtp_auth_login_password;
809 da9c1521319d AUTH PLAIN LOGIN CRAM-MD5 Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	473 break;
da9c1521319d AUTH PLAIN LOGIN CRAM-MD5 Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	474
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	475 case ngx_smtp_auth_login_password:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	476 rc = ngx_mail_auth_login_password(s, c);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	477 break;
809 da9c1521319d AUTH PLAIN LOGIN CRAM-MD5 Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	478
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	479 case ngx_smtp_auth_plain:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	480 rc = ngx_mail_auth_plain(s, c, 0);
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	481 break;
809 da9c1521319d AUTH PLAIN LOGIN CRAM-MD5 Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	482
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	483 case ngx_smtp_auth_cram_md5:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	484 rc = ngx_mail_auth_cram_md5(s, c);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	485 break;
421 01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	486 }
01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	487 }
420 33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	488
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	489 if (s->buffer->pos < s->buffer->last) {
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	490 s->blocked = 1;
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	491 }
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	492
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	493 switch (rc) {
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	494
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	495 case NGX_DONE:
1482 4606dce4f416 optimizations Igor Sysoev <igor@sysoev.ru> parents: 1481 diff changeset	496 ngx_mail_auth(s, c);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	497 return;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	498
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	499 case NGX_ERROR:
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	500 ngx_mail_session_internal_server_error(s);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	501 return;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	502
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	503 case NGX_MAIL_PARSE_INVALID_COMMAND:
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	504 s->mail_state = ngx_smtp_start;
1486 0e7074ef7303 style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 1485 diff changeset	505 s->state = 0;
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	506 ngx_str_set(&s->out, smtp_invalid_command);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	507
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	508 /* fall through */
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	509
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	510 case NGX_OK:
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	511 s->args.nelts = 0;
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	512
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	513 if (s->buffer->pos == s->buffer->last) {
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	514 s->buffer->pos = s->buffer->start;
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	515 s->buffer->last = s->buffer->start;
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	516 }
810 e3aa8f305d21 bugfixes Igor Sysoev <igor@sysoev.ru> parents: 809 diff changeset	517
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	518 if (s->state) {
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	519 s->arg_start = s->buffer->pos;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	520 }
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	521
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	522 ngx_mail_send(c->write);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	523 }
417 0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	524 }
0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	525
0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	526
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	527 static ngx_int_t
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	528 ngx_mail_smtp_helo(ngx_mail_session_t s, ngx_connection_t c)
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	529 {
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	530 ngx_str_t *arg;
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	531 ngx_mail_smtp_srv_conf_t *sscf;
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	532
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	533 if (s->args.nelts != 1) {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	534 ngx_str_set(&s->out, smtp_invalid_argument);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	535 s->state = 0;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	536 return NGX_OK;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	537 }
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	538
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	539 arg = s->args.elts;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	540
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	541 s->smtp_helo.len = arg[0].len;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	542
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1896 diff changeset	543 s->smtp_helo.data = ngx_pnalloc(c->pool, arg[0].len);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	544 if (s->smtp_helo.data == NULL) {
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	545 return NGX_ERROR;
4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	546 }
4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	547
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	548 ngx_memcpy(s->smtp_helo.data, arg[0].data, arg[0].len);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	549
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	550 ngx_str_null(&s->smtp_from);
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	551 ngx_str_null(&s->smtp_to);
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	552
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	553 sscf = ngx_mail_get_module_srv_conf(s, ngx_mail_smtp_module);
f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	554
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	555 if (s->command == NGX_SMTP_HELO) {
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	556 s->out = sscf->server_name;
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	557
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	558 } else {
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	559 s->esmtp = 1;
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	560
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	561 #if (NGX_MAIL_SSL)
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	562
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	563 if (c->ssl == NULL) {
1704 e584e946e198 move condition declarations inside blocks where they are used Igor Sysoev <igor@sysoev.ru> parents: 1493 diff changeset	564 ngx_mail_ssl_conf_t *sslcf;
e584e946e198 move condition declarations inside blocks where they are used Igor Sysoev <igor@sysoev.ru> parents: 1493 diff changeset	565
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	566 sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	567
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	568 if (sslcf->starttls == NGX_MAIL_STARTTLS_ON) {
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	569 s->out = sscf->starttls_capability;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	570 return NGX_OK;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	571 }
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	572
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	573 if (sslcf->starttls == NGX_MAIL_STARTTLS_ONLY) {
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	574 s->out = sscf->starttls_only_capability;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	575 return NGX_OK;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	576 }
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	577 }
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	578 #endif
4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	579
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	580 s->out = sscf->capability;
420 33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	581 }
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	582
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	583 return NGX_OK;
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	584 }
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	585
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	586
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	587 static ngx_int_t
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	588 ngx_mail_smtp_auth(ngx_mail_session_t s, ngx_connection_t c)
525 09b42134ac0c nginx-0.1.37-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 521 diff changeset	589 {
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	590 ngx_int_t rc;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	591 ngx_mail_core_srv_conf_t *cscf;
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	592 ngx_mail_smtp_srv_conf_t *sscf;
525 09b42134ac0c nginx-0.1.37-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 521 diff changeset	593
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	594 #if (NGX_MAIL_SSL)
2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	595 if (ngx_mail_starttls_only(s, c)) {
2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	596 return NGX_MAIL_PARSE_INVALID_COMMAND;
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	597 }
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	598 #endif
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	599
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	600 if (s->args.nelts == 0) {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	601 ngx_str_set(&s->out, smtp_invalid_argument);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	602 s->state = 0;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	603 return NGX_OK;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	604 }
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	605
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	606 rc = ngx_mail_auth_parse(s, c);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	607
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	608 switch (rc) {
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	609
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	610 case NGX_MAIL_AUTH_LOGIN:
1472 32450a2bbdf4 decrement active connection counter in mail proxy Igor Sysoev <igor@sysoev.ru> parents: 1323 diff changeset	611
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	612 ngx_str_set(&s->out, smtp_username);
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	613 s->mail_state = ngx_smtp_auth_login_username;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	614
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	615 return NGX_OK;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	616
2495 a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2488 diff changeset	617 case NGX_MAIL_AUTH_LOGIN_USERNAME:
a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2488 diff changeset	618
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	619 ngx_str_set(&s->out, smtp_password);
2495 a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2488 diff changeset	620 s->mail_state = ngx_smtp_auth_login_password;
a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2488 diff changeset	621
a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2488 diff changeset	622 return ngx_mail_auth_login_username(s, c, 1);
a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2488 diff changeset	623
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	624 case NGX_MAIL_AUTH_PLAIN:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	625
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	626 ngx_str_set(&s->out, smtp_next);
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	627 s->mail_state = ngx_smtp_auth_plain;
543 511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	628
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	629 return NGX_OK;
2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	630
2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	631 case NGX_MAIL_AUTH_CRAM_MD5:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	632
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	633 sscf = ngx_mail_get_module_srv_conf(s, ngx_mail_smtp_module);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	634
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	635 if (!(sscf->auth_methods & NGX_MAIL_AUTH_CRAM_MD5_ENABLED)) {
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	636 return NGX_MAIL_PARSE_INVALID_COMMAND;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	637 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	638
1485 b3488fc2675a create salt just before it will be used Igor Sysoev <igor@sysoev.ru> parents: 1484 diff changeset	639 if (s->salt.data == NULL) {
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	640 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: 1486 diff changeset	641
1485 b3488fc2675a create salt just before it will be used Igor Sysoev <igor@sysoev.ru> parents: 1484 diff changeset	642 if (ngx_mail_salt(s, c, cscf) != NGX_OK) {
b3488fc2675a create salt just before it will be used Igor Sysoev <igor@sysoev.ru> parents: 1484 diff changeset	643 return NGX_ERROR;
b3488fc2675a create salt just before it will be used Igor Sysoev <igor@sysoev.ru> parents: 1484 diff changeset	644 }
b3488fc2675a create salt just before it will be used Igor Sysoev <igor@sysoev.ru> parents: 1484 diff changeset	645 }
b3488fc2675a create salt just before it will be used Igor Sysoev <igor@sysoev.ru> parents: 1484 diff changeset	646
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	647 if (ngx_mail_auth_cram_md5_salt(s, c, "334 ", 4) == NGX_OK) {
2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	648 s->mail_state = ngx_smtp_auth_cram_md5;
2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	649 return NGX_OK;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	650 }
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	651
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	652 return NGX_ERROR;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	653 }
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	654
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	655 return rc;
417 0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	656 }
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	657
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	658
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	659 static ngx_int_t
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	660 ngx_mail_smtp_mail(ngx_mail_session_t s, ngx_connection_t c)
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	661 {
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	662 ngx_str_t *arg, cmd;
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	663 ngx_mail_smtp_srv_conf_t *sscf;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	664
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	665 sscf = ngx_mail_get_module_srv_conf(s, ngx_mail_smtp_module);
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	666
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	667 if (!(sscf->auth_methods & NGX_MAIL_AUTH_NONE_ENABLED)) {
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	668 ngx_mail_smtp_log_rejected_command(s, c, "client was rejected: \"%V\"");
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	669 ngx_str_set(&s->out, smtp_auth_required);
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	670 return NGX_OK;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	671 }
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	672
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	673 /* auth none */
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	674
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	675 if (s->smtp_from.len) {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	676 ngx_str_set(&s->out, smtp_bad_sequence);
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	677 return NGX_OK;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	678 }
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	679
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	680 arg = s->args.elts;
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	681 arg += s->args.nelts - 1;
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	682
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	683 cmd.len = arg->data + arg->len - s->cmd.data;
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	684 cmd.data = s->cmd.data;
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	685
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	686 s->smtp_from.len = cmd.len;
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	687
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	688 s->smtp_from.data = ngx_pnalloc(c->pool, cmd.len);
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	689 if (s->smtp_from.data == NULL) {
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	690 return NGX_ERROR;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	691 }
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	692
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	693 ngx_memcpy(s->smtp_from.data, cmd.data, cmd.len);
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	694
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	695 ngx_log_debug1(NGX_LOG_DEBUG_MAIL, c->log, 0,
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	696 "smtp mail from:\"%V\"", &s->smtp_from);
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	697
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	698 ngx_str_set(&s->out, smtp_ok);
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	699
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	700 return NGX_OK;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	701 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	702
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	703
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	704 static ngx_int_t
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	705 ngx_mail_smtp_rcpt(ngx_mail_session_t s, ngx_connection_t c)
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	706 {
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	707 ngx_str_t *arg, cmd;
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	708
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	709 if (s->smtp_from.len == 0) {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	710 ngx_str_set(&s->out, smtp_bad_sequence);
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	711 return NGX_OK;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	712 }
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	713
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	714 arg = s->args.elts;
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	715 arg += s->args.nelts - 1;
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	716
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	717 cmd.len = arg->data + arg->len - s->cmd.data;
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	718 cmd.data = s->cmd.data;
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	719
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	720 s->smtp_to.len = cmd.len;
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	721
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	722 s->smtp_to.data = ngx_pnalloc(c->pool, cmd.len);
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	723 if (s->smtp_to.data == NULL) {
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	724 return NGX_ERROR;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	725 }
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	726
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	727 ngx_memcpy(s->smtp_to.data, cmd.data, cmd.len);
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	728
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	729 ngx_log_debug1(NGX_LOG_DEBUG_MAIL, c->log, 0,
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	730 "smtp rcpt to:\"%V\"", &s->smtp_to);
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	731
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	732 s->auth_method = NGX_MAIL_AUTH_NONE;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	733
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	734 return NGX_DONE;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	735 }
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	736
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	737
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	738 static ngx_int_t
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	739 ngx_mail_smtp_rset(ngx_mail_session_t s, ngx_connection_t c)
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	740 {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	741 ngx_str_null(&s->smtp_from);
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	742 ngx_str_null(&s->smtp_to);
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	743 ngx_str_set(&s->out, smtp_ok);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	744
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	745 return NGX_OK;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	746 }
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	747
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	748
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	749 static ngx_int_t
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	750 ngx_mail_smtp_starttls(ngx_mail_session_t s, ngx_connection_t c)
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	751 {
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	752 #if (NGX_MAIL_SSL)
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	753 ngx_mail_ssl_conf_t *sslcf;
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	754
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	755 if (c->ssl == NULL) {
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	756 sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	757 if (sslcf->starttls) {
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	758
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	759 /*
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	760 * RFC3207 requires us to discard any knowledge
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	761 * obtained from client before STARTTLS.
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	762 */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	763
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	764 ngx_str_null(&s->smtp_helo);
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	765 ngx_str_null(&s->smtp_from);
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	766 ngx_str_null(&s->smtp_to);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	767
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	768 c->read->handler = ngx_mail_starttls_handler;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	769 return NGX_OK;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	770 }
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	771 }
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	772
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	773 #endif
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	774
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	775 return NGX_MAIL_PARSE_INVALID_COMMAND;
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	776 }
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	777
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	778
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	779 static ngx_int_t
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	780 ngx_mail_smtp_discard_command(ngx_mail_session_t s, ngx_connection_t c,
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	781 char *err)
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	782 {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	783 ssize_t n;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	784
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	785 n = c->recv(c, s->buffer->last, s->buffer->end - s->buffer->last);
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	786
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	787 if (n == NGX_ERROR \|\| n == 0) {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	788 ngx_mail_close_connection(c);
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	789 return NGX_ERROR;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	790 }
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	791
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	792 if (n > 0) {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	793 s->buffer->last += n;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	794 }
1486 0e7074ef7303 style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 1485 diff changeset	795
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	796 if (n == NGX_AGAIN) {
2388 722b5aff05ae use "!= NGX_OK" instead of "== NGX_ERROR" Igor Sysoev <igor@sysoev.ru> parents: 2309 diff changeset	797 if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	798 ngx_mail_session_internal_server_error(s);
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	799 return NGX_ERROR;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	800 }
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	801
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	802 return NGX_AGAIN;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	803 }
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	804
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	805 ngx_mail_smtp_log_rejected_command(s, c, err);
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	806
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	807 s->buffer->pos = s->buffer->start;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	808 s->buffer->last = s->buffer->start;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	809
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	810 return NGX_OK;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	811 }
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	812
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	813
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	814 static void
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	815 ngx_mail_smtp_log_rejected_command(ngx_mail_session_t s, ngx_connection_t c,
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	816 char *err)
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	817 {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	818 u_char ch;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	819 ngx_str_t cmd;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	820 ngx_uint_t i;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	821
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	822 if (c->log->log_level < NGX_LOG_INFO) {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	823 return;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	824 }
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	825
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	826 cmd.len = s->buffer->last - s->buffer->start;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	827 cmd.data = s->buffer->start;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	828
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	829 for (i = 0; i < cmd.len; i++) {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	830 ch = cmd.data[i];
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	831
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	832 if (ch != CR && ch != LF) {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	833 continue;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	834 }
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	835
1493 3c4111e07b58 use "_" instead of " " as new line substitute, do not delete trailing new line Igor Sysoev <igor@sysoev.ru> parents: 1487 diff changeset	836 cmd.data[i] = '_';
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	837 }
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	838
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	839 cmd.len = i;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	840
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	841 ngx_log_error(NGX_LOG_INFO, c->log, 0, err, &cmd);
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	842 }

Mercurial > hg > nginx

annotate src/mail/ngx_mail_smtp_handler.c @ 5398:04e43d03e153