-
Notifications
You must be signed in to change notification settings - Fork 229
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
server: Implement per-recipient status for LMTP
A separate interface is used so backend implementation will be aware of LMTP usage. This also avoids clutter in simple backend implementations that don't support LMTP. RFC 2033 (Section 4.2) says that we should send multiple status lines if the same address was specified multiple times. We move responsibility of doing this to the backend implementation and don't do any deduplication themselves. This allows transparent forwarding for LMTP to be implemented correctly.
- Loading branch information
Showing
4 changed files
with
358 additions
and
72 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,197 @@ | ||
| package smtp_test | ||
|
|
||
| import ( | ||
| "bufio" | ||
| "errors" | ||
| "io" | ||
| "strings" | ||
| "testing" | ||
|
|
||
| "github.com/emersion/go-smtp" | ||
| ) | ||
|
|
||
| func sendDeliveryCmdsLMTP(t *testing.T, scanner *bufio.Scanner, c io.Writer) { | ||
| sendLHLO(t, scanner, c) | ||
|
|
||
| io.WriteString(c, "MAIL FROM:<[email protected]>\r\n") | ||
| scanner.Scan() | ||
| io.WriteString(c, "RCPT TO:<[email protected]>\r\n") | ||
| scanner.Scan() | ||
| io.WriteString(c, "RCPT TO:<[email protected]>\r\n") | ||
| scanner.Scan() | ||
| io.WriteString(c, "DATA\r\n") | ||
| scanner.Scan() | ||
| io.WriteString(c, "Hey <3\r\n") | ||
| io.WriteString(c, ".\r\n") | ||
| } | ||
|
|
||
| func sendLHLO(t *testing.T, scanner *bufio.Scanner, c io.Writer) { | ||
| io.WriteString(c, "LHLO localhost\r\n") | ||
| scanner.Scan() | ||
| if scanner.Text() != "250-Hello localhost" { | ||
| t.Fatal("Invalid LHLO response:", scanner.Text()) | ||
| } | ||
| for scanner.Scan() { | ||
| s := scanner.Text() | ||
|
|
||
| if strings.HasPrefix(s, "250 ") { | ||
| break | ||
| } else if !strings.HasPrefix(s, "250-") { | ||
| t.Fatal("Invalid capability response:", s) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func TestServer_LMTP(t *testing.T) { | ||
| be, s, c, scanner := testServerGreeted(t, func(s *smtp.Server) { | ||
| s.LMTP = true | ||
| be := s.Backend.(*backend) | ||
| be.implementLMTPData = true | ||
| be.lmtpStatus = []struct { | ||
| addr string | ||
| err error | ||
| }{ | ||
| {"[email protected]", errors.New("nah")}, | ||
| {"[email protected]", nil}, | ||
| } | ||
| }) | ||
| defer s.Close() | ||
| defer c.Close() | ||
|
|
||
| sendDeliveryCmdsLMTP(t, scanner, c) | ||
|
|
||
| scanner.Scan() | ||
| if !strings.HasPrefix(scanner.Text(), "554 5.0.0 <[email protected]>") { | ||
| t.Fatal("Invalid DATA first response:", scanner.Text()) | ||
| } | ||
| scanner.Scan() | ||
| if !strings.HasPrefix(scanner.Text(), "250 ") { | ||
| t.Fatal("Invalid DATA second response:", scanner.Text()) | ||
| } | ||
|
|
||
| if len(be.messages) != 0 || len(be.anonmsgs) != 1 { | ||
| t.Fatal("Invalid number of sent messages:", be.messages, be.anonmsgs) | ||
| } | ||
| } | ||
|
|
||
| func TestServer_LMTP_Early(t *testing.T) { | ||
| // This test confirms responses are sent as early as possible | ||
| // e.g. right after SetStatus is called. | ||
|
|
||
| lmtpStatusSync := make(chan struct{}) | ||
|
|
||
| be, s, c, scanner := testServerGreeted(t, func(s *smtp.Server) { | ||
| s.LMTP = true | ||
| be := s.Backend.(*backend) | ||
| be.implementLMTPData = true | ||
| be.lmtpStatusSync = lmtpStatusSync | ||
| be.lmtpStatus = []struct { | ||
| addr string | ||
| err error | ||
| }{ | ||
| {"[email protected]", errors.New("nah")}, | ||
| {"[email protected]", nil}, | ||
| } | ||
| }) | ||
| defer s.Close() | ||
| defer c.Close() | ||
|
|
||
| sendDeliveryCmdsLMTP(t, scanner, c) | ||
|
|
||
| // Test backend sends to sync channel after calling SetStatus. | ||
|
|
||
| scanner.Scan() | ||
| if !strings.HasPrefix(scanner.Text(), "554 5.0.0 <[email protected]>") { | ||
| t.Fatal("Invalid DATA first response:", scanner.Text()) | ||
| } | ||
|
|
||
| <-be.lmtpStatusSync | ||
|
|
||
| scanner.Scan() | ||
| if !strings.HasPrefix(scanner.Text(), "250 ") { | ||
| t.Fatal("Invalid DATA second response:", scanner.Text()) | ||
| } | ||
|
|
||
| <-be.lmtpStatusSync | ||
|
|
||
| if len(be.messages) != 0 || len(be.anonmsgs) != 1 { | ||
| t.Fatal("Invalid number of sent messages:", be.messages, be.anonmsgs) | ||
| } | ||
| } | ||
|
|
||
| func TestServer_LMTP_Expand(t *testing.T) { | ||
| // This checks whether handleDataLMTP | ||
| // correctly expands results if backend doesn't | ||
| // implement LMTPSession. | ||
|
|
||
| be, s, c, scanner := testServerGreeted(t, func(s *smtp.Server) { | ||
| s.LMTP = true | ||
| }) | ||
| defer s.Close() | ||
| defer c.Close() | ||
|
|
||
| sendDeliveryCmdsLMTP(t, scanner, c) | ||
|
|
||
| scanner.Scan() | ||
| if !strings.HasPrefix(scanner.Text(), "250 ") { | ||
| t.Fatal("Invalid DATA first response:", scanner.Text()) | ||
| } | ||
| scanner.Scan() | ||
| if !strings.HasPrefix(scanner.Text(), "250 ") { | ||
| t.Fatal("Invalid DATA second response:", scanner.Text()) | ||
| } | ||
|
|
||
| if len(be.messages) != 0 || len(be.anonmsgs) != 1 { | ||
| t.Fatal("Invalid number of sent messages:", be.messages, be.anonmsgs) | ||
| } | ||
| } | ||
|
|
||
| func TestServer_LMTP_DuplicatedRcpt(t *testing.T) { | ||
| be, s, c, scanner := testServerGreeted(t, func(s *smtp.Server) { | ||
| s.LMTP = true | ||
| be := s.Backend.(*backend) | ||
| be.implementLMTPData = true | ||
| be.lmtpStatus = []struct { | ||
| addr string | ||
| err error | ||
| }{ | ||
| {"[email protected]", &smtp.SMTPError{Code: 555}}, | ||
| {"[email protected]", nil}, | ||
| {"[email protected]", &smtp.SMTPError{Code: 556}}, | ||
| } | ||
| }) | ||
| defer s.Close() | ||
| defer c.Close() | ||
|
|
||
| sendLHLO(t, scanner, c) | ||
|
|
||
| io.WriteString(c, "MAIL FROM:<[email protected]>\r\n") | ||
| scanner.Scan() | ||
| io.WriteString(c, "RCPT TO:<[email protected]>\r\n") | ||
| scanner.Scan() | ||
| io.WriteString(c, "RCPT TO:<[email protected]>\r\n") | ||
| scanner.Scan() | ||
| io.WriteString(c, "RCPT TO:<[email protected]>\r\n") | ||
| scanner.Scan() | ||
| io.WriteString(c, "DATA\r\n") | ||
| scanner.Scan() | ||
| io.WriteString(c, "Hey <3\r\n") | ||
| io.WriteString(c, ".\r\n") | ||
|
|
||
| scanner.Scan() | ||
| if !strings.HasPrefix(scanner.Text(), "555 5.0.0 <[email protected]>") { | ||
| t.Fatal("Invalid DATA first response:", scanner.Text()) | ||
| } | ||
| scanner.Scan() | ||
| if !strings.HasPrefix(scanner.Text(), "250 ") { | ||
| t.Fatal("Invalid DATA second response:", scanner.Text()) | ||
| } | ||
| scanner.Scan() | ||
| if !strings.HasPrefix(scanner.Text(), "556 5.0.0 <[email protected]>") { | ||
| t.Fatal("Invalid DATA first response:", scanner.Text()) | ||
| } | ||
|
|
||
| if len(be.messages) != 0 || len(be.anonmsgs) != 1 { | ||
| t.Fatal("Invalid number of sent messages:", be.messages, be.anonmsgs) | ||
| } | ||
| } |
Oops, something went wrong.