mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-11 17:59:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Mail: don't emit Auth-SSL-Verify with disabled ssl_verify_client.

Browse Source 
Previously, the Auth-SSL-Verify header with the "NONE" value was always passed
to the auth_http script if verification of client certificates is disabled.
This commit is contained in:
Sergey Kandaurov 2015-02-27 16:28:31 +03:00
parent faec547771
commit de3adad807
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mail/ngx_mail_auth_http_module.c
View File

@ -1155,6 +1155,7 @@ ngx_mail_auth_http_create_request(ngx_mail_session_t *s, ngx_pool_t *pool,
ngx_str_t verify, subject, issuer, serial, fingerprint, ngx_str_t verify, subject, issuer, serial, fingerprint,
raw_cert, cert; raw_cert, cert;
ngx_connection_t *c; ngx_connection_t *c;
ngx_mail_ssl_conf_t *sslcf;
#endif #endif
ngx_mail_core_srv_conf_t *cscf; ngx_mail_core_srv_conf_t *cscf;
@ -1169,8 +1170,9 @@ ngx_mail_auth_http_create_request(ngx_mail_session_t *s, ngx_pool_t *pool,
#if (NGX_MAIL_SSL) #if (NGX_MAIL_SSL)
c = s->connection; c = s->connection;
sslcf = ngx_mail_get_module_srv_conf(s, ngx_mail_ssl_module);
if (c->ssl) { if (c->ssl && sslcf->verify) {
/* certificate details */ /* certificate details */
@ -1339,10 +1341,12 @@ ngx_mail_auth_http_create_request(ngx_mail_session_t *s, ngx_pool_t *pool,
b->last = ngx_cpymem(b->last, "Auth-SSL: on" CRLF, b->last = ngx_cpymem(b->last, "Auth-SSL: on" CRLF,
sizeof("Auth-SSL: on" CRLF) - 1); sizeof("Auth-SSL: on" CRLF) - 1);
b->last = ngx_cpymem(b->last, "Auth-SSL-Verify: ", if (verify.len) {
sizeof("Auth-SSL-Verify: ") - 1); b->last = ngx_cpymem(b->last, "Auth-SSL-Verify: ",
b->last = ngx_copy(b->last, verify.data, verify.len); sizeof("Auth-SSL-Verify: ") - 1);
*b->last++ = CR; *b->last++ = LF; b->last = ngx_copy(b->last, verify.data, verify.len);
*b->last++ = CR; *b->last++ = LF;
}
if (subject.len) { if (subject.len) {
b->last = ngx_cpymem(b->last, "Auth-SSL-Subject: ", b->last = ngx_cpymem(b->last, "Auth-SSL-Subject: ",