nginx: src/mail/ngx_mail_pop3

annotate src/mail/ngx_mail_pop3_handler.c @ 9267:9a5e2296c1be default tip

Disabled handling of headers without a colon. Starting with nginx 0.1.29 (509:9b8c906f6e63), header names not followed by a colon and a value were allowed. Such headers were interpreted as headers with an empty value. With this change, such headers are unconditionally rejected. Requested by Maksim Yevmenkin.

author	Maxim Dounin <mdounin@mdounin.ru>
date	Wed, 08 May 2024 23:00:07 +0300
parents	d7fd0acdea64
children

rev	line source
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 423 diff changeset	1
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 423 diff changeset	2 /*
444 42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright Igor Sysoev <igor@sysoev.ru> parents: 441 diff changeset	3 * Copyright (C) Igor Sysoev
4412 d620f497c50f Copyright updated. Maxim Konovalov <maxim@nginx.com> parents: 3516 diff changeset	4 * Copyright (C) Nginx, Inc.
441 da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 423 diff changeset	5 */
da8c5707af39 nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files Igor Sysoev <igor@sysoev.ru> parents: 423 diff changeset	6
413 de9d4726e28a nginx-0.0.10-2004-08-31-23:05:39 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	7
de9d4726e28a nginx-0.0.10-2004-08-31-23:05:39 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	8 #include <ngx_config.h>
de9d4726e28a nginx-0.0.10-2004-08-31-23:05:39 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	9 #include <ngx_core.h>
de9d4726e28a nginx-0.0.10-2004-08-31-23:05:39 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	10 #include <ngx_event.h>
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	11 #include <ngx_mail.h>
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	12 #include <ngx_mail_pop3_module.h>
417 0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	13
0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	14
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	15 static ngx_int_t ngx_mail_pop3_user(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	16 static ngx_int_t ngx_mail_pop3_pass(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	17 static ngx_int_t ngx_mail_pop3_capa(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	18 ngx_int_t stls);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	19 static ngx_int_t ngx_mail_pop3_stls(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	20 static ngx_int_t ngx_mail_pop3_apop(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	21 static ngx_int_t ngx_mail_pop3_auth(ngx_mail_session_t s, ngx_connection_t c);
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	22
413 de9d4726e28a nginx-0.0.10-2004-08-31-23:05:39 import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	23
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	24 static u_char pop3_greeting[] = "+OK POP3 ready" CRLF;
521 6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	25 static u_char pop3_ok[] = "+OK" CRLF;
809 da9c1521319d AUTH PLAIN LOGIN CRAM-MD5 Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	26 static u_char pop3_next[] = "+ " CRLF;
da9c1521319d AUTH PLAIN LOGIN CRAM-MD5 Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	27 static u_char pop3_username[] = "+ VXNlcm5hbWU6" CRLF;
da9c1521319d AUTH PLAIN LOGIN CRAM-MD5 Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	28 static u_char pop3_password[] = "+ UGFzc3dvcmQ6" CRLF;
521 6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	29 static u_char pop3_invalid_command[] = "-ERR invalid command" CRLF;
6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	30
6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	31
6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	32 void
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	33 ngx_mail_pop3_init_session(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	34 {
800 887d8dec72dc APOP Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	35 u_char *p;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	36 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	37 ngx_mail_pop3_srv_conf_t *pscf;
417 0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	38
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	39 pscf = ngx_mail_get_module_srv_conf(s, ngx_mail_pop3_module);
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	40 cscf = ngx_mail_get_module_srv_conf(s, ngx_mail_core_module);
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	41
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	42 if (pscf->auth_methods
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	43 & (NGX_MAIL_AUTH_APOP_ENABLED\|NGX_MAIL_AUTH_CRAM_MD5_ENABLED))
800 887d8dec72dc APOP Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	44 {
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	45 if (ngx_mail_salt(s, c, cscf) != NGX_OK) {
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	46 ngx_mail_session_internal_server_error(s);
800 887d8dec72dc APOP Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	47 return;
887d8dec72dc APOP Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	48 }
887d8dec72dc APOP Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	49
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1704 diff changeset	50 s->out.data = ngx_pnalloc(c->pool, sizeof(pop3_greeting) + s->salt.len);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	51 if (s->out.data == NULL) {
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	52 ngx_mail_session_internal_server_error(s);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	53 return;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	54 }
800 887d8dec72dc APOP Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	55
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	56 p = ngx_cpymem(s->out.data, pop3_greeting, sizeof(pop3_greeting) - 3);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	57 *p++ = ' ';
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	58 p = ngx_cpymem(p, s->salt.data, s->salt.len);
800 887d8dec72dc APOP Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	59
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	60 s->out.len = p - s->out.data;
800 887d8dec72dc APOP Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	61
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	62 } else {
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3450 diff changeset	63 ngx_str_set(&s->out, pop3_greeting);
800 887d8dec72dc APOP Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	64 }
887d8dec72dc APOP Igor Sysoev <igor@sysoev.ru> parents: 641 diff changeset	65
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	66 c->read->handler = ngx_mail_pop3_init_protocol;
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	67
1486 0e7074ef7303 style fix: remove trailing spaces Igor Sysoev <igor@sysoev.ru> parents: 1482 diff changeset	68 ngx_add_timer(c->read, cscf->timeout);
1480 a231e37a19ab move event handling to protocol specific code, Igor Sysoev <igor@sysoev.ru> parents: 1479 diff changeset	69
2388 722b5aff05ae use "!= NGX_OK" instead of "== NGX_ERROR" Igor Sysoev <igor@sysoev.ru> parents: 2049 diff changeset	70 if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
1480 a231e37a19ab move event handling to protocol specific code, Igor Sysoev <igor@sysoev.ru> parents: 1479 diff changeset	71 ngx_mail_close_connection(c);
a231e37a19ab move event handling to protocol specific code, Igor Sysoev <igor@sysoev.ru> parents: 1479 diff changeset	72 }
a231e37a19ab move event handling to protocol specific code, Igor Sysoev <igor@sysoev.ru> parents: 1479 diff changeset	73
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	74 ngx_mail_send(c->write);
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	75 }
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	76
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	77
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	78 void
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	79 ngx_mail_pop3_init_protocol(ngx_event_t *rev)
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	80 {
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	81 ngx_connection_t *c;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	82 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	83
0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	84 c = rev->data;
0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	85
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	86 c->log->action = "in auth state";
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	87
423 fda5987b188d nginx-0.0.10-2004-09-13-20:18:09 import Igor Sysoev <igor@sysoev.ru> parents: 422 diff changeset	88 if (rev->timedout) {
fda5987b188d nginx-0.0.10-2004-09-13-20:18:09 import Igor Sysoev <igor@sysoev.ru> parents: 422 diff changeset	89 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	90 c->timedout = 1;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	91 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	92 return;
fda5987b188d nginx-0.0.10-2004-09-13-20:18:09 import Igor Sysoev <igor@sysoev.ru> parents: 422 diff changeset	93 }
420 33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	94
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	95 s = c->data;
521 6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	96
419 47709bff4468 nginx-0.0.10-2004-09-09-19:40:48 import Igor Sysoev <igor@sysoev.ru> parents: 418 diff changeset	97 if (s->buffer == NULL) {
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	98 if (ngx_array_init(&s->args, c->pool, 2, sizeof(ngx_str_t))
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	99 == NGX_ERROR)
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	100 {
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	101 ngx_mail_session_internal_server_error(s);
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	102 return;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	103 }
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	104
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	105 s->buffer = ngx_create_temp_buf(c->pool, 128);
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	106 if (s->buffer == NULL) {
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	107 ngx_mail_session_internal_server_error(s);
583 4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	108 return;
4e296b7d25bf nginx-0.3.13-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 577 diff changeset	109 }
419 47709bff4468 nginx-0.0.10-2004-09-09-19:40:48 import Igor Sysoev <igor@sysoev.ru> parents: 418 diff changeset	110 }
47709bff4468 nginx-0.0.10-2004-09-09-19:40:48 import Igor Sysoev <igor@sysoev.ru> parents: 418 diff changeset	111
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	112 s->mail_state = ngx_pop3_start;
1477 59e1caf2be94 style fix and optimizations Igor Sysoev <igor@sysoev.ru> parents: 1476 diff changeset	113 c->read->handler = ngx_mail_pop3_auth_state;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	114
1477 59e1caf2be94 style fix and optimizations Igor Sysoev <igor@sysoev.ru> parents: 1476 diff changeset	115 ngx_mail_pop3_auth_state(rev);
420 33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	116 }
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	117
33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	118
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	119 void
1477 59e1caf2be94 style fix and optimizations Igor Sysoev <igor@sysoev.ru> parents: 1476 diff changeset	120 ngx_mail_pop3_auth_state(ngx_event_t *rev)
521 6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	121 {
9235 d7fd0acdea64 Mail: handling of pipelined commands which cross buffer boundary. Maxim Dounin <mdounin@mdounin.ru> parents: 9234 diff changeset	122 size_t n;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	123 ngx_int_t rc;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	124 ngx_connection_t *c;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	125 ngx_mail_session_t *s;
521 6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	126
6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	127 c = rev->data;
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	128 s = c->data;
521 6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	129
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	130 ngx_log_debug0(NGX_LOG_DEBUG_MAIL, c->log, 0, "pop3 auth state");
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	131
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	132 if (rev->timedout) {
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	133 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	134 c->timedout = 1;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	135 ngx_mail_close_connection(c);
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	136 return;
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	137 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	138
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	139 if (s->out.len) {
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	140 ngx_log_debug0(NGX_LOG_DEBUG_MAIL, c->log, 0, "pop3 send handler busy");
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	141 s->blocked = 1;
7789 ab6257dac2a8 Mail: added missing event handling after blocking events. Maxim Dounin <mdounin@mdounin.ru> parents: 6869 diff changeset	142
ab6257dac2a8 Mail: added missing event handling after blocking events. Maxim Dounin <mdounin@mdounin.ru> parents: 6869 diff changeset	143 if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
ab6257dac2a8 Mail: added missing event handling after blocking events. Maxim Dounin <mdounin@mdounin.ru> parents: 6869 diff changeset	144 ngx_mail_close_connection(c);
ab6257dac2a8 Mail: added missing event handling after blocking events. Maxim Dounin <mdounin@mdounin.ru> parents: 6869 diff changeset	145 return;
ab6257dac2a8 Mail: added missing event handling after blocking events. Maxim Dounin <mdounin@mdounin.ru> parents: 6869 diff changeset	146 }
ab6257dac2a8 Mail: added missing event handling after blocking events. Maxim Dounin <mdounin@mdounin.ru> parents: 6869 diff changeset	147
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	148 return;
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	149 }
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	150
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	151 s->blocked = 0;
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	152
1482 4606dce4f416 optimizations Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	153 rc = ngx_mail_read_command(s, c);
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	154
7790 da0a85e91587 Mail: added missing event handling after reading data. Maxim Dounin <mdounin@mdounin.ru> parents: 7789 diff changeset	155 if (rc == NGX_AGAIN) {
da0a85e91587 Mail: added missing event handling after reading data. Maxim Dounin <mdounin@mdounin.ru> parents: 7789 diff changeset	156 if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
da0a85e91587 Mail: added missing event handling after reading data. Maxim Dounin <mdounin@mdounin.ru> parents: 7789 diff changeset	157 ngx_mail_session_internal_server_error(s);
da0a85e91587 Mail: added missing event handling after reading data. Maxim Dounin <mdounin@mdounin.ru> parents: 7789 diff changeset	158 return;
da0a85e91587 Mail: added missing event handling after reading data. Maxim Dounin <mdounin@mdounin.ru> parents: 7789 diff changeset	159 }
da0a85e91587 Mail: added missing event handling after reading data. Maxim Dounin <mdounin@mdounin.ru> parents: 7789 diff changeset	160
da0a85e91587 Mail: added missing event handling after reading data. Maxim Dounin <mdounin@mdounin.ru> parents: 7789 diff changeset	161 return;
da0a85e91587 Mail: added missing event handling after reading data. Maxim Dounin <mdounin@mdounin.ru> parents: 7789 diff changeset	162 }
da0a85e91587 Mail: added missing event handling after reading data. Maxim Dounin <mdounin@mdounin.ru> parents: 7789 diff changeset	163
da0a85e91587 Mail: added missing event handling after reading data. Maxim Dounin <mdounin@mdounin.ru> parents: 7789 diff changeset	164 if (rc == NGX_ERROR) {
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	165 return;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	166 }
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	167
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3450 diff changeset	168 ngx_str_set(&s->out, pop3_ok);
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	169
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	170 if (rc == NGX_OK) {
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	171 switch (s->mail_state) {
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	172
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	173 case ngx_pop3_start:
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	174
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	175 switch (s->command) {
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	176
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	177 case NGX_POP3_USER:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	178 rc = ngx_mail_pop3_user(s, c);
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	179 break;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	180
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	181 case NGX_POP3_CAPA:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	182 rc = ngx_mail_pop3_capa(s, c, 1);
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	183 break;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	184
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	185 case NGX_POP3_APOP:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	186 rc = ngx_mail_pop3_apop(s, c);
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	187 break;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	188
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	189 case NGX_POP3_AUTH:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	190 rc = ngx_mail_pop3_auth(s, c);
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	191 break;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	192
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	193 case NGX_POP3_QUIT:
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	194 s->quit = 1;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	195 break;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	196
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	197 case NGX_POP3_NOOP:
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	198 break;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	199
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	200 case NGX_POP3_STLS:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	201 rc = ngx_mail_pop3_stls(s, c);
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	202 break;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	203
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	204 default:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	205 rc = NGX_MAIL_PARSE_INVALID_COMMAND;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	206 break;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	207 }
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	208
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	209 break;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	210
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	211 case ngx_pop3_user:
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	212
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	213 switch (s->command) {
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	214
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	215 case NGX_POP3_PASS:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	216 rc = ngx_mail_pop3_pass(s, c);
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	217 break;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	218
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	219 case NGX_POP3_CAPA:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	220 rc = ngx_mail_pop3_capa(s, c, 0);
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	221 break;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	222
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	223 case NGX_POP3_QUIT:
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	224 s->quit = 1;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	225 break;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	226
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	227 case NGX_POP3_NOOP:
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	228 break;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	229
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	230 default:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	231 rc = NGX_MAIL_PARSE_INVALID_COMMAND;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	232 break;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	233 }
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	234
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	235 break;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	236
4499 778ef9c3fd2d Fixed spelling in single-line comments. Ruslan Ermilov <ru@nginx.com> parents: 4412 diff changeset	237 /* suppress warnings */
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	238 case ngx_pop3_passwd:
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	239 break;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	240
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	241 case ngx_pop3_auth_login_username:
2495 a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	242 rc = ngx_mail_auth_login_username(s, c, 0);
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	243
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3450 diff changeset	244 ngx_str_set(&s->out, pop3_password);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	245 s->mail_state = ngx_pop3_auth_login_password;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	246 break;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	247
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	248 case ngx_pop3_auth_login_password:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	249 rc = ngx_mail_auth_login_password(s, c);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	250 break;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	251
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	252 case ngx_pop3_auth_plain:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	253 rc = ngx_mail_auth_plain(s, c, 0);
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	254 break;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	255
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	256 case ngx_pop3_auth_cram_md5:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	257 rc = ngx_mail_auth_cram_md5(s, c);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	258 break;
6774 bcb107bb89cd Mail: support SASL EXTERNAL (RFC 4422). Rob N ★ <robn@fastmail.com> parents: 4499 diff changeset	259
bcb107bb89cd Mail: support SASL EXTERNAL (RFC 4422). Rob N ★ <robn@fastmail.com> parents: 4499 diff changeset	260 case ngx_pop3_auth_external:
bcb107bb89cd Mail: support SASL EXTERNAL (RFC 4422). Rob N ★ <robn@fastmail.com> parents: 4499 diff changeset	261 rc = ngx_mail_auth_external(s, c, 0);
bcb107bb89cd Mail: support SASL EXTERNAL (RFC 4422). Rob N ★ <robn@fastmail.com> parents: 4499 diff changeset	262 break;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	263 }
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	264 }
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	265
9234 c690a902bfec Mail: handling of read buffer filled with commands. Maxim Dounin <mdounin@mdounin.ru> parents: 7838 diff changeset	266 if (s->buffer->pos < s->buffer->last \|\| c->read->ready) {
7838 815c63581be4 Mail: POP3 pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 7790 diff changeset	267 s->blocked = 1;
815c63581be4 Mail: POP3 pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 7790 diff changeset	268 }
815c63581be4 Mail: POP3 pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 7790 diff changeset	269
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	270 switch (rc) {
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	271
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	272 case NGX_DONE:
1482 4606dce4f416 optimizations Igor Sysoev <igor@sysoev.ru> parents: 1480 diff changeset	273 ngx_mail_auth(s, c);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	274 return;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	275
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	276 case NGX_ERROR:
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	277 ngx_mail_session_internal_server_error(s);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	278 return;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	279
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	280 case NGX_MAIL_PARSE_INVALID_COMMAND:
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	281 s->mail_state = ngx_pop3_start;
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	282 s->state = 0;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	283
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3450 diff changeset	284 ngx_str_set(&s->out, pop3_invalid_command);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	285
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	286 /* fall through */
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	287
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	288 case NGX_OK:
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	289
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	290 s->args.nelts = 0;
7838 815c63581be4 Mail: POP3 pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 7790 diff changeset	291
815c63581be4 Mail: POP3 pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 7790 diff changeset	292 if (s->buffer->pos == s->buffer->last) {
815c63581be4 Mail: POP3 pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 7790 diff changeset	293 s->buffer->pos = s->buffer->start;
815c63581be4 Mail: POP3 pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 7790 diff changeset	294 s->buffer->last = s->buffer->start;
9235 d7fd0acdea64 Mail: handling of pipelined commands which cross buffer boundary. Maxim Dounin <mdounin@mdounin.ru> parents: 9234 diff changeset	295
d7fd0acdea64 Mail: handling of pipelined commands which cross buffer boundary. Maxim Dounin <mdounin@mdounin.ru> parents: 9234 diff changeset	296 } else {
d7fd0acdea64 Mail: handling of pipelined commands which cross buffer boundary. Maxim Dounin <mdounin@mdounin.ru> parents: 9234 diff changeset	297 n = s->buffer->last - s->buffer->pos;
d7fd0acdea64 Mail: handling of pipelined commands which cross buffer boundary. Maxim Dounin <mdounin@mdounin.ru> parents: 9234 diff changeset	298 ngx_memmove(s->buffer->start, s->buffer->pos, n);
d7fd0acdea64 Mail: handling of pipelined commands which cross buffer boundary. Maxim Dounin <mdounin@mdounin.ru> parents: 9234 diff changeset	299 s->buffer->pos = s->buffer->start;
d7fd0acdea64 Mail: handling of pipelined commands which cross buffer boundary. Maxim Dounin <mdounin@mdounin.ru> parents: 9234 diff changeset	300 s->buffer->last = s->buffer->start + n;
7838 815c63581be4 Mail: POP3 pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 7790 diff changeset	301 }
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	302
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	303 if (s->state) {
7838 815c63581be4 Mail: POP3 pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 7790 diff changeset	304 s->arg_start = s->buffer->pos;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	305 }
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	306
7790 da0a85e91587 Mail: added missing event handling after reading data. Maxim Dounin <mdounin@mdounin.ru> parents: 7789 diff changeset	307 if (ngx_handle_read_event(c->read, 0) != NGX_OK) {
da0a85e91587 Mail: added missing event handling after reading data. Maxim Dounin <mdounin@mdounin.ru> parents: 7789 diff changeset	308 ngx_mail_session_internal_server_error(s);
da0a85e91587 Mail: added missing event handling after reading data. Maxim Dounin <mdounin@mdounin.ru> parents: 7789 diff changeset	309 return;
da0a85e91587 Mail: added missing event handling after reading data. Maxim Dounin <mdounin@mdounin.ru> parents: 7789 diff changeset	310 }
da0a85e91587 Mail: added missing event handling after reading data. Maxim Dounin <mdounin@mdounin.ru> parents: 7789 diff changeset	311
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	312 ngx_mail_send(c->write);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	313 }
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	314 }
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	315
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	316 static ngx_int_t
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	317 ngx_mail_pop3_user(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	318 {
1704 e584e946e198 move condition declarations inside blocks where they are used Igor Sysoev <igor@sysoev.ru> parents: 1487 diff changeset	319 ngx_str_t *arg;
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	320
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	321 #if (NGX_MAIL_SSL)
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	322 if (ngx_mail_starttls_only(s, c)) {
2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	323 return NGX_MAIL_PARSE_INVALID_COMMAND;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	324 }
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	325 #endif
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	326
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	327 if (s->args.nelts != 1) {
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	328 return NGX_MAIL_PARSE_INVALID_COMMAND;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	329 }
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	330
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	331 arg = s->args.elts;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	332 s->login.len = arg[0].len;
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1704 diff changeset	333 s->login.data = ngx_pnalloc(c->pool, s->login.len);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	334 if (s->login.data == NULL) {
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	335 return NGX_ERROR;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	336 }
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	337
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	338 ngx_memcpy(s->login.data, arg[0].data, s->login.len);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	339
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	340 ngx_log_debug1(NGX_LOG_DEBUG_MAIL, c->log, 0,
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	341 "pop3 login: \"%V\"", &s->login);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	342
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	343 s->mail_state = ngx_pop3_user;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	344
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	345 return NGX_OK;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	346 }
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	347
68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	348
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	349 static ngx_int_t
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	350 ngx_mail_pop3_pass(ngx_mail_session_t s, ngx_connection_t c)
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	351 {
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	352 ngx_str_t *arg;
1136 68f30ab68bb7 Many changes: Igor Sysoev <igor@sysoev.ru> parents: 1111 diff changeset	353
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	354 if (s->args.nelts != 1) {
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	355 return NGX_MAIL_PARSE_INVALID_COMMAND;
527 7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	356 }
7fa11e5c6e96 nginx-0.1.38-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 525 diff changeset	357
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	358 arg = s->args.elts;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	359 s->passwd.len = arg[0].len;
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1704 diff changeset	360 s->passwd.data = ngx_pnalloc(c->pool, s->passwd.len);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	361 if (s->passwd.data == NULL) {
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	362 return NGX_ERROR;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	363 }
1323 c4b2c893989d IMAP AUTHENTICATE Igor Sysoev <igor@sysoev.ru> parents: 1322 diff changeset	364
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	365 ngx_memcpy(s->passwd.data, arg[0].data, s->passwd.len);
1323 c4b2c893989d IMAP AUTHENTICATE Igor Sysoev <igor@sysoev.ru> parents: 1322 diff changeset	366
c4b2c893989d IMAP AUTHENTICATE Igor Sysoev <igor@sysoev.ru> parents: 1322 diff changeset	367 #if (NGX_DEBUG_MAIL_PASSWD)
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	368 ngx_log_debug1(NGX_LOG_DEBUG_MAIL, c->log, 0,
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	369 "pop3 passwd: \"%V\"", &s->passwd);
1323 c4b2c893989d IMAP AUTHENTICATE Igor Sysoev <igor@sysoev.ru> parents: 1322 diff changeset	370 #endif
c4b2c893989d IMAP AUTHENTICATE Igor Sysoev <igor@sysoev.ru> parents: 1322 diff changeset	371
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	372 return NGX_DONE;
521 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
6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	375
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	376 static ngx_int_t
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	377 ngx_mail_pop3_capa(ngx_mail_session_t s, ngx_connection_t c, ngx_int_t stls)
420 33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	378 {
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	379 ngx_mail_pop3_srv_conf_t *pscf;
420 33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	380
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	381 pscf = ngx_mail_get_module_srv_conf(s, ngx_mail_pop3_module);
809 da9c1521319d AUTH PLAIN LOGIN CRAM-MD5 Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	382
1322 27f2299e0d80 SMTP STARTTLS Igor Sysoev <igor@sysoev.ru> parents: 1286 diff changeset	383 #if (NGX_MAIL_SSL)
27f2299e0d80 SMTP STARTTLS Igor Sysoev <igor@sysoev.ru> parents: 1286 diff changeset	384
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	385 if (stls && c->ssl == NULL) {
1704 e584e946e198 move condition declarations inside blocks where they are used Igor Sysoev <igor@sysoev.ru> parents: 1487 diff changeset	386 ngx_mail_ssl_conf_t *sslcf;
e584e946e198 move condition declarations inside blocks where they are used Igor Sysoev <igor@sysoev.ru> parents: 1487 diff changeset	387
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	388 sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
1322 27f2299e0d80 SMTP STARTTLS Igor Sysoev <igor@sysoev.ru> parents: 1286 diff changeset	389
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	390 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	391 s->out = pscf->starttls_capability;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	392 return NGX_OK;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	393 }
809 da9c1521319d AUTH PLAIN LOGIN CRAM-MD5 Igor Sysoev <igor@sysoev.ru> parents: 800 diff changeset	394
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	395 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	396 s->out = pscf->starttls_only_capability;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	397 return NGX_OK;
421 01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	398 }
01456a419cf9 nginx-0.0.10-2004-09-10-18:32:02 import Igor Sysoev <igor@sysoev.ru> parents: 420 diff changeset	399 }
420 33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	400
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	401 #endif
420 33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	402
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	403 s->out = pscf->capability;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	404 return NGX_OK;
417 0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	405 }
0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	406
0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	407
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	408 static ngx_int_t
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	409 ngx_mail_pop3_stls(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	410 {
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	411 #if (NGX_MAIL_SSL)
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	412 ngx_mail_ssl_conf_t *sslcf;
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	413
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	414 if (c->ssl == NULL) {
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	415 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	416 if (sslcf->starttls) {
7838 815c63581be4 Mail: POP3 pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 7790 diff changeset	417 s->buffer->pos = s->buffer->start;
815c63581be4 Mail: POP3 pipelining support. Maxim Dounin <mdounin@mdounin.ru> parents: 7790 diff changeset	418 s->buffer->last = s->buffer->start;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	419 c->read->handler = ngx_mail_starttls_handler;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	420 return NGX_OK;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	421 }
894 4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	422 }
4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	423
4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	424 #endif
4f7dca9c37f0 workaround for Eudora for Mac: it sends Igor Sysoev <igor@sysoev.ru> parents: 884 diff changeset	425
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	426 return NGX_MAIL_PARSE_INVALID_COMMAND;
855 b006f30d6a2f count s->login_attempt for POP3, minimize code Igor Sysoev <igor@sysoev.ru> parents: 851 diff changeset	427 }
b006f30d6a2f count s->login_attempt for POP3, minimize code Igor Sysoev <igor@sysoev.ru> parents: 851 diff changeset	428
b006f30d6a2f count s->login_attempt for POP3, minimize code Igor Sysoev <igor@sysoev.ru> parents: 851 diff changeset	429
521 6f00349b98e5 nginx-0.1.35-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 509 diff changeset	430 static ngx_int_t
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	431 ngx_mail_pop3_apop(ngx_mail_session_t s, ngx_connection_t c)
420 33a8253115b4 nginx-0.0.10-2004-09-09-22:55:39 import Igor Sysoev <igor@sysoev.ru> parents: 419 diff changeset	432 {
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	433 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	434 ngx_mail_pop3_srv_conf_t *pscf;
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	435
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	436 #if (NGX_MAIL_SSL)
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	437 if (ngx_mail_starttls_only(s, c)) {
2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	438 return NGX_MAIL_PARSE_INVALID_COMMAND;
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	439 }
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	440 #endif
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	441
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	442 if (s->args.nelts != 2) {
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	443 return NGX_MAIL_PARSE_INVALID_COMMAND;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	444 }
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	445
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	446 pscf = ngx_mail_get_module_srv_conf(s, ngx_mail_pop3_module);
1472 32450a2bbdf4 decrement active connection counter in mail proxy Igor Sysoev <igor@sysoev.ru> parents: 1323 diff changeset	447
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	448 if (!(pscf->auth_methods & NGX_MAIL_AUTH_APOP_ENABLED)) {
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	449 return NGX_MAIL_PARSE_INVALID_COMMAND;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	450 }
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	451
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	452 arg = s->args.elts;
543 511a89da35ad nginx-0.2.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 541 diff changeset	453
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	454 s->login.len = arg[0].len;
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1704 diff changeset	455 s->login.data = ngx_pnalloc(c->pool, s->login.len);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	456 if (s->login.data == NULL) {
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	457 return NGX_ERROR;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	458 }
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	459
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	460 ngx_memcpy(s->login.data, arg[0].data, s->login.len);
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	461
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	462 s->passwd.len = arg[1].len;
2049 2a92804f4109 ) back out r2040 Igor Sysoev <igor@sysoev.ru>* parents: 1704 diff changeset	463 s->passwd.data = ngx_pnalloc(c->pool, s->passwd.len);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	464 if (s->passwd.data == NULL) {
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	465 return NGX_ERROR;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	466 }
479 c52408583801 nginx-0.1.14-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 444 diff changeset	467
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	468 ngx_memcpy(s->passwd.data, arg[1].data, s->passwd.len);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	469
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	470 ngx_log_debug2(NGX_LOG_DEBUG_MAIL, c->log, 0,
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	471 "pop3 apop: \"%V\" \"%V\"", &s->login, &s->passwd);
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	472
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	473 s->auth_method = NGX_MAIL_AUTH_APOP;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	474
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	475 return NGX_DONE;
417 0526206251f6 nginx-0.0.10-2004-09-07-19:29:22 import Igor Sysoev <igor@sysoev.ru> parents: 415 diff changeset	476 }
539 371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	477
371c1cee100d nginx-0.1.44-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 529 diff changeset	478
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	479 static ngx_int_t
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	480 ngx_mail_pop3_auth(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	481 {
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	482 ngx_int_t rc;
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	483 ngx_mail_pop3_srv_conf_t *pscf;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	484
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	485 #if (NGX_MAIL_SSL)
2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	486 if (ngx_mail_starttls_only(s, c)) {
2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	487 return NGX_MAIL_PARSE_INVALID_COMMAND;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	488 }
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	489 #endif
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	490
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	491 pscf = ngx_mail_get_module_srv_conf(s, ngx_mail_pop3_module);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	492
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	493 if (s->args.nelts == 0) {
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	494 s->out = pscf->auth_capability;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	495 s->state = 0;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	496
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	497 return NGX_OK;
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	498 }
577 4d9ea73a627a nginx-0.3.10-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 569 diff changeset	499
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	500 rc = ngx_mail_auth_parse(s, c);
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	501
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	502 switch (rc) {
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	503
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	504 case NGX_MAIL_AUTH_LOGIN:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	505
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3450 diff changeset	506 ngx_str_set(&s->out, pop3_username);
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	507 s->mail_state = ngx_pop3_auth_login_username;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	508
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	509 return NGX_OK;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	510
2495 a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	511 case NGX_MAIL_AUTH_LOGIN_USERNAME:
a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	512
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3450 diff changeset	513 ngx_str_set(&s->out, pop3_password);
2495 a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	514 s->mail_state = ngx_pop3_auth_login_password;
a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	515
a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	516 return ngx_mail_auth_login_username(s, c, 1);
a59b26eee816 compatibility with Microsoft's Igor Sysoev <igor@sysoev.ru> parents: 2388 diff changeset	517
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	518 case NGX_MAIL_AUTH_PLAIN:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	519
3516 dd1570b6f237 ngx_str_set() and ngx_str_null() Igor Sysoev <igor@sysoev.ru> parents: 3450 diff changeset	520 ngx_str_set(&s->out, pop3_next);
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	521 s->mail_state = ngx_pop3_auth_plain;
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	522
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	523 return NGX_OK;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	524
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	525 case NGX_MAIL_AUTH_CRAM_MD5:
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	526
1487 f69493e8faab ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module Igor Sysoev <igor@sysoev.ru> parents: 1486 diff changeset	527 if (!(pscf->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	528 return NGX_MAIL_PARSE_INVALID_COMMAND;
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	529 }
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	530
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	531 if (ngx_mail_auth_cram_md5_salt(s, c, "+ ", 2) == NGX_OK) {
2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	532 s->mail_state = ngx_pop3_auth_cram_md5;
2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	533 return NGX_OK;
1476 67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	534 }
67578e966dcc split pop3, imap, and smtp handlers Igor Sysoev <igor@sysoev.ru> parents: 1472 diff changeset	535
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	536 return NGX_ERROR;
6774 bcb107bb89cd Mail: support SASL EXTERNAL (RFC 4422). Rob N ★ <robn@fastmail.com> parents: 4499 diff changeset	537
bcb107bb89cd Mail: support SASL EXTERNAL (RFC 4422). Rob N ★ <robn@fastmail.com> parents: 4499 diff changeset	538 case NGX_MAIL_AUTH_EXTERNAL:
bcb107bb89cd Mail: support SASL EXTERNAL (RFC 4422). Rob N ★ <robn@fastmail.com> parents: 4499 diff changeset	539
6869 b2915d99ee8d Mail: make it possible to disable SASL EXTERNAL. Sergey Kandaurov <pluknet@nginx.com> parents: 6774 diff changeset	540 if (!(pscf->auth_methods & NGX_MAIL_AUTH_EXTERNAL_ENABLED)) {
b2915d99ee8d Mail: make it possible to disable SASL EXTERNAL. Sergey Kandaurov <pluknet@nginx.com> parents: 6774 diff changeset	541 return NGX_MAIL_PARSE_INVALID_COMMAND;
b2915d99ee8d Mail: make it possible to disable SASL EXTERNAL. Sergey Kandaurov <pluknet@nginx.com> parents: 6774 diff changeset	542 }
b2915d99ee8d Mail: make it possible to disable SASL EXTERNAL. Sergey Kandaurov <pluknet@nginx.com> parents: 6774 diff changeset	543
6774 bcb107bb89cd Mail: support SASL EXTERNAL (RFC 4422). Rob N ★ <robn@fastmail.com> parents: 4499 diff changeset	544 ngx_str_set(&s->out, pop3_username);
bcb107bb89cd Mail: support SASL EXTERNAL (RFC 4422). Rob N ★ <robn@fastmail.com> parents: 4499 diff changeset	545 s->mail_state = ngx_pop3_auth_external;
bcb107bb89cd Mail: support SASL EXTERNAL (RFC 4422). Rob N ★ <robn@fastmail.com> parents: 4499 diff changeset	546
bcb107bb89cd Mail: support SASL EXTERNAL (RFC 4422). Rob N ★ <robn@fastmail.com> parents: 4499 diff changeset	547 return NGX_OK;
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	548 }
b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	549
1479 2647950e047f optimizations Igor Sysoev <igor@sysoev.ru> parents: 1477 diff changeset	550 return rc;
541 b09ee85d0ac8 nginx-0.1.45-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: 539 diff changeset	551 }

Mercurial > hg > nginx

annotate src/mail/ngx_mail_pop3_handler.c @ 9267:9a5e2296c1be default tip