nginx: src/mail/ngx_mail_smtp

annotate src/mail/ngx_mail_smtp_handler.c @ 3299:0b6277a58a2d

*) fix resolving an empty name ("."), *) add quotes in an error message, *) backout r3299 in ngx_mail_smtp_handler.c

author	Igor Sysoev <igor@sysoev.ru>
date	Mon, 09 Nov 2009 19:15:11 +0000
parents	847ab5a32307
children	dd1570b6f237

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

Mercurial > hg > nginx

annotate src/mail/ngx_mail_smtp_handler.c @ 3299:0b6277a58a2d