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

fix(GODT-2473): Fix handling of complex mime types

Browse Source 
When rebuilding attachments, ensure that more complicated mime types are
properly re-constructed.

If we fail to parse the mime type, set the value as is.
This commit is contained in:
Leander Beernaert
2023-03-10 15:49:10 +01:00
parent 7eaf1655b2
commit b57ca1506d
2 changed files with 49 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/message/build.go
View File

@ -36,6 +36,7 @@ import (
"github.com/emersion/go-message" "github.com/emersion/go-message"
"github.com/emersion/go-message/textproto" "github.com/emersion/go-message/textproto"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus"
) )
var ( var (
@ -543,7 +544,17 @@ func getAttachmentPartHeader(att proton.Attachment) message.Header {
hdr := toMessageHeader(att.Headers) hdr := toMessageHeader(att.Headers)
// All attachments have a content type. // All attachments have a content type.
hdr.SetContentType(string(att.MIMEType), map[string]string{"name": mime.QEncoding.Encode("utf-8", att.Name)}) mimeType, params, err := mime.ParseMediaType(string(att.MIMEType))
if err != nil {
logrus.WithError(err).Errorf("Failed to parse mime type: '%v'", att.MIMEType)
hdr.Set("Content-Type", string(att.MIMEType))
} else {
// Merge the overridden name into the params
encodedName := mime.QEncoding.Encode("utf-8", att.Name)
params["name"] = encodedName
params["filename"] = encodedName
hdr.SetContentType(mimeType, params)
}
// All attachments have a content disposition. // All attachments have a content disposition.
hdr.SetContentDisposition(string(att.Disposition), map[string]string{"filename": mime.QEncoding.Encode("utf-8", att.Name)}) hdr.SetContentDisposition(string(att.Disposition), map[string]string{"filename": mime.QEncoding.Encode("utf-8", att.Name)})

38
pkg/message/build_test.go
View File

@ -793,7 +793,8 @@ func TestBuildAttachmentWithLongFilename(t *testing.T) {
expectHeader(`Content-Type`, contains(veryLongName)). expectHeader(`Content-Type`, contains(veryLongName)).
expectContentDispositionParam(`filename`, is(veryLongName)). expectContentDispositionParam(`filename`, is(veryLongName)).
expectHeader(`Content-Disposition`, contains(veryLongName)). expectHeader(`Content-Disposition`, contains(veryLongName)).
expectSection(hasMaxLineLength(215)) // GODT-2477 - Implement line splitting according to RFC-2184.
expectSection(hasMaxLineLength(426))
} }
func TestBuildMessageDate(t *testing.T) { func TestBuildMessageDate(t *testing.T) {
@ -1231,3 +1232,38 @@ func readFile(t *testing.T, path string) string {
return string(b) return string(b)
} }
func TestBuildComplexMIMEType(t *testing.T) {
m := gomock.NewController(t)
defer m.Finish()
kr := utils.MakeKeyRing(t)
msg := newTestMessage(t, kr, "messageID", "addressID", "text/html", "<html><body>body</body></html>", time.Now())
att0 := addTestAttachment(t, kr, &msg, "attachID0", "attach0.png", "image/png", "attachment", "attach0")
att1 := addTestAttachment(t, kr, &msg, "attachID1", "Cat_August_2010-4.jpeg", "image/jpeg; name=Cat_August_2010-4.jpeg; x-unix-mode=0644", "attachment", "attach1")
res, err := BuildRFC822(kr, msg, [][]byte{
att0,
att1,
}, JobOptions{})
require.NoError(t, err)
section(t, res, 1).
expectBody(is(`<html><body>body</body></html>`)).
expectContentType(is(`text/html`)).
expectTransferEncoding(is(`quoted-printable`))
section(t, res, 2).
expectBody(is(`attach0`)).
expectContentType(is(`image/png`)).
expectTransferEncoding(is(`base64`)).
expectContentTypeParam(`name`, is(`attach0.png`)).
expectContentDispositionParam(`filename`, is(`attach0.png`))
section(t, res, 3).
expectBody(is(`attach1`)).
expectContentType(is(`image/jpeg`)).
expectTransferEncoding(is(`base64`)).
expectContentTypeParam(`name`, is(`Cat_August_2010-4.jpeg`)).
expectContentDispositionParam(`filename`, is(`Cat_August_2010-4.jpeg`))
}