smtpd: disconnect after overlong SMTP commands#22
Open
Komzpa wants to merge 1 commit into
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The normal SMTP command loop currently reads commands through
smtpd_chat_query(), which expands tosmtpd_chat_query_limit(..., var_line_limit). That helper usesSMTP_GET_FLAG_SKIP, so when a client sends an overlong command and keeps the connection open, smtpd keeps draining input after the command is already past the configured line limit.This change makes the normal command reader stop at the line limit, reject the malformed command, and end the session.
smtpd_chat_query_limit()still keeps the old skip behavior for caller-bounded SASL continuation reads.Validation
make makefiles shared=yes dynamicmaps=no CCARGS='-DNO_DB -DNO_NIS' default_database_type=cdb default_cache_db_type=lmdbmake -j32smtp_get_noexcept():SMTP_GET_FLAG_NONEreturned immediately after the 4-byte bound:last=68 len=4 text=ABCDSMTP_GET_FLAG_SKIPwaited for the missing newline and timed out undertimeout 2sgit diff --check