Mirrors/go-inbucket
1
0
Fork 0
mirror of https://github.com/jhillyerd/inbucket.git synced 2025-12-17 17:47:03 +00:00
Code Issues Releases Wiki Activity

smtp: Handle late EHLO, fixes #141

Browse Source
This commit is contained in:
James Hillyerd
2019-08-17 15:46:28 -07:00
parent d8474d56e5
commit 3a1c757d04
2 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/server/smtp/handler.go
View File

@@ -346,6 +346,11 @@ func (s *Session) readyHandler(cmd string, arg string) {
s.logger.Info().Msgf("Mail from: %v", from) s.logger.Info().Msgf("Mail from: %v", from)
s.send(fmt.Sprintf("250 Roger, accepting mail from <%v>", from)) s.send(fmt.Sprintf("250 Roger, accepting mail from <%v>", from))
s.enterState(MAIL) s.enterState(MAIL)
} else if cmd == "EHLO" {
// Reset session
s.logger.Debug().Msgf("Resetting session state on EHLO request")
s.reset()
s.send("250 Session reset")
} else { } else {
s.ooSeq(cmd) s.ooSeq(cmd)
} }
@@ -394,6 +399,12 @@ func (s *Session) mailHandler(cmd string, arg string) {
} }
s.enterState(DATA) s.enterState(DATA)
return return
case "EHLO":
// Reset session
s.logger.Debug().Msgf("Resetting session state on EHLO request")
s.reset()
s.send("250 Session reset")
return
} }
s.ooSeq(cmd) s.ooSeq(cmd)
} }

13
pkg/server/smtp/handler_test.go
View File

@@ -206,6 +206,19 @@ func TestMailState(t *testing.T) {
t.Error(err) t.Error(err)
} }
// Test late EHLO, similar to RSET
script = []scriptStep{
{"EHLO localhost", 250},
{"EHLO localhost", 250},
{"MAIL FROM:<john@gmail.com>", 250},
{"RCPT TO:<u1@gmail.com>", 250},
{"EHLO localhost", 250},
{"MAIL FROM:<john@gmail.com>", 250},
}
if err := playSession(t, server, script); err != nil {
t.Error(err)
}
// Test RSET // Test RSET
script = []scriptStep{ script = []scriptStep{
{"HELO localhost", 250}, {"HELO localhost", 250},