fix: restore closing SMTP message on method exit (#14496)

dannykopping · web-flow · commit 0f414a00d362 · 2024-08-30T13:03:25.000+02:00
diff --git a/coderd/notifications/dispatch/smtp.go b/coderd/notifications/dispatch/smtp.go
@@ -183,6 +183,15 @@ func (s *SMTPHandler) dispatch(subject, htmlBody, plainBody, to string) Delivery
 		if err != nil {
 			return true, xerrors.Errorf("message transmission: %w", err)
 		}
+		closeOnce := sync.OnceValue(func() error {
+			return message.Close()
+		})
+		// Close the message when this method exits in order to not leak resources. Even though we're calling this explicitly
+		// further down, the method may exit before then.
+		defer func() {
+			// If we try close an already-closed writer, it'll send a subsequent request to the server which is invalid.
+			_ = closeOnce()
+		}()
 
 		// Create message headers.
 		msg := &bytes.Buffer{}
@@ -250,7 +259,7 @@ func (s *SMTPHandler) dispatch(subject, htmlBody, plainBody, to string) Delivery
 			return false, xerrors.Errorf("write body buffer: %w", err)
 		}
 
-		if err = message.Close(); err != nil {
+		if err = closeOnce(); err != nil {
 			return true, xerrors.Errorf("delivery failure: %w", err)
 		}
 
