Commitc90be9b

authored

fix: correctly close SMTP message and await response (#14495)

1 parent851df91 commitc90be9bCopy full SHA for c90be9b

File tree

+27

-1

lines changed

+27

-1

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,6 @@ func (s *SMTPHandler) dispatch(subject, htmlBody, plainBody, to string) Delivery`
`183`	`183`	`iferr!=nil {`
`184`	`184`	`returntrue,xerrors.Errorf("message transmission: %w",err)`
`185`	`185`	`}`
`186`		`-defermessage.Close()`
`187`	`186`
`188`	`187`	`// Create message headers.`
`189`	`188`	`msg:=&bytes.Buffer{}`
`@@ -251,6 +250,10 @@ func (s *SMTPHandler) dispatch(subject, htmlBody, plainBody, to string) Delivery`
`251`	`250`	`returnfalse,xerrors.Errorf("write body buffer: %w",err)`
`252`	`251`	`}`
`253`	`252`
	`253`	`+iferr=message.Close();err!=nil {`
	`254`	`+returntrue,xerrors.Errorf("delivery failure: %w",err)`
	`255`	`+}`
	`256`	`+`
`254`	`257`	`// Returning false, nil indicates successful send (i.e. non-retryable non-error)`
`255`	`258`	`returnfalse,nil`
`256`	`259`	`}`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ func TestSMTP(t *testing.T) {`
`62`	`62`	`expectedErrstring`
`63`	`63`	`retryablebool`
`64`	`64`	`useTLSbool`
	`65`	`+failOnDataFnfunc()error`
`65`	`66`	`}{`
`66`	`67`	`/**`
`67`	`68`	`* LOGIN auth mechanism`
`@@ -381,6 +382,21 @@ func TestSMTP(t *testing.T) {`
`381`	`382`	`toAddrs: []string{to},`
`382`	`383`	`expectedAuthMeth:sasl.Plain,`
`383`	`384`	`},`
	`385`	`+/**`
	`386`	`+ * Other errors`
	`387`	`+ */`
	`388`	`+{`
	`389`	`+name:"Rejected on DATA",`
	`390`	`+cfg: codersdk.NotificationsEmailConfig{`
	`391`	`+Hello:hello,`
	`392`	`+From:from,`
	`393`	`+},`
	`394`	`+failOnDataFn:func()error {`
	`395`	`+return&smtp.SMTPError{Code:501,EnhancedCode: smtp.EnhancedCode{5,5,4},Message:"Rejected!"}`
	`396`	`+},`
	`397`	`+expectedErr:"SMTP error 501: Rejected!",`
	`398`	`+retryable:true,`
	`399`	`+},`
`384`	`400`	`}`
`385`	`401`
`386`	`402`	`// nolint:paralleltest // Reinitialization is not required as of Go v1.22.`
`@@ -398,6 +414,8 @@ func TestSMTP(t *testing.T) {`
`398`	`414`	`AcceptedIdentity:tc.cfg.Auth.Identity.String(),`
`399`	`415`	`AcceptedUsername:username,`
`400`	`416`	`AcceptedPassword:password,`
	`417`	`+`
	`418`	`+FailOnDataFn:tc.failOnDataFn,`
`401`	`419`	`})`
`402`	`420`
`403`	`421`	`// Create a mock SMTP server which conditionally listens for plain or TLS connections.`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ var (`
`24`	`24`	`typeConfigstruct {`
`25`	`25`	`AuthMechanisms []string`
`26`	`26`	`AcceptedIdentity,AcceptedUsername,AcceptedPasswordstring`
	`27`	`+FailOnDataFnfunc()error`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`typeMessagestruct {`
`@@ -147,6 +148,10 @@ func (s *Session) Data(r io.Reader) error {`
`147`	`148`	`returnerr`
`148`	`149`	`}`
`149`	`150`
	`151`	`+ifs.backend.cfg.FailOnDataFn!=nil {`
	`152`	`+returns.backend.cfg.FailOnDataFn()`
	`153`	`+}`
	`154`	`+`
`150`	`155`	`s.backend.lastMsg.Contents=string(b)`
`151`	`156`
`152`	`157`	`returnnil`

Comments

(0)