Mercurial > hg > nginx
view src/core/ngx_syslog.h @ 7836:6a81d96d3733
Mail: fixed handling of invalid SMTP commands split between reads.
Previously, if an invalid SMTP command was split between reads, nginx failed
to wait for LF before returning an error, and interpreted the rest of the
command received later as a separate command.
The sw_invalid state in ngx_mail_smtp_parse_command(), introduced in
04e43d03e153, did not work, since ngx_mail_smtp_auth_state() clears
s->state when returning an error due to NGX_MAIL_PARSE_INVALID_COMMAND.
And not clearing s->state will introduce another problem: the rest
of the command would trigger duplicate error when rest of the command is
received.
Fix is to return NGX_AGAIN from ngx_mail_smtp_parse_command() until full
command is received.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Wed, 19 May 2021 03:13:15 +0300 |
parents | 7f9935f07fe9 |
children | 29adacffdefa |
line wrap: on
line source
/* * Copyright (C) Nginx, Inc. */ #ifndef _NGX_SYSLOG_H_INCLUDED_ #define _NGX_SYSLOG_H_INCLUDED_ typedef struct { ngx_uint_t facility; ngx_uint_t severity; ngx_str_t tag; ngx_addr_t server; ngx_connection_t conn; unsigned busy:1; unsigned nohostname:1; } ngx_syslog_peer_t; char *ngx_syslog_process_conf(ngx_conf_t *cf, ngx_syslog_peer_t *peer); u_char *ngx_syslog_add_header(ngx_syslog_peer_t *peer, u_char *buf); void ngx_syslog_writer(ngx_log_t *log, ngx_uint_t level, u_char *buf, size_t len); ssize_t ngx_syslog_send(ngx_syslog_peer_t *peer, u_char *buf, size_t len); #endif /* _NGX_SYSLOG_H_INCLUDED_ */