nginx: src/mail/ngx_mail_smtp

annotate src/mail/ngx_mail_smtp_handler.c @ 6474:2cd019520210

Style.

author	Ruslan Ermilov <ru@nginx.com>
date	Wed, 30 Mar 2016 11:52:16 +0300
parents	3f5d0af4e40a
children	bcb107bb89cd

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[] =
6474 2cd019520210 Style. Ruslan Ermilov <ru@nginx.com> parents: 5787 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 ngx_resolver_ctx_t *ctx;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	59 ngx_mail_core_srv_conf_t *cscf;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	60
1896 4c060e30476b do not resolve SMTP clients by default Igor Sysoev <igor@sysoev.ru> parents: 1892 diff changeset	61 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	62
1896 4c060e30476b do not resolve SMTP clients by default Igor Sysoev <igor@sysoev.ru> parents: 1892 diff changeset	63 if (cscf->resolver == NULL) {
4c060e30476b do not resolve SMTP clients by default Igor Sysoev <igor@sysoev.ru> parents: 1892 diff changeset	64 s->host = smtp_unavailable;
4c060e30476b do not resolve SMTP clients by default Igor Sysoev <igor@sysoev.ru> parents: 1892 diff changeset	65 ngx_mail_smtp_greeting(s, c);
4c060e30476b do not resolve SMTP clients by default Igor Sysoev <igor@sysoev.ru> parents: 1892 diff changeset	66 return;
4c060e30476b do not resolve SMTP clients by default Igor Sysoev <igor@sysoev.ru> parents: 1892 diff changeset	67 }
4c060e30476b do not resolve SMTP clients by default Igor Sysoev <igor@sysoev.ru> parents: 1892 diff changeset	68
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	69 #if (NGX_HAVE_UNIX_DOMAIN)
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	70 if (c->sockaddr->sa_family == AF_UNIX) {
2855 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 }
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	75 #endif
2855 a96a8c916b0c mail proxy listen IPv6 support Igor Sysoev <igor@sysoev.ru> parents: 2495 diff changeset	76
1896 4c060e30476b do not resolve SMTP clients by default Igor Sysoev <igor@sysoev.ru> parents: 1892 diff changeset	77 c->log->action = "in resolving client address";
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	78
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	79 ctx = ngx_resolve_start(cscf->resolver, NULL);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	80 if (ctx == NULL) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	81 ngx_mail_close_connection(c);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	82 return;
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
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	85 ctx->addr.sockaddr = c->sockaddr;
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	86 ctx->addr.socklen = c->socklen;
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	87 ctx->handler = ngx_mail_smtp_resolve_addr_handler;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	88 ctx->data = s;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	89 ctx->timeout = cscf->resolver_timeout;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	90
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	91 if (ngx_resolve_addr(ctx) != NGX_OK) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	92 ngx_mail_close_connection(c);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	93 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	94 }
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 static void
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	98 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	99 {
2488 ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	100 ngx_connection_t *c;
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	101 ngx_mail_session_t *s;
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	102
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	103 s = ctx->data;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	104 c = s->connection;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	105
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	106 if (ctx->state) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	107 ngx_log_error(NGX_LOG_ERR, c->log, 0,
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	108 "%V could not be resolved (%i: %s)",
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	109 &c->addr_text, ctx->state,
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	110 ngx_resolver_strerror(ctx->state));
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	111
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	112 if (ctx->state == NGX_RESOLVE_NXDOMAIN) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	113 s->host = smtp_unavailable;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	114
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	115 } else {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	116 s->host = smtp_tempunavail;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	117 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	118
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	119 ngx_resolve_addr_done(ctx);
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_mail_smtp_greeting(s, s->connection);
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 return;
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
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	126 c->log->action = "in resolving client hostname";
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 s->host.data = ngx_pstrdup(c->pool, &ctx->name);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	129 if (s->host.data == NULL) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	130 ngx_resolve_addr_done(ctx);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	131 ngx_mail_close_connection(c);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	132 return;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	133 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	134
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	135 s->host.len = ctx->name.len;
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 ngx_resolve_addr_done(ctx);
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_log_debug1(NGX_LOG_DEBUG_MAIL, c->log, 0,
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	140 "address resolved: %V", &s->host);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	141
2488 ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	142 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	143
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	144 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	145 }
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	146
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 static void
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	149 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	150 {
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	151 ngx_connection_t *c;
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	152 ngx_mail_session_t *s;
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	153 ngx_resolver_ctx_t *ctx;
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	154 ngx_mail_core_srv_conf_t *cscf;
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	155
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	156 c = rev->data;
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	157 s = c->data;
ac695b3e981c avoid deep nested calls, flatten call tree Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	158
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	159 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	160
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	161 ctx = ngx_resolve_start(cscf->resolver, NULL);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	162 if (ctx == NULL) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	163 ngx_mail_close_connection(c);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	164 return;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	165 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	166
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	167 ctx->name = s->host;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	168 ctx->handler = ngx_mail_smtp_resolve_name_handler;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	169 ctx->data = s;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	170 ctx->timeout = cscf->resolver_timeout;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	171
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	172 if (ngx_resolve_name(ctx) != NGX_OK) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	173 ngx_mail_close_connection(c);
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 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	176
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 static void
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	179 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	180 {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	181 ngx_uint_t i;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	182 ngx_connection_t *c;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	183 ngx_mail_session_t *s;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	184
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	185 s = ctx->data;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	186 c = s->connection;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	187
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	188 if (ctx->state) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	189 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	190 "\"%V\" could not be resolved (%i: %s)",
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	191 &ctx->name, ctx->state,
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	192 ngx_resolver_strerror(ctx->state));
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	193
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	194 if (ctx->state == NGX_RESOLVE_NXDOMAIN) {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	195 s->host = smtp_unavailable;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	196
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	197 } else {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	198 s->host = smtp_tempunavail;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	199 }
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	200
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	201 } else {
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	202
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	203 #if (NGX_DEBUG)
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	204 {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	205 u_char text[NGX_SOCKADDR_STRLEN];
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	206 ngx_str_t addr;
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	207
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	208 addr.data = text;
1892 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 for (i = 0; i < ctx->naddrs; i++) {
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	211 addr.len = ngx_sock_ntop(ctx->addrs[i].sockaddr,
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	212 ctx->addrs[i].socklen,
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	213 text, NGX_SOCKADDR_STRLEN, 0);
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	214
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	215 ngx_log_debug1(NGX_LOG_DEBUG_MAIL, c->log, 0,
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	216 "name was resolved to %V", &addr);
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	217 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	218 }
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	219 #endif
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	220
5475 07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	221 for (i = 0; i < ctx->naddrs; i++) {
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	222 if (ngx_cmp_sockaddr(ctx->addrs[i].sockaddr, ctx->addrs[i].socklen,
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	223 c->sockaddr, c->socklen, 0)
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	224 == NGX_OK)
07dd5bd222ac Changed resolver API to use ngx_addr_t. Ruslan Ermilov <ru@nginx.com> parents: 5398 diff changeset	225 {
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	226 goto found;
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 }
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 s->host = smtp_unavailable;
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	231 }
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 found:
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_resolve_name_done(ctx);
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 ngx_mail_smtp_greeting(s, c);
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
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	240
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	241 static void
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	242 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	243 {
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	244 ngx_msec_t timeout;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	245 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	246 ngx_mail_smtp_srv_conf_t *sscf;
641 5e8fb59c18c1 nginx-0.3.42-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 583 diff changeset	247
1892 057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	248 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	249 "smtp greeting for \"%V\"", &s->host);
057d362ee50e resolver in smtp proxy module Igor Sysoev <igor@sysoev.ru> parents: 1762 diff changeset	250
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	251 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	252 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	253
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	254 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	255 ngx_add_timer(c->read, timeout);
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	256
2388 722b5aff05ae use "!= NGX_OK" instead of "== NGX_ERROR" Igor Sysoev <igor@sysoev.ru> parents: 2309 diff changeset	257 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	258 ngx_mail_close_connection(c);
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	259 }
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	260
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	261 if (sscf->greeting_delay) {
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	262 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	263 return;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	264 }
1480 a231e37a19ab move event handling to protocol specific code, Igor Sysoev <igor@sysoev.ru> parents: 1479 diff changeset	265
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	266 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	267
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	268 s->out = sscf->greeting;
1481 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 ngx_mail_send(c->write);
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
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	273
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	274 static void
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	275 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	276 {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	277 ngx_connection_t *c;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	278 ngx_mail_session_t *s;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	279 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	280 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	281
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	282 c = rev->data;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	283 s = c->data;
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 c->log->action = "in delay pipelining state";
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 if (rev->timedout) {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	288
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	289 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	290
1484 c788d2b877be fix r1482 Igor Sysoev <igor@sysoev.ru> parents: 1483 diff changeset	291 rev->timedout = 0;
c788d2b877be fix r1482 Igor Sysoev <igor@sysoev.ru> parents: 1483 diff changeset	292
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	293 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	294
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	295 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	296
1486 0e7074ef7303 style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 1485 diff changeset	297 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	298
2388 722b5aff05ae use "!= NGX_OK" instead of "== NGX_ERROR" Igor Sysoev <igor@sysoev.ru> parents: 2309 diff changeset	299 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	300 ngx_mail_close_connection(c);
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	301 return;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	302 }
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	303
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	304 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	305
f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	306 s->out = sscf->greeting;
1481 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 } else {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	309
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	310 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	311
1483 46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	312 if (s->buffer == NULL) {
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	313 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	314 return;
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	315 }
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	316 }
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	317
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	318 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	319 "client was rejected before greeting: \"%V\"")
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	320 != NGX_OK)
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 return;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	323 }
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	324
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	325 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	326 s->quit = 1;
1480 a231e37a19ab move event handling to protocol specific code, Igor Sysoev <igor@sysoev.ru> parents: 1479 diff changeset	327 }
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	328
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	329 ngx_mail_send(c->write);
539 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
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	332
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	333 void
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	334 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	335 {
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	336 ngx_connection_t *c;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	337 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	338
0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	339 c = rev->data;
0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	340
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	341 c->log->action = "in auth state";
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	342
423 fda5987b188d nginx-0.0.10-2004-09-13-20:18:09 import Igor Sysoev <igor@sysoev.ru> parents: 422 diff changeset	343 if (rev->timedout) {
fda5987b188d nginx-0.0.10-2004-09-13-20:18:09 import Igor Sysoev <igor@sysoev.ru> parents: 422 diff changeset	344 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	345 c->timedout = 1;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	346 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	347 return;
fda5987b188d nginx-0.0.10-2004-09-13-20:18:09 import Igor Sysoev <igor@sysoev.ru> parents: 422 diff changeset	348 }
420 33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	349
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	350 s = c->data;
521 6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	351
1483 46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	352 if (s->buffer == NULL) {
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	353 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	354 return;
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	355 }
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	356 }
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	357
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	358 s->mail_state = ngx_smtp_start;
1477 59e1caf2be94 style fix and optimizations Igor Sysoev <igor@sysoev.ru> parents: 1476 diff changeset	359 c->read->handler = ngx_mail_smtp_auth_state;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	360
1477 59e1caf2be94 style fix and optimizations Igor Sysoev <igor@sysoev.ru> parents: 1476 diff changeset	361 ngx_mail_smtp_auth_state(rev);
521 6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	362 }
6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	363
6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	364
1483 46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	365 static ngx_int_t
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	366 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	367 {
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	368 ngx_mail_smtp_srv_conf_t *sscf;
1483 46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	369
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	370 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	371 ngx_mail_session_internal_server_error(s);
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	372 return NGX_ERROR;
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	373 }
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 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	376
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	377 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	378 if (s->buffer == NULL) {
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	379 ngx_mail_session_internal_server_error(s);
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	380 return NGX_ERROR;
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	381 }
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 return NGX_OK;
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	384 }
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	385
46f364406994 ngx_mail_smtp_create_buffer() Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	386
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	387 void
1477 59e1caf2be94 style fix and optimizations Igor Sysoev <igor@sysoev.ru> parents: 1476 diff changeset	388 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	389 {
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	390 ngx_int_t rc;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	391 ngx_connection_t *c;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	392 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	393
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	394 c = rev->data;
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	395 s = c->data;
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	396
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	397 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	398
423 fda5987b188d nginx-0.0.10-2004-09-13-20:18:09 import Igor Sysoev <igor@sysoev.ru> parents: 422 diff changeset	399 if (rev->timedout) {
fda5987b188d nginx-0.0.10-2004-09-13-20:18:09 import Igor Sysoev <igor@sysoev.ru> parents: 422 diff changeset	400 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	401 c->timedout = 1;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	402 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	403 return;
fda5987b188d nginx-0.0.10-2004-09-13-20:18:09 import Igor Sysoev <igor@sysoev.ru> parents: 422 diff changeset	404 }
420 33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	405
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	406 if (s->out.len) {
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	407 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	408 s->blocked = 1;
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	409 return;
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	410 }
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	411
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	412 s->blocked = 0;
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	413
1482 4606dce4f416 optimizations Igor Sysoev <igor@sysoev.ru> parents: 1481 diff changeset	414 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	415
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	416 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	417 return;
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	418 }
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	419
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	420 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	421
01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	422 if (rc == NGX_OK) {
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	423 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	424
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	425 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	426
01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	427 switch (s->command) {
01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	428
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	429 case NGX_SMTP_HELO:
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	430 case NGX_SMTP_EHLO:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	431 rc = ngx_mail_smtp_helo(s, c);
809 da9c1521319d AUTH PLAIN LOGIN CRAM-MD5 Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	432 break;
da9c1521319d AUTH PLAIN LOGIN CRAM-MD5 Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	433
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	434 case NGX_SMTP_AUTH:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	435 rc = ngx_mail_smtp_auth(s, c);
800 887d8dec72dc APOP Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	436 break;
887d8dec72dc APOP Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	437
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	438 case NGX_SMTP_QUIT:
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	439 s->quit = 1;
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	440 ngx_str_set(&s->out, smtp_bye);
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	441 break;
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	442
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	443 case NGX_SMTP_MAIL:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	444 rc = ngx_mail_smtp_mail(s, c);
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	445 break;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	446
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	447 case NGX_SMTP_RCPT:
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	448 rc = ngx_mail_smtp_rcpt(s, c);
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	449 break;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	450
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	451 case NGX_SMTP_RSET:
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	452 rc = ngx_mail_smtp_rset(s, c);
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	453 break;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	454
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	455 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	456 break;
1322 27f2299e0d80 SMTP STARTTLS Igor Sysoev <igor@sysoev.ru> parents: 1286 diff changeset	457
27f2299e0d80 SMTP STARTTLS Igor Sysoev <igor@sysoev.ru> parents: 1286 diff changeset	458 case NGX_SMTP_STARTTLS:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	459 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	460 ngx_str_set(&s->out, smtp_starttls);
1322 27f2299e0d80 SMTP STARTTLS Igor Sysoev <igor@sysoev.ru> parents: 1286 diff changeset	461 break;
27f2299e0d80 SMTP STARTTLS Igor Sysoev <igor@sysoev.ru> parents: 1286 diff changeset	462
27f2299e0d80 SMTP STARTTLS Igor Sysoev <igor@sysoev.ru> parents: 1286 diff changeset	463 default:
27f2299e0d80 SMTP STARTTLS Igor Sysoev <igor@sysoev.ru> parents: 1286 diff changeset	464 rc = NGX_MAIL_PARSE_INVALID_COMMAND;
27f2299e0d80 SMTP STARTTLS Igor Sysoev <igor@sysoev.ru> parents: 1286 diff changeset	465 break;
421 01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	466 }
01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	467
01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	468 break;
01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	469
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	470 case ngx_smtp_auth_login_username:
2495 a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2488 diff changeset	471 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	472
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	473 ngx_str_set(&s->out, smtp_password);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	474 s->mail_state = ngx_smtp_auth_login_password;
809 da9c1521319d AUTH PLAIN LOGIN CRAM-MD5 Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	475 break;
da9c1521319d AUTH PLAIN LOGIN CRAM-MD5 Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	476
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	477 case ngx_smtp_auth_login_password:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	478 rc = ngx_mail_auth_login_password(s, c);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	479 break;
809 da9c1521319d AUTH PLAIN LOGIN CRAM-MD5 Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	480
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	481 case ngx_smtp_auth_plain:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	482 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	483 break;
809 da9c1521319d AUTH PLAIN LOGIN CRAM-MD5 Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	484
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	485 case ngx_smtp_auth_cram_md5:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	486 rc = ngx_mail_auth_cram_md5(s, c);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	487 break;
421 01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	488 }
01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	489 }
420 33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	490
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	491 if (s->buffer->pos < s->buffer->last) {
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	492 s->blocked = 1;
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	493 }
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	494
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	495 switch (rc) {
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	496
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	497 case NGX_DONE:
1482 4606dce4f416 optimizations Igor Sysoev <igor@sysoev.ru> parents: 1481 diff changeset	498 ngx_mail_auth(s, c);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	499 return;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	500
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	501 case NGX_ERROR:
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	502 ngx_mail_session_internal_server_error(s);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	503 return;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	504
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	505 case NGX_MAIL_PARSE_INVALID_COMMAND:
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	506 s->mail_state = ngx_smtp_start;
1486 0e7074ef7303 style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 1485 diff changeset	507 s->state = 0;
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	508 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	509
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	510 /* fall through */
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	511
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	512 case NGX_OK:
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	513 s->args.nelts = 0;
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	514
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	515 if (s->buffer->pos == s->buffer->last) {
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	516 s->buffer->pos = s->buffer->start;
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	517 s->buffer->last = s->buffer->start;
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	518 }
810 e3aa8f305d21 bugfixes Igor Sysoev <igor@sysoev.ru> parents: 809 diff changeset	519
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	520 if (s->state) {
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	521 s->arg_start = s->buffer->pos;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	522 }
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	523
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	524 ngx_mail_send(c->write);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	525 }
417 0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	526 }
0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	527
0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	528
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	529 static ngx_int_t
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	530 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	531 {
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	532 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	533 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	534
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	535 if (s->args.nelts != 1) {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	536 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	537 s->state = 0;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	538 return NGX_OK;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	539 }
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 arg = s->args.elts;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	542
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	543 s->smtp_helo.len = arg[0].len;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	544
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1896 diff changeset	545 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	546 if (s->smtp_helo.data == NULL) {
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	547 return NGX_ERROR;
4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	548 }
4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	549
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	550 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	551
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	552 ngx_str_null(&s->smtp_from);
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	553 ngx_str_null(&s->smtp_to);
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	554
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	555 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	556
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	557 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	558 s->out = sscf->server_name;
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	559
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	560 } else {
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	561 s->esmtp = 1;
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 (NGX_MAIL_SSL)
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	564
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	565 if (c->ssl == NULL) {
1704 e584e946e198 move condition declarations inside blocks where they are used Igor Sysoev <igor@sysoev.ru> parents: 1493 diff changeset	566 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	567
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	568 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	569
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	570 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	571 s->out = sscf->starttls_capability;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	572 return NGX_OK;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	573 }
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	574
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	575 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	576 s->out = sscf->starttls_only_capability;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	577 return NGX_OK;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	578 }
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	579 }
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	580 #endif
4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	581
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	582 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	583 }
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 return NGX_OK;
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	586 }
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	587
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	588
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	589 static ngx_int_t
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	590 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	591 {
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	592 ngx_int_t rc;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	593 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	594 ngx_mail_smtp_srv_conf_t *sscf;
525 09b42134ac0c nginx-0.1.37-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 521 diff changeset	595
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	596 #if (NGX_MAIL_SSL)
2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	597 if (ngx_mail_starttls_only(s, c)) {
2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	598 return NGX_MAIL_PARSE_INVALID_COMMAND;
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	599 }
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	600 #endif
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	601
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	602 if (s->args.nelts == 0) {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	603 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	604 s->state = 0;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	605 return NGX_OK;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	606 }
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 rc = ngx_mail_auth_parse(s, c);
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 switch (rc) {
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	611
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	612 case NGX_MAIL_AUTH_LOGIN:
1472 32450a2bbdf4 decrement active connection counter in mail proxy Igor Sysoev <igor@sysoev.ru> parents: 1323 diff changeset	613
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	614 ngx_str_set(&s->out, smtp_username);
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	615 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	616
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	617 return NGX_OK;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	618
2495 a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2488 diff changeset	619 case NGX_MAIL_AUTH_LOGIN_USERNAME:
a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2488 diff changeset	620
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	621 ngx_str_set(&s->out, smtp_password);
2495 a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2488 diff changeset	622 s->mail_state = ngx_smtp_auth_login_password;
a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2488 diff changeset	623
a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2488 diff changeset	624 return ngx_mail_auth_login_username(s, c, 1);
a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2488 diff changeset	625
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	626 case NGX_MAIL_AUTH_PLAIN:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	627
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	628 ngx_str_set(&s->out, smtp_next);
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	629 s->mail_state = ngx_smtp_auth_plain;
543 511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	630
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	631 return NGX_OK;
2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	632
2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	633 case NGX_MAIL_AUTH_CRAM_MD5:
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 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	636
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	637 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	638 return NGX_MAIL_PARSE_INVALID_COMMAND;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	639 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	640
1485 b3488fc2675a create salt just before it will be used Igor Sysoev <igor@sysoev.ru> parents: 1484 diff changeset	641 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	642 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	643
1485 b3488fc2675a create salt just before it will be used Igor Sysoev <igor@sysoev.ru> parents: 1484 diff changeset	644 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	645 return NGX_ERROR;
b3488fc2675a create salt just before it will be used Igor Sysoev <igor@sysoev.ru> parents: 1484 diff changeset	646 }
b3488fc2675a create salt just before it will be used Igor Sysoev <igor@sysoev.ru> parents: 1484 diff changeset	647 }
b3488fc2675a create salt just before it will be used Igor Sysoev <igor@sysoev.ru> parents: 1484 diff changeset	648
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	649 if (ngx_mail_auth_cram_md5_salt(s, c, "334 ", 4) == NGX_OK) {
2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	650 s->mail_state = ngx_smtp_auth_cram_md5;
2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	651 return NGX_OK;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	652 }
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	653
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	654 return NGX_ERROR;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	655 }
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	656
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	657 return rc;
417 0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	658 }
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	659
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	660
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	661 static ngx_int_t
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	662 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	663 {
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	664 ngx_str_t *arg, cmd;
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	665 ngx_mail_smtp_srv_conf_t *sscf;
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 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	668
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	669 if (!(sscf->auth_methods & NGX_MAIL_AUTH_NONE_ENABLED)) {
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	670 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	671 ngx_str_set(&s->out, smtp_auth_required);
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	672 return NGX_OK;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	673 }
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 /* auth none */
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	676
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	677 if (s->smtp_from.len) {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	678 ngx_str_set(&s->out, smtp_bad_sequence);
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	679 return NGX_OK;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	680 }
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	681
5703 7deb01451486 Mail: added a check for the number of arguments in MAIL/RCPT. Maxim Dounin <mdounin@mdounin.ru> parents: 5477 diff changeset	682 if (s->args.nelts == 0) {
7deb01451486 Mail: added a check for the number of arguments in MAIL/RCPT. Maxim Dounin <mdounin@mdounin.ru> parents: 5477 diff changeset	683 ngx_str_set(&s->out, smtp_invalid_argument);
7deb01451486 Mail: added a check for the number of arguments in MAIL/RCPT. Maxim Dounin <mdounin@mdounin.ru> parents: 5477 diff changeset	684 return NGX_OK;
7deb01451486 Mail: added a check for the number of arguments in MAIL/RCPT. Maxim Dounin <mdounin@mdounin.ru> parents: 5477 diff changeset	685 }
7deb01451486 Mail: added a check for the number of arguments in MAIL/RCPT. Maxim Dounin <mdounin@mdounin.ru> parents: 5477 diff changeset	686
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	687 arg = s->args.elts;
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	688 arg += s->args.nelts - 1;
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	689
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	690 cmd.len = arg->data + arg->len - s->cmd.data;
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	691 cmd.data = s->cmd.data;
2309 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 s->smtp_from.len = cmd.len;
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	694
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	695 s->smtp_from.data = ngx_pnalloc(c->pool, cmd.len);
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	696 if (s->smtp_from.data == NULL) {
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	697 return NGX_ERROR;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	698 }
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	699
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	700 ngx_memcpy(s->smtp_from.data, cmd.data, cmd.len);
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	701
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	702 ngx_log_debug1(NGX_LOG_DEBUG_MAIL, c->log, 0,
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	703 "smtp mail from:\"%V\"", &s->smtp_from);
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	704
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	705 ngx_str_set(&s->out, smtp_ok);
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	706
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	707 return NGX_OK;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	708 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	709
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	710
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	711 static ngx_int_t
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	712 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	713 {
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	714 ngx_str_t *arg, cmd;
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	715
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	716 if (s->smtp_from.len == 0) {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	717 ngx_str_set(&s->out, smtp_bad_sequence);
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	718 return NGX_OK;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	719 }
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	720
5703 7deb01451486 Mail: added a check for the number of arguments in MAIL/RCPT. Maxim Dounin <mdounin@mdounin.ru> parents: 5477 diff changeset	721 if (s->args.nelts == 0) {
7deb01451486 Mail: added a check for the number of arguments in MAIL/RCPT. Maxim Dounin <mdounin@mdounin.ru> parents: 5477 diff changeset	722 ngx_str_set(&s->out, smtp_invalid_argument);
7deb01451486 Mail: added a check for the number of arguments in MAIL/RCPT. Maxim Dounin <mdounin@mdounin.ru> parents: 5477 diff changeset	723 return NGX_OK;
7deb01451486 Mail: added a check for the number of arguments in MAIL/RCPT. Maxim Dounin <mdounin@mdounin.ru> parents: 5477 diff changeset	724 }
7deb01451486 Mail: added a check for the number of arguments in MAIL/RCPT. Maxim Dounin <mdounin@mdounin.ru> parents: 5477 diff changeset	725
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	726 arg = s->args.elts;
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	727 arg += s->args.nelts - 1;
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	728
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	729 cmd.len = arg->data + arg->len - s->cmd.data;
04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	730 cmd.data = s->cmd.data;
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	731
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	732 s->smtp_to.len = cmd.len;
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	733
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	734 s->smtp_to.data = ngx_pnalloc(c->pool, cmd.len);
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	735 if (s->smtp_to.data == NULL) {
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	736 return NGX_ERROR;
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
5398 04e43d03e153 Mail: smtp pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 5396 diff changeset	739 ngx_memcpy(s->smtp_to.data, cmd.data, cmd.len);
2309 8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	740
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	741 ngx_log_debug1(NGX_LOG_DEBUG_MAIL, c->log, 0,
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	742 "smtp rcpt to:\"%V\"", &s->smtp_to);
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	743
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	744 s->auth_method = NGX_MAIL_AUTH_NONE;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	745
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	746 return NGX_DONE;
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	747 }
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	748
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	749
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	750 static ngx_int_t
8156bc03982a smtp_auth none Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	751 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	752 {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	753 ngx_str_null(&s->smtp_from);
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	754 ngx_str_null(&s->smtp_to);
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	755 ngx_str_set(&s->out, smtp_ok);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	756
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	757 return NGX_OK;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	758 }
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
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	761 static ngx_int_t
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	762 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	763 {
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	764 #if (NGX_MAIL_SSL)
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	765 ngx_mail_ssl_conf_t *sslcf;
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	766
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	767 if (c->ssl == NULL) {
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	768 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	769 if (sslcf->starttls) {
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	770
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	771 /*
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	772 * RFC3207 requires us to discard any knowledge
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	773 * obtained from client before STARTTLS.
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	774 */
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	775
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	776 ngx_str_null(&s->smtp_helo);
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	777 ngx_str_null(&s->smtp_from);
dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3299 diff changeset	778 ngx_str_null(&s->smtp_to);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	779
5787 3f5d0af4e40a Mail: discard pipelined commands after SMTP STARTTLS. Maxim Dounin <mdounin@mdounin.ru> parents: 5703 diff changeset	780 s->buffer->pos = s->buffer->start;
3f5d0af4e40a Mail: discard pipelined commands after SMTP STARTTLS. Maxim Dounin <mdounin@mdounin.ru> parents: 5703 diff changeset	781 s->buffer->last = s->buffer->start;
3f5d0af4e40a Mail: discard pipelined commands after SMTP STARTTLS. Maxim Dounin <mdounin@mdounin.ru> parents: 5703 diff changeset	782
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	783 c->read->handler = ngx_mail_starttls_handler;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	784 return NGX_OK;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	785 }
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	786 }
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	787
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	788 #endif
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	789
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	790 return NGX_MAIL_PARSE_INVALID_COMMAND;
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	791 }
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	792
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	793
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	794 static ngx_int_t
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	795 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	796 char *err)
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	797 {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	798 ssize_t n;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	799
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	800 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	801
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	802 if (n == NGX_ERROR \|\| n == 0) {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	803 ngx_mail_close_connection(c);
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	804 return NGX_ERROR;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	805 }
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 if (n > 0) {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	808 s->buffer->last += n;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	809 }
1486 0e7074ef7303 style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 1485 diff changeset	810
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	811 if (n == NGX_AGAIN) {
2388 722b5aff05ae use "!= NGX_OK" instead of "== NGX_ERROR" Igor Sysoev <igor@sysoev.ru> parents: 2309 diff changeset	812 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	813 ngx_mail_session_internal_server_error(s);
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	814 return NGX_ERROR;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	815 }
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	816
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	817 return NGX_AGAIN;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	818 }
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	819
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	820 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	821
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	822 s->buffer->pos = s->buffer->start;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	823 s->buffer->last = s->buffer->start;
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 return NGX_OK;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	826 }
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	827
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 static void
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	830 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	831 char *err)
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	832 {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	833 u_char ch;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	834 ngx_str_t cmd;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	835 ngx_uint_t i;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	836
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	837 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	838 return;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	839 }
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 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	842 cmd.data = s->buffer->start;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	843
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	844 for (i = 0; i < cmd.len; i++) {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	845 ch = cmd.data[i];
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	846
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	847 if (ch != CR && ch != LF) {
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	848 continue;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	849 }
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	850
1493 3c4111e07b58 use "_" instead of " " as new line substitute, do not delete trailing new line Igor Sysoev <igor@sysoev.ru> parents: 1487 diff changeset	851 cmd.data[i] = '_';
1481 b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	852 }
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	853
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	854 cmd.len = i;
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	855
b58ce1cf66da smtp_client_buffer and smtp_greeting_delay Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	856 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	857 }

Mercurial > hg > nginx

annotate src/mail/ngx_mail_smtp_handler.c @ 6474:2cd019520210