Skip to content

imapserver: allow empty lines / commands without breaking connection #714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: v2
Choose a base branch
from
Open

imapserver: allow empty lines / commands without breaking connection #714

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a3cc0a
Allow empty lines / commands without breaking connection
mercata Sep 21, 2025
409fe31
Merge branch 'v2' into emptycmd
dejanstrbac Sep 21, 2025
4ae5b8e
Merge branch 'v2' into emptycmd
dejanstrbac Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions imapserver/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,17 @@ func (c *Conn) serve() {
}

func (c *Conn) readCommand(dec *imapwire.Decoder) error {
for {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think using a for loop is necessary, plus it won't behave well regarding the command read timeout. We can just return if we got a CRLF and leave it to the caller to invoke readCommand again.

if dec.EOF() {
return nil
}

if dec.ExpectCRLF() {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Expect family of functions sets the error field in the decoder. Since not getting a CRLF is valid, we should use Decoder.CRLF instead.

continue
}
break
}

var tag, name string
if !dec.ExpectAtom(&tag) || !dec.ExpectSP() || !dec.ExpectAtom(&name) {
return fmt.Errorf("in command: %w", dec.Err())
Expand Down