1
0
mirror of https://github.com/jhillyerd/inbucket.git synced 2025-12-17 17:47:03 +00:00

smtp: Don't require MIME headers for metadata

This was a regression, will again fall back to MAIL FROM/RCPT TO data.
This commit is contained in:
James Hillyerd
2018-03-17 14:41:03 -07:00
parent e84b1f8952
commit dc4db59211
2 changed files with 34 additions and 6 deletions

View File

@@ -6,6 +6,7 @@ import (
"fmt"
"io"
"net"
"net/mail"
"regexp"
"strconv"
"strings"
@@ -408,13 +409,14 @@ func (ss *Session) deliverMessage(recip *policy.Recipient, content []byte) (ok b
}
from, err := env.AddressList("From")
if err != nil {
ss.logError("Failed to get From address: %v", err)
return false
from = []*mail.Address{{Address: ss.from}}
}
to, err := env.AddressList("To")
if err != nil {
ss.logError("Failed to get To addresses: %v", err)
return false
to = make([]*mail.Address, len(ss.recipients))
for i, torecip := range ss.recipients {
to[i] = &torecip.Address
}
}
// Generate Received header.
stamp := time.Now().Format(timeStampFormat)