yesBad/proton-bridge
1
0
Fork 0
Code Actions Activity

GODT-1193: don't use message.Read; permit non-UTF-8 charsets

Browse Source
This commit is contained in:
James Houlahan
2021-06-09 09:27:34 +02:00
parent 6d784f2444
commit 5bf359d34f
6 changed files with 60 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/message/build_rfc822.go
View File

@ -20,7 +20,6 @@ package message
import (
"bytes"
"encoding/base64"
"io/ioutil"
"mime"
"net/mail"
"strings"
@ -290,17 +289,12 @@ func writeMultipartSignedRFC822(header message.Header, body []byte, sig pmapi.Si
return nil, err
}
ent, err := message.Read(bytes.NewReader(body))
bodyHeader, bodyData, err := readHeaderBody(body)
if err != nil {
return nil, err
}
bodyPart, err := w.CreatePart(ent.Header)
if err != nil {
return nil, err
}
bodyData, err := ioutil.ReadAll(ent.Body)
bodyPart, err := w.CreatePart(message.Header{Header: *bodyHeader})
if err != nil {
return nil, err
}
@ -347,12 +341,12 @@ func writeMultipartSignedRFC822(header message.Header, body []byte, sig pmapi.Si
func writeMultipartEncryptedRFC822(header message.Header, body []byte) ([]byte, error) {
buf := new(bytes.Buffer)
ent, err := message.Read(bytes.NewReader(body))
bodyHeader, bodyData, err := readHeaderBody(body)
if err != nil {
return nil, err
}
entFields := ent.Header.Fields()
entFields := bodyHeader.Fields()
for entFields.Next() {
header.Set(entFields.Key(), entFields.Value())
@ -363,11 +357,6 @@ func writeMultipartEncryptedRFC822(header message.Header, body []byte) ([]byte,
return nil, err
}
bodyData, err := ioutil.ReadAll(ent.Body)
if err != nil {
return nil, err
}
if _, err := w.Write(bodyData); err != nil {
return nil, err
}