storj/private/post/message.go
Márton Elek 2ae78db660 satellite/email: add delimiter to close the last part of Multipart emails
The existing implementation doesn't send proper rfc1341 compatible mails
according to https://www.w3.org/Protocols/rfc1341/7_2_Multipart.html as
the closing `--boundary_id--` is missing from our mails. (see 7.2.1 from
the standard).

Mailservers which are not very flexible, deny the mails.

Example mail log: (see the
missing boundary delimiter at the end).

```
Subject: Activate your email
From: "Storj DCS - EU1" <noreply@eu1.storj.io>
To: "..." <...>
...

--26d7220f6f1c9f6fb47b535319eb15dce513bb6e1d941a0efddf25e96712
Content-Type: text/html; charset=UTF-8

....

</body>
</html>
.
smtp: DATA error	{"msg_id":"6d82c9e3","reason":"unexpected EOF"}
smtp: 554 5.0.0 Internal server error (msg ID = 6d82c9e3)
```

This patch moves all the Multipart writing to a function to make sure
that the `wr.Close()` (which writes out the last part) is executed
BEFORE `body.Bytes()` (defer added it AFTER `body.Bytes()` was calculated)

Change-Id: I8f18fc81b1857b646470eab32e73d6cbdc50d2ad
2022-02-01 09:55:29 +00:00

138 lines
3.6 KiB
Go

// Copyright (C) 2019 Storj Labs, Inc.
// See LICENSE for copying information
package post
import (
"bytes"
"fmt"
"io"
"mime"
"mime/multipart"
"mime/quotedprintable"
"net/textproto"
"time"
"github.com/zeebo/errs"
)
// Message is RFC compliant email message.
type Message struct {
From Address
To []Address
Subject string
ID string
Date time.Time
ReceiptTo []string
PlainText string
Parts []Part
}
// Part represent one part of multipart message.
type Part struct {
Type string
Encoding string
Disposition string
Content string
}
// Error is the default message errs class.
var Error = errs.Class("Email message")
// Bytes builds message and returns result as bytes.
func (msg *Message) Bytes() (data []byte, err error) {
// always returns nil error on read and write, so most of the errors can be ignored
var body bytes.Buffer
// write headers
fmt.Fprintf(&body, "Subject: %v\r\n", mime.QEncoding.Encode("utf-8", msg.Subject))
fmt.Fprintf(&body, "From: %s\r\n", &msg.From)
for _, to := range msg.To {
fmt.Fprintf(&body, "To: %s\r\n", &to) // nolint:scopelint
}
for _, recipient := range msg.ReceiptTo {
fmt.Fprintf(&body, "Disposition-Notification-To: <%v>\r\n", mime.QEncoding.Encode("utf-8", recipient))
}
// date and id are optional as they can be set by server itself
if !msg.Date.IsZero() {
fmt.Fprintf(&body, "Date: %v\r\n", msg.Date)
}
if msg.ID != "" {
fmt.Fprintf(&body, "Message-ID: <%v>\r\n", mime.QEncoding.Encode("utf-8", msg.ID))
}
fmt.Fprintf(&body, "MIME-Version: 1.0\r\n")
switch {
// multipart upload
case len(msg.Parts) > 0:
err = msg.writeMultipart(&body)
if err != nil {
return nil, err
}
// fallback if there are no parts, write PlainText with appropriate Content-Type
default:
fmt.Fprintf(&body, "Content-Type: text/plain; charset=UTF-8; format=flowed\r\n")
fmt.Fprintf(&body, "Content-Transfer-Encoding: quoted-printable\r\n\r\n")
enc := quotedprintable.NewWriter(&body)
defer func() { err = errs.Combine(err, enc.Close()) }()
if _, err := enc.Write([]byte(msg.PlainText)); err != nil {
return nil, Error.Wrap(err)
}
}
return tocrlf(body.Bytes()), nil
}
func (msg *Message) writeMultipart(body *bytes.Buffer) (err error) {
wr := multipart.NewWriter(body)
defer func() { err = errs.Combine(err, wr.Close()) }()
fmt.Fprintf(body, "Content-Type: multipart/alternative;")
fmt.Fprintf(body, "\tboundary=\"%v\"\r\n", wr.Boundary())
fmt.Fprintf(body, "\r\n")
var sub io.Writer
if len(msg.PlainText) > 0 {
sub, err := wr.CreatePart(textproto.MIMEHeader{
"Content-Type": []string{"text/plain; charset=UTF-8; format=flowed"},
"Content-Transfer-Encoding": []string{"quoted-printable"},
})
if err != nil {
return Error.Wrap(err)
}
enc := quotedprintable.NewWriter(sub)
defer func() { err = errs.Combine(err, enc.Close()) }()
_, err = enc.Write([]byte(msg.PlainText))
if err != nil {
return Error.Wrap(err)
}
}
for _, part := range msg.Parts {
header := textproto.MIMEHeader{"Content-Type": []string{mime.QEncoding.Encode("utf-8", part.Type)}}
if part.Encoding != "" {
header["Content-Transfer-Encoding"] = []string{mime.QEncoding.Encode("utf-8", part.Encoding)}
}
if part.Disposition != "" {
header["Content-Disposition"] = []string{mime.QEncoding.Encode("utf-8", part.Disposition)}
}
sub, _ = wr.CreatePart(header)
fmt.Fprint(sub, part.Content)
}
return nil
}
func tocrlf(data []byte) []byte {
lf := bytes.ReplaceAll(data, []byte("\r\n"), []byte("\n"))
crlf := bytes.ReplaceAll(lf, []byte("\n"), []byte("\r\n"))
return crlf
}