From f5aba717b2905212fab01a0e050edcf6d23ae4f9 Mon Sep 17 00:00:00 2001 From: James Houlahan Date: Tue, 13 Apr 2021 12:46:15 +0200 Subject: [PATCH] GODT-213: Force no transfer encoding for embedded message/rfc822 parts --- pkg/message/build_framework_test.go | 5 +++-- pkg/message/build_rfc822.go | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/message/build_framework_test.go b/pkg/message/build_framework_test.go index bcb43fc3..e40a1664 100644 --- a/pkg/message/build_framework_test.go +++ b/pkg/message/build_framework_test.go @@ -93,8 +93,9 @@ func addTestAttachment( Name: name, MIMEType: mimeType, Header: map[string][]string{ - "Content-Type": {mimeType}, - "Content-Disposition": {disposition}, + "Content-Type": {mimeType}, + "Content-Disposition": {disposition}, + "Content-Transfer-Encoding": {"base64"}, }, Disposition: disposition, KeyPackets: base64.StdEncoding.EncodeToString(enc.GetBinaryKeyPacket()), diff --git a/pkg/message/build_rfc822.go b/pkg/message/build_rfc822.go index 47b2694b..ef45110c 100644 --- a/pkg/message/build_rfc822.go +++ b/pkg/message/build_rfc822.go @@ -382,6 +382,8 @@ func getAttachmentPartHeader(att *pmapi.Attachment) message.Header { // Use base64 for all attachments except embedded RFC822 messages. if att.MIMEType != "message/rfc822" { hdr.Set("Content-Transfer-Encoding", "base64") + } else { + hdr.Del("Content-Transfer-Encoding") } return hdr