From 4cba009ac8ff6bec7222423aedeeb989895d4c60 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Mon, 19 Dec 2022 13:36:36 +0100 Subject: [PATCH] GODT-2188: Do not fail append with invalid mime-type Requires gluon update where the fix was applied. Disable TestBridge_Sync_BadMessage as it is no longer valid with the latest Gluon fixes. Traked as GODT-2215. --- go.mod | 2 +- go.sum | 4 ++-- internal/bridge/sync_test.go | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 81965d2f..8570cf2a 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/0xAX/notificator v0.0.0-20220220101646-ee9b8921e557 github.com/Masterminds/semver/v3 v3.1.1 - github.com/ProtonMail/gluon v0.14.2-0.20221215082650-7ba466ad6482 + github.com/ProtonMail/gluon v0.14.2-0.20221219120039-76e4e7e2a353 github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a github.com/ProtonMail/go-proton-api v0.2.2-0.20221213121236-3439b3eda101 github.com/ProtonMail/go-rfc5322 v0.11.0 diff --git a/go.sum b/go.sum index 919c49e0..ee4e7005 100644 --- a/go.sum +++ b/go.sum @@ -28,8 +28,8 @@ github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf h1:yc9daCCYUefEs github.com/ProtonMail/bcrypt v0.0.0-20211005172633-e235017c1baf/go.mod h1:o0ESU9p83twszAU8LBeJKFAAMX14tISa0yk4Oo5TOqo= github.com/ProtonMail/docker-credential-helpers v1.1.0 h1:+kvUIpwWcbtP3WFv5sSvkFn/XLzSqPOB5AAthuk9xPk= github.com/ProtonMail/docker-credential-helpers v1.1.0/go.mod h1:mK0aBveCxhnQ756AmaTfXMZDeULvheYVhF/MWMErN5g= -github.com/ProtonMail/gluon v0.14.2-0.20221215082650-7ba466ad6482 h1:5sriag5qQ5kJ9oc3LJc+aSDyxEDG1ZfZGgVDcSNvC+4= -github.com/ProtonMail/gluon v0.14.2-0.20221215082650-7ba466ad6482/go.mod h1:z2AxLIiBCT1K+0OBHyaDI7AEaO5qI6/BEC2TE42vs4Q= +github.com/ProtonMail/gluon v0.14.2-0.20221219120039-76e4e7e2a353 h1:1ts1i+fMKjp1cILg9AsxuX1JHrjm6RRyp+X3/8T0R4A= +github.com/ProtonMail/gluon v0.14.2-0.20221219120039-76e4e7e2a353/go.mod h1:z2AxLIiBCT1K+0OBHyaDI7AEaO5qI6/BEC2TE42vs4Q= github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a h1:D+aZah+k14Gn6kmL7eKxoo/4Dr/lK3ChBcwce2+SQP4= github.com/ProtonMail/go-autostart v0.0.0-20210130080809-00ed301c8e9a/go.mod h1:oTGdE7/DlWIr23G0IKW3OXK9wZ5Hw1GGiaJFccTvZi4= github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7/go.mod h1:z4/9nQmJSSwwds7ejkxaJwO37dru3geImFUdJlaLzQo= diff --git a/internal/bridge/sync_test.go b/internal/bridge/sync_test.go index 88f7fcb4..661ff128 100644 --- a/internal/bridge/sync_test.go +++ b/internal/bridge/sync_test.go @@ -148,7 +148,8 @@ func TestBridge_Sync(t *testing.T) { }, server.WithTLS(false)) } -func TestBridge_Sync_BadMessage(t *testing.T) { +// GODT-2215: This test no longer works since it's now possible to import messages into Gluon with bad ContentType header. +func _TestBridge_Sync_BadMessage(t *testing.T) { //nolint:unused,deadcode withEnv(t, func(ctx context.Context, s *server.Server, netCtl *proton.NetCtl, locator bridge.Locator, storeKey []byte) { userID, addrID, err := s.CreateUser("imap", password) require.NoError(t, err) @@ -161,7 +162,7 @@ func TestBridge_Sync_BadMessage(t *testing.T) { withClient(ctx, t, s, "imap", password, func(ctx context.Context, c *proton.Client) { messageIDs = createMessages(ctx, t, c, addrID, labelID, []byte("To: someone@pm.me\r\nSubject: Good message\r\n\r\nHello!"), - []byte("To: someone@pm.me\r\nSubject: Bad message\r\nContent-Type: this is not a valid content type\r\n\r\nHello!"), + []byte("To: someone@pm.me\r\nSubject: Bad message\r\nContentType: this is not a valid content type\r\n\r\nHello!"), ) }) @@ -350,7 +351,7 @@ func withClient(ctx context.Context, t *testing.T, s *server.Server, username st fn(ctx, c) } -func clientFetch(client *client.Client, mailbox string) ([]*imap.Message, error) { +func clientFetch(client *client.Client, mailbox string) ([]*imap.Message, error) { //nolint:unused status, err := client.Select(mailbox, false) if err != nil { return nil, err