Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-18 08:06:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-213: Force no transfer encoding for embedded message/rfc822 parts

Browse Source
This commit is contained in:
James Houlahan
2021-04-13 12:46:15 +02:00
parent 1359c39bc0
commit f5aba717b2
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/message/build_framework_test.go
View File

@ -93,8 +93,9 @@ func addTestAttachment(
Name: name, Name: name,
MIMEType: mimeType, MIMEType: mimeType,
Header: map[string][]string{ Header: map[string][]string{
"Content-Type": {mimeType}, "Content-Type": {mimeType},
"Content-Disposition": {disposition}, "Content-Disposition": {disposition},
"Content-Transfer-Encoding": {"base64"},
}, },
Disposition: disposition, Disposition: disposition,
KeyPackets: base64.StdEncoding.EncodeToString(enc.GetBinaryKeyPacket()), KeyPackets: base64.StdEncoding.EncodeToString(enc.GetBinaryKeyPacket()),

2
pkg/message/build_rfc822.go
View File

@ -382,6 +382,8 @@ func getAttachmentPartHeader(att *pmapi.Attachment) message.Header {
// Use base64 for all attachments except embedded RFC822 messages. // Use base64 for all attachments except embedded RFC822 messages.
if att.MIMEType != "message/rfc822" { if att.MIMEType != "message/rfc822" {
hdr.Set("Content-Transfer-Encoding", "base64") hdr.Set("Content-Transfer-Encoding", "base64")
} else {
hdr.Del("Content-Transfer-Encoding")
} }
return hdr return hdr