Mercurial > hg > nginx
annotate src/mail/ngx_mail_smtp_module.c @ 6768:d9c180fcbfa7 stable-1.10
Event pipe: do not set file's thread_handler if not needed.
This fixes a problem with aio threads and sendfile with aio_write switched
off, as observed with range requests after fc72784b1f52 (1.9.13). Potential
problems with sendfile in threads were previously described in 9fd738b85fad,
and this seems to be one of them.
The problem occurred as file's thread_handler was set to NULL by event pipe
code after a sendfile thread task was scheduled. As a result, no sendfile
completion code was executed, and the same buffer was additionally sent
using non-threaded sendfile. Fix is to avoid modifying file's thread_handler
if aio_write is switched off.
Note that with "aio_write on" it is still possible that sendfile will use
thread_handler as set by event pipe. This is believed to be safe though,
as handlers used are compatible.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Thu, 01 Sep 2016 20:05:23 +0300 |
| parents | ec01b1d1fff1 |
| children | bcb107bb89cd |
| rev | line source |
|---|---|
| 521 | 1 |
| 2 /* | |
| 3 * Copyright (C) Igor Sysoev | |
| 4412 | 4 * Copyright (C) Nginx, Inc. |
| 521 | 5 */ |
| 6 | |
| 7 | |
| 8 #include <ngx_config.h> | |
| 9 #include <ngx_core.h> | |
| 10 #include <ngx_event.h> | |
| 1136 | 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:
1481
diff
changeset
|
12 #include <ngx_mail_smtp_module.h> |
| 521 | 13 |
| 14 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
15 static void *ngx_mail_smtp_create_srv_conf(ngx_conf_t *cf); |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
16 static char *ngx_mail_smtp_merge_srv_conf(ngx_conf_t *cf, void *parent, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
17 void *child); |
| 527 | 18 |
| 19 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
20 static ngx_conf_bitmask_t ngx_mail_smtp_auth_methods[] = { |
| 1323 | 21 { ngx_string("plain"), NGX_MAIL_AUTH_PLAIN_ENABLED }, |
| 22 { ngx_string("login"), NGX_MAIL_AUTH_LOGIN_ENABLED }, | |
| 23 { ngx_string("cram-md5"), NGX_MAIL_AUTH_CRAM_MD5_ENABLED }, | |
| 2309 | 24 { ngx_string("none"), NGX_MAIL_AUTH_NONE_ENABLED }, |
| 1323 | 25 { ngx_null_string, 0 } |
| 26 }; | |
| 27 | |
| 28 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
29 static ngx_str_t ngx_mail_smtp_auth_methods_names[] = { |
|
1174
6be5ee17d80b
style fix: remove trailing spaces
Igor Sysoev <igor@sysoev.ru>
parents:
1136
diff
changeset
|
30 ngx_string("PLAIN"), |
| 1136 | 31 ngx_string("LOGIN"), |
| 32 ngx_null_string, /* APOP */ | |
| 2309 | 33 ngx_string("CRAM-MD5"), |
| 34 ngx_null_string /* NONE */ | |
| 1136 | 35 }; |
| 36 | |
| 37 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
38 static ngx_mail_protocol_t ngx_mail_smtp_protocol = { |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
39 ngx_string("smtp"), |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
40 { 25, 465, 587, 0 }, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
41 NGX_MAIL_SMTP_PROTOCOL, |
| 809 | 42 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
43 ngx_mail_smtp_init_session, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
44 ngx_mail_smtp_init_protocol, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
45 ngx_mail_smtp_parse_command, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
46 ngx_mail_smtp_auth_state, |
| 809 | 47 |
|
5989
ec01b1d1fff1
Mail: client SSL certificates support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5400
diff
changeset
|
48 ngx_string("451 4.3.2 Internal server error" CRLF), |
|
ec01b1d1fff1
Mail: client SSL certificates support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5400
diff
changeset
|
49 ngx_string("421 4.7.1 SSL certificate error" CRLF), |
|
ec01b1d1fff1
Mail: client SSL certificates support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5400
diff
changeset
|
50 ngx_string("421 4.7.1 No required SSL certificate" CRLF) |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
51 }; |
| 809 | 52 |
| 53 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
54 static ngx_command_t ngx_mail_smtp_commands[] = { |
| 521 | 55 |
|
1481
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
56 { ngx_string("smtp_client_buffer"), |
|
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
57 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, |
|
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
58 ngx_conf_set_size_slot, |
|
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
59 NGX_MAIL_SRV_CONF_OFFSET, |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
60 offsetof(ngx_mail_smtp_srv_conf_t, client_buffer_size), |
|
1481
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
61 NULL }, |
|
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
62 |
|
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
63 { ngx_string("smtp_greeting_delay"), |
|
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
64 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, |
|
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
65 ngx_conf_set_msec_slot, |
|
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
66 NGX_MAIL_SRV_CONF_OFFSET, |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
67 offsetof(ngx_mail_smtp_srv_conf_t, greeting_delay), |
| 1136 | 68 NULL }, |
| 69 | |
| 70 { ngx_string("smtp_capabilities"), | |
| 71 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_1MORE, | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
72 ngx_mail_capabilities, |
| 1136 | 73 NGX_MAIL_SRV_CONF_OFFSET, |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
74 offsetof(ngx_mail_smtp_srv_conf_t, capabilities), |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
75 NULL }, |
| 1323 | 76 |
| 1136 | 77 { ngx_string("smtp_auth"), |
| 78 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_1MORE, | |
| 79 ngx_conf_set_bitmask_slot, | |
| 80 NGX_MAIL_SRV_CONF_OFFSET, | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
81 offsetof(ngx_mail_smtp_srv_conf_t, auth_methods), |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
82 &ngx_mail_smtp_auth_methods }, |
| 800 | 83 |
| 521 | 84 ngx_null_command |
| 85 }; | |
| 86 | |
| 87 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
88 static ngx_mail_module_t ngx_mail_smtp_module_ctx = { |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
89 &ngx_mail_smtp_protocol, /* protocol */ |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
90 |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
91 NULL, /* create main configuration */ |
| 521 | 92 NULL, /* init main configuration */ |
| 93 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
94 ngx_mail_smtp_create_srv_conf, /* create server configuration */ |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
95 ngx_mail_smtp_merge_srv_conf /* merge server configuration */ |
| 521 | 96 }; |
| 97 | |
| 98 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
99 ngx_module_t ngx_mail_smtp_module = { |
| 521 | 100 NGX_MODULE_V1, |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
101 &ngx_mail_smtp_module_ctx, /* module context */ |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
102 ngx_mail_smtp_commands, /* module directives */ |
| 1136 | 103 NGX_MAIL_MODULE, /* module type */ |
| 541 | 104 NULL, /* init master */ |
| 521 | 105 NULL, /* init module */ |
| 541 | 106 NULL, /* init process */ |
| 107 NULL, /* init thread */ | |
| 108 NULL, /* exit thread */ | |
| 109 NULL, /* exit process */ | |
| 110 NULL, /* exit master */ | |
| 111 NGX_MODULE_V1_PADDING | |
| 521 | 112 }; |
| 113 | |
| 114 | |
| 115 static void * | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
116 ngx_mail_smtp_create_srv_conf(ngx_conf_t *cf) |
| 577 | 117 { |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
118 ngx_mail_smtp_srv_conf_t *sscf; |
| 641 | 119 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
120 sscf = ngx_pcalloc(cf->pool, sizeof(ngx_mail_smtp_srv_conf_t)); |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
121 if (sscf == NULL) { |
| 527 | 122 return NULL; |
| 521 | 123 } |
| 124 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
125 sscf->client_buffer_size = NGX_CONF_UNSET_SIZE; |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
126 sscf->greeting_delay = NGX_CONF_UNSET_MSEC; |
| 521 | 127 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
128 if (ngx_array_init(&sscf->capabilities, cf->pool, 4, sizeof(ngx_str_t)) |
| 1136 | 129 != NGX_OK) |
| 130 { | |
| 131 return NULL; | |
| 132 } | |
| 133 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
134 return sscf; |
| 521 | 135 } |
| 136 | |
| 137 | |
| 138 static char * | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
139 ngx_mail_smtp_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) |
| 521 | 140 { |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
141 ngx_mail_smtp_srv_conf_t *prev = parent; |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
142 ngx_mail_smtp_srv_conf_t *conf = child; |
| 521 | 143 |
| 2309 | 144 u_char *p, *auth, *last; |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
145 size_t size; |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
146 ngx_str_t *c; |
| 2309 | 147 ngx_uint_t i, m, auth_enabled; |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
148 ngx_mail_core_srv_conf_t *cscf; |
| 527 | 149 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
150 ngx_conf_merge_size_value(conf->client_buffer_size, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
151 prev->client_buffer_size, |
|
1481
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
152 (size_t) ngx_pagesize); |
|
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
153 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
154 ngx_conf_merge_msec_value(conf->greeting_delay, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
155 prev->greeting_delay, 0); |
| 521 | 156 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
157 ngx_conf_merge_bitmask_value(conf->auth_methods, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
158 prev->auth_methods, |
|
1481
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
159 (NGX_CONF_BITMASK_SET |
|
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
160 |NGX_MAIL_AUTH_PLAIN_ENABLED |
|
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
161 |NGX_MAIL_AUTH_LOGIN_ENABLED)); |
| 800 | 162 |
| 163 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
164 cscf = ngx_mail_conf_get_module_srv_conf(cf, ngx_mail_core_module); |
| 527 | 165 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
166 size = sizeof("220 ESMTP ready" CRLF) - 1 + cscf->server_name.len; |
| 809 | 167 |
| 2049 | 168 p = ngx_pnalloc(cf->pool, size); |
| 583 | 169 if (p == NULL) { |
| 527 | 170 return NGX_CONF_ERROR; |
| 171 } | |
| 172 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
173 conf->greeting.len = size; |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
174 conf->greeting.data = p; |
| 527 | 175 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
176 *p++ = '2'; *p++ = '2'; *p++ = '0'; *p++ = ' '; |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
177 p = ngx_cpymem(p, cscf->server_name.data, cscf->server_name.len); |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
178 ngx_memcpy(p, " ESMTP ready" CRLF, sizeof(" ESMTP ready" CRLF) - 1); |
| 583 | 179 |
| 180 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
181 size = sizeof("250 " CRLF) - 1 + cscf->server_name.len; |
| 527 | 182 |
| 2049 | 183 p = ngx_pnalloc(cf->pool, size); |
| 583 | 184 if (p == NULL) { |
| 185 return NGX_CONF_ERROR; | |
| 186 } | |
| 187 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
188 conf->server_name.len = size; |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
189 conf->server_name.data = p; |
| 583 | 190 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
191 *p++ = '2'; *p++ = '5'; *p++ = '0'; *p++ = ' '; |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
192 p = ngx_cpymem(p, cscf->server_name.data, cscf->server_name.len); |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
193 *p++ = CR; *p = LF; |
| 527 | 194 |
| 195 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
196 if (conf->capabilities.nelts == 0) { |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
197 conf->capabilities = prev->capabilities; |
| 1136 | 198 } |
| 199 | |
| 2309 | 200 size = sizeof("250-") - 1 + cscf->server_name.len + sizeof(CRLF) - 1; |
| 1136 | 201 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
202 c = conf->capabilities.elts; |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
203 for (i = 0; i < conf->capabilities.nelts; i++) { |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
204 size += sizeof("250 ") - 1 + c[i].len + sizeof(CRLF) - 1; |
| 527 | 205 } |
| 206 | |
| 2309 | 207 auth_enabled = 0; |
| 208 | |
| 1323 | 209 for (m = NGX_MAIL_AUTH_PLAIN_ENABLED, i = 0; |
| 210 m <= NGX_MAIL_AUTH_CRAM_MD5_ENABLED; | |
| 211 m <<= 1, i++) | |
| 212 { | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
213 if (m & conf->auth_methods) { |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
214 size += 1 + ngx_mail_smtp_auth_methods_names[i].len; |
| 2309 | 215 auth_enabled = 1; |
| 1323 | 216 } |
| 217 } | |
| 218 | |
| 2309 | 219 if (auth_enabled) { |
| 220 size += sizeof("250 AUTH") - 1 + sizeof(CRLF) - 1; | |
| 221 } | |
| 222 | |
| 2049 | 223 p = ngx_pnalloc(cf->pool, size); |
| 583 | 224 if (p == NULL) { |
| 225 return NGX_CONF_ERROR; | |
| 226 } | |
| 227 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
228 conf->capability.len = size; |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
229 conf->capability.data = p; |
| 1136 | 230 |
| 2309 | 231 last = p; |
| 232 | |
| 1136 | 233 *p++ = '2'; *p++ = '5'; *p++ = '0'; *p++ = '-'; |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
234 p = ngx_cpymem(p, cscf->server_name.data, cscf->server_name.len); |
| 1136 | 235 *p++ = CR; *p++ = LF; |
| 236 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
237 for (i = 0; i < conf->capabilities.nelts; i++) { |
| 2309 | 238 last = p; |
| 1136 | 239 *p++ = '2'; *p++ = '5'; *p++ = '0'; *p++ = '-'; |
| 240 p = ngx_cpymem(p, c[i].data, c[i].len); | |
| 241 *p++ = CR; *p++ = LF; | |
| 242 } | |
| 243 | |
| 1322 | 244 auth = p; |
| 245 | |
| 2309 | 246 if (auth_enabled) { |
| 247 last = p; | |
| 248 | |
| 249 *p++ = '2'; *p++ = '5'; *p++ = '0'; *p++ = ' '; | |
| 250 *p++ = 'A'; *p++ = 'U'; *p++ = 'T'; *p++ = 'H'; | |
| 1136 | 251 |
| 2309 | 252 for (m = NGX_MAIL_AUTH_PLAIN_ENABLED, i = 0; |
| 253 m <= NGX_MAIL_AUTH_CRAM_MD5_ENABLED; | |
| 254 m <<= 1, i++) | |
| 255 { | |
| 256 if (m & conf->auth_methods) { | |
| 257 *p++ = ' '; | |
| 258 p = ngx_cpymem(p, ngx_mail_smtp_auth_methods_names[i].data, | |
| 259 ngx_mail_smtp_auth_methods_names[i].len); | |
| 260 } | |
| 1136 | 261 } |
| 2309 | 262 |
| 263 *p++ = CR; *p = LF; | |
| 1136 | 264 |
| 2309 | 265 } else { |
| 266 last[3] = ' '; | |
| 267 } | |
| 1136 | 268 |
| 1322 | 269 size += sizeof("250 STARTTLS" CRLF) - 1; |
| 270 | |
| 2049 | 271 p = ngx_pnalloc(cf->pool, size); |
| 1322 | 272 if (p == NULL) { |
| 273 return NGX_CONF_ERROR; | |
| 274 } | |
| 275 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
276 conf->starttls_capability.len = size; |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
277 conf->starttls_capability.data = p; |
| 1322 | 278 |
| 2309 | 279 p = ngx_cpymem(p, conf->capability.data, conf->capability.len); |
| 1322 | 280 |
| 281 p = ngx_cpymem(p, "250 STARTTLS" CRLF, sizeof("250 STARTTLS" CRLF) - 1); | |
| 282 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
283 p = conf->starttls_capability.data |
| 2309 | 284 + (last - conf->capability.data) + 3; |
| 1322 | 285 *p = '-'; |
| 286 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
287 size = (auth - conf->capability.data) |
| 1322 | 288 + sizeof("250 STARTTLS" CRLF) - 1; |
| 289 | |
| 2049 | 290 p = ngx_pnalloc(cf->pool, size); |
| 1322 | 291 if (p == NULL) { |
| 292 return NGX_CONF_ERROR; | |
| 293 } | |
| 294 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
295 conf->starttls_only_capability.len = size; |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
296 conf->starttls_only_capability.data = p; |
| 1322 | 297 |
| 2309 | 298 p = ngx_cpymem(p, conf->capability.data, auth - conf->capability.data); |
| 1322 | 299 |
| 300 ngx_memcpy(p, "250 STARTTLS" CRLF, sizeof("250 STARTTLS" CRLF) - 1); | |
| 301 | |
| 2309 | 302 if (last < auth) { |
| 303 p = conf->starttls_only_capability.data | |
| 304 + (last - conf->capability.data) + 3; | |
| 305 *p = '-'; | |
| 306 } | |
| 307 | |
| 521 | 308 return NGX_CONF_OK; |
| 309 } |