Mercurial > hg > nginx
view src/mail/ngx_mail_smtp_module.h @ 7459:982008fbc4ba
SSL: removed logging of empty "(SSL:)" in ngx_ssl_error().
The "(SSL:)" snippet currently appears in logs when nginx code uses
ngx_ssl_error() to log an error, but OpenSSL's error queue is empty.
This can happen either because the error wasn't in fact from OpenSSL,
or because OpenSSL did not indicate the error in the error queue
for some reason.
In particular, currently "(SSL:)" can be seen in errors at least in
the following cases:
- When SSL_write() fails due to a syscall error,
"[info] ... SSL_write() failed (SSL:) (32: Broken pipe)...".
- When loading a certificate with no data in it,
"[emerg] PEM_read_bio_X509_AUX(...) failed (SSL:)".
This can easily happen due to an additional empty line before
the end line, so all lines of the certificate are interpreted
as header lines.
- When trying to configure an unknown curve,
"[emerg] SSL_CTX_set1_curves_list("foo") failed (SSL:)".
Likely there are other cases as well.
With this change, "(SSL:...)" will be only added to the error message
if there is something in the error queue. This is expected to make
logs more readable in the above cases. Additionally, with this change
it is now possible to use ngx_ssl_error() to log errors when some
of the possible errors are not from OpenSSL and not expected to have
anything in the error queue.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 25 Feb 2019 16:41:15 +0300 |
parents | d620f497c50f |
children |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev * Copyright (C) Nginx, Inc. */ #ifndef _NGX_MAIL_SMTP_MODULE_H_INCLUDED_ #define _NGX_MAIL_SMTP_MODULE_H_INCLUDED_ #include <ngx_config.h> #include <ngx_core.h> #include <ngx_mail.h> #include <ngx_mail_smtp_module.h> typedef struct { ngx_msec_t greeting_delay; size_t client_buffer_size; ngx_str_t capability; ngx_str_t starttls_capability; ngx_str_t starttls_only_capability; ngx_str_t server_name; ngx_str_t greeting; ngx_uint_t auth_methods; ngx_array_t capabilities; } ngx_mail_smtp_srv_conf_t; void ngx_mail_smtp_init_session(ngx_mail_session_t *s, ngx_connection_t *c); void ngx_mail_smtp_init_protocol(ngx_event_t *rev); void ngx_mail_smtp_auth_state(ngx_event_t *rev); ngx_int_t ngx_mail_smtp_parse_command(ngx_mail_session_t *s); extern ngx_module_t ngx_mail_smtp_module; #endif /* _NGX_MAIL_SMTP_MODULE_H_INCLUDED_ */