Mercurial > hg > nginx
annotate src/mail/ngx_mail_imap_module.c @ 6774:bcb107bb89cd
Mail: support SASL EXTERNAL (RFC 4422).
This is needed to allow TLS client certificate auth to work. With
ssl_verify_client configured, the auth daemon can choose to allow the
connection to proceed based on the certificate data.
This has been tested with Thunderbird for IMAP only. I've not yet found a
client that will do client certificate auth for POP3 or SMTP, and the method is
not really documented anywhere that I can find. That said, its simple enough
that the way I've done is probably right.
| author | Rob N ★ <robn@fastmail.com> |
|---|---|
| date | Sat, 08 Oct 2016 18:05:00 +1100 |
| parents | ec01b1d1fff1 |
| children | dc955d274130 |
| 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_imap_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_imap_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_imap_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); |
| 521 | 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_str_t ngx_mail_imap_default_capabilities[] = { |
| 527 | 21 ngx_string("IMAP4"), |
| 22 ngx_string("IMAP4rev1"), | |
| 23 ngx_string("UIDPLUS"), | |
| 24 ngx_null_string | |
| 25 }; | |
| 26 | |
| 27 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
28 static ngx_conf_bitmask_t ngx_mail_imap_auth_methods[] = { |
| 1323 | 29 { ngx_string("plain"), NGX_MAIL_AUTH_PLAIN_ENABLED }, |
| 30 { ngx_string("login"), NGX_MAIL_AUTH_LOGIN_ENABLED }, | |
| 31 { ngx_string("cram-md5"), NGX_MAIL_AUTH_CRAM_MD5_ENABLED }, | |
|
6774
bcb107bb89cd
Mail: support SASL EXTERNAL (RFC 4422).
Rob N ★ <robn@fastmail.com>
parents:
5989
diff
changeset
|
32 { ngx_string("external"), NGX_MAIL_AUTH_EXTERNAL_ENABLED }, |
| 1323 | 33 { ngx_null_string, 0 } |
| 34 }; | |
| 35 | |
| 36 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
37 static ngx_str_t ngx_mail_imap_auth_methods_names[] = { |
| 1323 | 38 ngx_string("AUTH=PLAIN"), |
| 39 ngx_string("AUTH=LOGIN"), | |
| 40 ngx_null_string, /* APOP */ | |
| 2309 | 41 ngx_string("AUTH=CRAM-MD5"), |
|
6774
bcb107bb89cd
Mail: support SASL EXTERNAL (RFC 4422).
Rob N ★ <robn@fastmail.com>
parents:
5989
diff
changeset
|
42 ngx_string("AUTH=EXTERNAL"), |
| 2309 | 43 ngx_null_string /* NONE */ |
| 1323 | 44 }; |
| 45 | |
| 46 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
47 static ngx_mail_protocol_t ngx_mail_imap_protocol = { |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
48 ngx_string("imap"), |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
49 { 143, 993, 0, 0 }, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
50 NGX_MAIL_IMAP_PROTOCOL, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
51 |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
52 ngx_mail_imap_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
|
53 ngx_mail_imap_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
|
54 ngx_mail_imap_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
|
55 ngx_mail_imap_auth_state, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
56 |
|
5989
ec01b1d1fff1
Mail: client SSL certificates support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
57 ngx_string("* BAD internal server error" CRLF), |
|
ec01b1d1fff1
Mail: client SSL certificates support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
58 ngx_string("* BYE SSL certificate error" CRLF), |
|
ec01b1d1fff1
Mail: client SSL certificates support.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4412
diff
changeset
|
59 ngx_string("* BYE No required SSL certificate" CRLF) |
| 1136 | 60 }; |
| 61 | |
| 62 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
63 static ngx_command_t ngx_mail_imap_commands[] = { |
| 521 | 64 |
| 65 { ngx_string("imap_client_buffer"), | |
| 1136 | 66 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_TAKE1, |
| 521 | 67 ngx_conf_set_size_slot, |
| 1136 | 68 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
|
69 offsetof(ngx_mail_imap_srv_conf_t, client_buffer_size), |
| 527 | 70 NULL }, |
| 71 | |
| 72 { ngx_string("imap_capabilities"), | |
| 1136 | 73 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
|
74 ngx_mail_capabilities, |
| 1136 | 75 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
|
76 offsetof(ngx_mail_imap_srv_conf_t, capabilities), |
| 800 | 77 NULL }, |
| 78 | |
| 1323 | 79 { ngx_string("imap_auth"), |
| 80 NGX_MAIL_MAIN_CONF|NGX_MAIL_SRV_CONF|NGX_CONF_1MORE, | |
| 81 ngx_conf_set_bitmask_slot, | |
| 82 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
|
83 offsetof(ngx_mail_imap_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
|
84 &ngx_mail_imap_auth_methods }, |
| 800 | 85 |
| 521 | 86 ngx_null_command |
| 87 }; | |
| 88 | |
| 89 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
90 static ngx_mail_module_t ngx_mail_imap_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
|
91 &ngx_mail_imap_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
|
92 |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
93 NULL, /* create main configuration */ |
| 521 | 94 NULL, /* init main configuration */ |
| 95 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
96 ngx_mail_imap_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
|
97 ngx_mail_imap_merge_srv_conf /* merge server configuration */ |
| 521 | 98 }; |
| 99 | |
| 100 | |
|
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_module_t ngx_mail_imap_module = { |
| 521 | 102 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
|
103 &ngx_mail_imap_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
|
104 ngx_mail_imap_commands, /* module directives */ |
| 1136 | 105 NGX_MAIL_MODULE, /* module type */ |
| 541 | 106 NULL, /* init master */ |
| 521 | 107 NULL, /* init module */ |
| 541 | 108 NULL, /* init process */ |
| 109 NULL, /* init thread */ | |
| 110 NULL, /* exit thread */ | |
| 111 NULL, /* exit process */ | |
| 112 NULL, /* exit master */ | |
| 113 NGX_MODULE_V1_PADDING | |
| 521 | 114 }; |
| 115 | |
| 116 | |
| 117 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
|
118 ngx_mail_imap_create_srv_conf(ngx_conf_t *cf) |
| 577 | 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 ngx_mail_imap_srv_conf_t *iscf; |
| 641 | 121 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
122 iscf = ngx_pcalloc(cf->pool, sizeof(ngx_mail_imap_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
|
123 if (iscf == NULL) { |
| 527 | 124 return NULL; |
| 521 | 125 } |
| 126 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
127 iscf->client_buffer_size = NGX_CONF_UNSET_SIZE; |
| 521 | 128 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
129 if (ngx_array_init(&iscf->capabilities, cf->pool, 4, sizeof(ngx_str_t)) |
| 1136 | 130 != NGX_OK) |
| 131 { | |
| 132 return NULL; | |
| 133 } | |
| 134 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
135 return iscf; |
| 521 | 136 } |
| 137 | |
| 138 | |
| 139 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
|
140 ngx_mail_imap_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) |
| 521 | 141 { |
|
1487
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_imap_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
|
143 ngx_mail_imap_srv_conf_t *conf = child; |
| 521 | 144 |
| 1322 | 145 u_char *p, *auth; |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
146 size_t size; |
| 527 | 147 ngx_str_t *c, *d; |
| 1136 | 148 ngx_uint_t i, m; |
| 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_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
|
155 prev->auth_methods, |
|
1481
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
156 (NGX_CONF_BITMASK_SET |
|
b58ce1cf66da
smtp_client_buffer and smtp_greeting_delay
Igor Sysoev <igor@sysoev.ru>
parents:
1323
diff
changeset
|
157 |NGX_MAIL_AUTH_PLAIN_ENABLED)); |
| 1323 | 158 |
| 800 | 159 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
160 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
|
161 conf->capabilities = prev->capabilities; |
| 527 | 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 if (conf->capabilities.nelts == 0) { |
| 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 for (d = ngx_mail_imap_default_capabilities; d->len; d++) { |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
167 c = ngx_array_push(&conf->capabilities); |
| 527 | 168 if (c == NULL) { |
| 169 return NGX_CONF_ERROR; | |
| 170 } | |
| 171 | |
| 172 *c = *d; | |
| 173 } | |
| 174 } | |
| 175 | |
| 1136 | 176 size = sizeof("* CAPABILITY" CRLF) - 1; |
| 527 | 177 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
178 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
|
179 for (i = 0; i < conf->capabilities.nelts; i++) { |
| 527 | 180 size += 1 + c[i].len; |
| 181 } | |
| 182 | |
| 1323 | 183 for (m = NGX_MAIL_AUTH_PLAIN_ENABLED, i = 0; |
|
6774
bcb107bb89cd
Mail: support SASL EXTERNAL (RFC 4422).
Rob N ★ <robn@fastmail.com>
parents:
5989
diff
changeset
|
184 m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED; |
| 1323 | 185 m <<= 1, i++) |
| 186 { | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
187 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
|
188 size += 1 + ngx_mail_imap_auth_methods_names[i].len; |
| 1323 | 189 } |
| 190 } | |
| 191 | |
| 2049 | 192 p = ngx_pnalloc(cf->pool, size); |
| 583 | 193 if (p == NULL) { |
| 194 return NGX_CONF_ERROR; | |
| 195 } | |
| 196 | |
|
1487
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->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
|
198 conf->capability.data = p; |
| 583 | 199 |
| 200 p = ngx_cpymem(p, "* CAPABILITY", sizeof("* CAPABILITY") - 1); | |
| 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 for (i = 0; i < conf->capabilities.nelts; i++) { |
| 583 | 203 *p++ = ' '; |
| 204 p = ngx_cpymem(p, c[i].data, c[i].len); | |
| 205 } | |
| 206 | |
| 1323 | 207 auth = p; |
| 208 | |
| 209 for (m = NGX_MAIL_AUTH_PLAIN_ENABLED, i = 0; | |
|
6774
bcb107bb89cd
Mail: support SASL EXTERNAL (RFC 4422).
Rob N ★ <robn@fastmail.com>
parents:
5989
diff
changeset
|
210 m <= NGX_MAIL_AUTH_EXTERNAL_ENABLED; |
| 1323 | 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) { |
| 1323 | 214 *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
|
215 p = ngx_cpymem(p, ngx_mail_imap_auth_methods_names[i].data, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
216 ngx_mail_imap_auth_methods_names[i].len); |
| 1323 | 217 } |
| 218 } | |
| 219 | |
| 583 | 220 *p++ = CR; *p = LF; |
| 221 | |
| 222 | |
| 223 size += sizeof(" STARTTLS") - 1; | |
| 224 | |
| 2049 | 225 p = ngx_pnalloc(cf->pool, size); |
| 583 | 226 if (p == NULL) { |
| 527 | 227 return NGX_CONF_ERROR; |
| 228 } | |
| 229 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
230 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
|
231 conf->starttls_capability.data = p; |
| 527 | 232 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
233 p = ngx_cpymem(p, conf->capability.data, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
234 conf->capability.len - (sizeof(CRLF) - 1)); |
| 583 | 235 p = ngx_cpymem(p, " STARTTLS", sizeof(" STARTTLS") - 1); |
| 236 *p++ = CR; *p = LF; | |
| 237 | |
| 238 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
239 size = (auth - conf->capability.data) + sizeof(CRLF) - 1 |
| 1323 | 240 + sizeof(" STARTTLS LOGINDISABLED") - 1; |
| 583 | 241 |
| 2049 | 242 p = ngx_pnalloc(cf->pool, size); |
| 583 | 243 if (p == NULL) { |
| 244 return NGX_CONF_ERROR; | |
| 527 | 245 } |
| 246 | |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
247 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
|
248 conf->starttls_only_capability.data = p; |
| 527 | 249 |
|
1487
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
250 p = ngx_cpymem(p, conf->capability.data, |
|
f69493e8faab
ngx_mail_pop3_module, ngx_mail_imap_module, and ngx_mail_smtp_module
Igor Sysoev <igor@sysoev.ru>
parents:
1481
diff
changeset
|
251 auth - conf->capability.data); |
| 1323 | 252 p = ngx_cpymem(p, " STARTTLS LOGINDISABLED", |
| 253 sizeof(" STARTTLS LOGINDISABLED") - 1); | |
| 583 | 254 *p++ = CR; *p = LF; |
| 255 | |
| 521 | 256 return NGX_CONF_OK; |
| 257 } |