]> git.kaiwu.me - nginx.git/commit
Mail: fixed handling of invalid SMTP commands split between reads.
authorMaxim Dounin <mdounin@mdounin.ru>
Wed, 19 May 2021 00:13:15 +0000 (03:13 +0300)
committerMaxim Dounin <mdounin@mdounin.ru>
Wed, 19 May 2021 00:13:15 +0000 (03:13 +0300)
commit204f944add09c43223de317451175d5fdb7d1fb0
treea44aa50c82c58cf7cf90084e7e32b982be521411
parent60a5a6f0d37b2e10d8d4aab97b64f4048e99c99a
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.
src/mail/ngx_mail_parse.c