nginx: src/mail/ngx_mail_smtp

annotate src/mail/ngx_mail_smtp_handler.c @ 3298:847ab5a32307

fix "PTR ." case in address resolver

author	Igor Sysoev <igor@sysoev.ru>
date	Mon, 09 Nov 2009 18:04:05 +0000
parents	a96a8c916b0c
children	0b6277a58a2d

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

Mercurial > hg > nginx

annotate src/mail/ngx_mail_smtp_handler.c @ 3298:847ab5a32307