Skip to content

fix: Reject CAPABILITY commands that include arguments #300

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
VedantMadane wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Reject CAPABILITY commands that include arguments #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion internal/server/auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,12 @@ func buildCapabilities(deps ServerDeps, isTLS bool) []string {
return capabilities
}

func HandleCapability(deps ServerDeps, conn net.Conn, tag string, state *models.ClientState) {
func HandleCapability(deps ServerDeps, conn net.Conn, tag string, parts []string, state *models.ClientState) {
// RFC 3501: CAPABILITY takes no arguments.
if len(parts) > 2 {
deps.SendResponse(conn, fmt.Sprintf("%s BAD CAPABILITY takes no arguments", tag))
return
}
// Detect TLS: real TLS connection or test mock that advertises TLS
isTLS := false
if _, ok := conn.(*tls.Conn); ok {
Expand Down
2 changes: 1 addition & 1 deletion internal/server/connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ func handleClient(s *IMAPServer, conn net.Conn, state *models.ClientState) {

switch cmd {
case "CAPABILITY":
auth.HandleCapability(s, conn, tag, state)
auth.HandleCapability(s, conn, tag, parts, state)
case "LOGIN":
auth.HandleLogin(s, conn, tag, parts, state)
case "AUTHENTICATE":
Expand Down
2 changes: 1 addition & 1 deletion internal/server/testing_interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func NewTestInterface(server *IMAPServer) *TestInterface {

// HandleCapability exposes the capability handler for testing
func (t *TestInterface) HandleCapability(conn net.Conn, tag string, state *models.ClientState) {
auth.HandleCapability(t.server, conn, tag, state)
auth.HandleCapability(t.server, conn, tag, []string{tag, "CAPABILITY"}, state)
}

// HandleLogin exposes the login handler for testing
Expand Down
Loading