Mirrors/go-inbucket
1
0
Fork 0
mirror of https://github.com/jhillyerd/inbucket.git synced 2026-01-29 06:25:56 +00:00
Code Issues Releases Wiki Activity

Wired character-set decoding into From and Subject

Browse Source 
- Removed extra message object from ReadBody() return type
 - We now use enmime's GetHeader() when building the GOB, this will get
   us alternate character set decoding for the From and Subject headers.
 - Added a swaks test with a utf-8 subject line
This commit is contained in:
James Hillyerd
2013-10-01 14:01:08 -07:00
parent d9b728ef46
commit c9392c7eb1
6 changed files with 72 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
smtpd/datastore.go
View File

@@ -26,7 +26,7 @@ type Message interface {
Subject() string
RawReader() (reader io.ReadCloser, err error)
ReadHeader() (msg *mail.Message, err error)
ReadBody() (msg *mail.Message, body *enmime.MIMEBody, err error)
ReadBody() (body *enmime.MIMEBody, err error)
ReadRaw() (raw *string, err error)
Append(data []byte) error
Close() error

22
smtpd/filestore.go
View File

@@ -246,25 +246,23 @@ func (m *FileMessage) ReadHeader() (msg *mail.Message, err error) {
return msg, err
}
// ReadBody opens the .raw portion of a Message and returns a MIMEBody object, along
// with a free mail.Message containing the Headers, since we had to make one of those
// anyway.
func (m *FileMessage) ReadBody() (msg *mail.Message, body *enmime.MIMEBody, err error) {
// ReadBody opens the .raw portion of a Message and returns a MIMEBody object
func (m *FileMessage) ReadBody() (body *enmime.MIMEBody, err error) {
file, err := os.Open(m.rawPath())
defer file.Close()
if err != nil {
return nil, nil, err
return nil, err
}
reader := bufio.NewReader(file)
msg, err = mail.ReadMessage(reader)
msg, err := mail.ReadMessage(reader)
if err != nil {
return nil, nil, err
return nil, err
}
mime, err := enmime.ParseMIMEBody(msg)
if err != nil {
return nil, nil, err
return nil, err
}
return msg, mime, err
return mime, err
}
// RawReader opens the .raw portion of a Message as an io.ReadCloser
@@ -365,14 +363,14 @@ func (m *FileMessage) createGob() error {
writer := bufio.NewWriter(file)
// Fetch headers
msg, err := m.ReadHeader()
body, err := m.ReadBody()
if err != nil {
return err
}
// Only public fields are stored in gob
m.Ffrom = msg.Header.Get("From")
m.Fsubject = msg.Header.Get("Subject")
m.Ffrom = body.GetHeader("From")
m.Fsubject = body.GetHeader("Subject")
// Write & flush
enc := gob.NewEncoder(writer)