Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-15 14:56:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: recreate message with parser's writer

Browse Source
This commit is contained in:
James Houlahan
2020-08-14 14:09:24 +02:00
parent 5343a6fc0f
commit 9821b5bbc2
6 changed files with 37 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/smtp/user.go
View File

@ -20,7 +20,6 @@
package smtp
import (
"bytes"
"encoding/base64"
"io"
"mime"
@ -183,18 +182,7 @@ func (su *smtpUser) Send(from string, to []string, messageReader io.Reader) (err
attachedPublicKeyName = "publickey - " + kr.GetIdentities()[0].Name
}
buf := new(bytes.Buffer)
if _, err = buf.ReadFrom(messageReader); err != nil {
return
}
// HELP: Can we trust the mail client's 7bit filter?
// Might want to check here that it truly is 7bit clean.
// If it's not we need to use the message parser's writer ability (already has 7bit filter).
mimeBody := buf.String()
message, plainBody, attReaders, err := message.Parse(buf.Bytes(), attachedPublicKey, attachedPublicKeyName)
message, mimeBody, plainBody, attReaders, err := message.Parse(messageReader, attachedPublicKey, attachedPublicKeyName)
if err != nil {
return
}