aerc/commands/msg/reply.go
Leszek Cimała 30aa77c1c9 use correct headers for message part
Hello guys,
on the hunt for bugs related to wrong encoding. This patch is fixing
reply to non-utf8 messages.

We were using global message headers instead of part specific. In
practice header were often something like:

multipart; boundry=...

where there should be:

text/plain; charset=...

Fixed also missing SubType.

Have great weekend!

Leszek
2019-12-07 14:30:20 -05:00

234 lines
5.6 KiB
Go

package msg
import (
"bytes"
"errors"
"fmt"
"io"
gomail "net/mail"
"strings"
"git.sr.ht/~sircmpwn/getopt"
"github.com/emersion/go-message"
_ "github.com/emersion/go-message/charset"
"github.com/emersion/go-message/mail"
"git.sr.ht/~sircmpwn/aerc/models"
"git.sr.ht/~sircmpwn/aerc/widgets"
)
type reply struct{}
func init() {
register(reply{})
}
func (reply) Aliases() []string {
return []string{"reply"}
}
func (reply) Complete(aerc *widgets.Aerc, args []string) []string {
return nil
}
func (reply) Execute(aerc *widgets.Aerc, args []string) error {
opts, optind, err := getopt.Getopts(args, "aqT:")
if err != nil {
return err
}
if optind != len(args) {
return errors.New("Usage: reply [-aq -T <template>]")
}
var (
quote bool
replyAll bool
template string
)
for _, opt := range opts {
switch opt.Option {
case 'a':
replyAll = true
case 'q':
quote = true
case 'T':
template = opt.Value
}
}
widget := aerc.SelectedTab().(widgets.ProvidesMessage)
acct := widget.SelectedAccount()
if acct == nil {
return errors.New("No account selected")
}
conf := acct.AccountConfig()
us, _ := gomail.ParseAddress(conf.From)
store := widget.Store()
if store == nil {
return errors.New("Cannot perform action. Messages still loading")
}
msg, err := widget.SelectedMessage()
if err != nil {
return err
}
acct.Logger().Println("Replying to email " + msg.Envelope.MessageId)
var (
to []string
cc []string
toList []*models.Address
)
if args[0] == "reply" {
if len(msg.Envelope.ReplyTo) != 0 {
toList = msg.Envelope.ReplyTo
} else {
toList = msg.Envelope.From
}
for _, addr := range toList {
if addr.Name != "" {
to = append(to, fmt.Sprintf("%s <%s@%s>",
addr.Name, addr.Mailbox, addr.Host))
} else {
to = append(to, fmt.Sprintf("<%s@%s>", addr.Mailbox, addr.Host))
}
}
if replyAll {
for _, addr := range msg.Envelope.Cc {
cc = append(cc, addr.Format())
}
for _, addr := range msg.Envelope.To {
address := fmt.Sprintf("%s@%s", addr.Mailbox, addr.Host)
if address == us.Address {
continue
}
to = append(to, addr.Format())
}
}
}
var subject string
if !strings.HasPrefix(strings.ToLower(msg.Envelope.Subject), "re: ") {
subject = "Re: " + msg.Envelope.Subject
} else {
subject = msg.Envelope.Subject
}
defaults := map[string]string{
"To": strings.Join(to, ", "),
"Cc": strings.Join(cc, ", "),
"Subject": subject,
"In-Reply-To": msg.Envelope.MessageId,
}
addTab := func() error {
if template != "" {
defaults["OriginalFrom"] = models.FormatAddresses(msg.Envelope.From)
defaults["OriginalDate"] = msg.Envelope.Date.Format("Mon Jan 2, 2006 at 3:04 PM")
}
composer, err := widgets.NewComposer(aerc, aerc.Config(),
acct.AccountConfig(), acct.Worker(), template, defaults)
if err != nil {
aerc.PushError("Error: " + err.Error())
return err
}
if args[0] == "reply" {
composer.FocusTerminal()
}
tab := aerc.NewTab(composer, subject)
composer.OnHeaderChange("Subject", func(subject string) {
if subject == "" {
tab.Name = "New email"
} else {
tab.Name = subject
}
tab.Content.Invalidate()
})
return nil
}
if quote {
if template == "" {
template = aerc.Config().Templates.QuotedReply
}
store.FetchBodyPart(msg.Uid, []int{1}, func(reader io.Reader) {
header := message.Header{}
if len(msg.BodyStructure.Parts) > 0 {
partID := 0 // TODO: will we always choose first msg part?
header.SetText(
"Content-Transfer-Encoding", msg.BodyStructure.Parts[partID].Encoding)
if msg.BodyStructure.Parts[partID].MIMESubType == "" {
header.SetContentType(
msg.BodyStructure.Parts[partID].MIMEType,
msg.BodyStructure.Parts[partID].Params)
} else {
// include SubType if defined (text/plain, text/html, ...)
header.SetContentType(
fmt.Sprintf("%s/%s", msg.BodyStructure.Parts[partID].MIMEType,
msg.BodyStructure.Parts[partID].MIMESubType),
msg.BodyStructure.Parts[partID].Params)
}
header.SetText("Content-Description", msg.BodyStructure.Parts[partID].Description)
} else { // Parts has no headers, so we use global headers info
header.SetText(
"Content-Transfer-Encoding", msg.BodyStructure.Encoding)
if msg.BodyStructure.MIMESubType == "" {
header.SetContentType(
msg.BodyStructure.MIMEType,
msg.BodyStructure.Params)
} else {
// include SubType if defined (text/plain, text/html, ...)
header.SetContentType(
fmt.Sprintf("%s/%s", msg.BodyStructure.MIMEType,
msg.BodyStructure.MIMESubType),
msg.BodyStructure.Params)
}
header.SetText("Content-Description", msg.BodyStructure.Description)
}
entity, err := message.New(header, reader)
if err != nil {
// TODO: Do something with the error
addTab()
return
}
mreader := mail.NewReader(entity)
part, err := mreader.NextPart()
if err != nil {
// TODO: Do something with the error
addTab()
return
}
buf := new(bytes.Buffer)
buf.ReadFrom(part.Body)
defaults["Original"] = buf.String()
addTab()
})
return nil
} else {
return addTab()
}
}
func findPlaintext(bs *models.BodyStructure,
path []int) (*models.BodyStructure, []int) {
for i, part := range bs.Parts {
cur := append(path, i+1)
if strings.ToLower(part.MIMEType) == "text" &&
strings.ToLower(part.MIMESubType) == "plain" {
return part, cur
}
if strings.ToLower(part.MIMEType) == "multipart" {
if part, path := findPlaintext(part, cur); path != nil {
return part, path
}
}
}
return nil, nil
}