Other: Bridge James v1.8.12

This is regression of GODT-963

.gitlab-ci.yml

@@ -85,11 +85,17 @@ dependency-updates:
   stage: build
   only:
     - branches
+  before_script:
+    - mkdir -p .cache/bin
+    - export PATH=$(pwd)/.cache/bin:$PATH
+    - export GOPATH="$CI_PROJECT_DIR/.cache"
   script:
     - make build
+    - git diff && git diff-index --quiet HEAD
   artifacts:
-    # Note: The latest artifacts for refs are locked against deletion, and kept regardless of the expiry time.
-    # Introduced in GitLab 13.0 behind a disabled feature flag, and made the default behavior in GitLab 13.4.
+    # Note: The latest artifacts for refs are locked against deletion, and kept
+    # regardless of the expiry time. Introduced in GitLab 13.0 behind a
+    # disabled feature flag, and made the default behavior in GitLab 13.4.
     expire_in: 1 day
   tags:
     - large

Changelog.md

@@ -2,6 +2,31 @@
 
 Changelog [format](http://keepachangelog.com/en/1.0.0/)
 
+## [Bridge 1.8.12] James
+
+### Fixed
+* GODT-1432: Check if keys are active before unlocking.
+
+
+## [Bridge 1.8.11] James
+
+### Fixed
+* GODT-1415: Only messages which are in Spam should be moved to INBOX once they are marked as not-a-spam.
+* GODT-1405: Integration test fix: Prevent unilateral update in FETCH when copying message by append.
+* GODT-1392: Fix broken header fields for attachments.
+* GODT-1360: Fix live integration test.
+* GODT-968: Messages in All Mail should not be able to mark as deleted.
+* GODT-967: Append external message to All Mail should be APPEND to Archive instead.
+* GODT-966: Append internal message to AllMail should be no action.
+* GODT-965: MOVE command should end with error for All Mail.
+* GODT-963: STORE removing junk or adding nojunk should move message to inbox.
+
+### Changed
+* GODT-1397: Update bbolt to v1.3.6.
+* GODT-1410: Remove event ID from sentry report description.
+* GODT-1395: CI should fail on go.sum changed.
+
+
 ## [Bridge 1.8.10] James
 
 ### Fixed
@@ -13,6 +38,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 * GODT-1205: "RCPT TO" does not contain all addressed from "CC".
 * GODT-1103: Cleanup on windows when uninstalling Bridge.
 
+
 ## [Bridge 1.8.9] James
 
 ### Fixed

Makefile

@@ -10,7 +10,7 @@ TARGET_OS?=${GOOS}
 .PHONY: build build-ie build-nogui build-ie-nogui build-launcher build-launcher-ie  versioner hasher
 
 # Keep version hardcoded so app build works also without Git repository.
-BRIDGE_APP_VERSION?=1.8.10+git
+BRIDGE_APP_VERSION?=1.8.12+git
 IE_APP_VERSION?=1.3.3+git
 APP_VERSION:=${BRIDGE_APP_VERSION}
 SRC_ICO:=logo.ico

go.mod

@@ -64,7 +64,7 @@ require (
 	github.com/therecipe/qt/internal/binding/files/docs/5.13.0 v0.0.0-20200904063919-c0c124a5770d // indirect
 	github.com/urfave/cli/v2 v2.2.0
 	github.com/vmihailenco/msgpack/v5 v5.1.3
-	go.etcd.io/bbolt v1.3.5
+	go.etcd.io/bbolt v1.3.6
 	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
 	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
 	golang.org/x/text v0.3.5-0.20201125200606-c27b9fd57aec

go.sum

@@ -433,8 +433,8 @@ github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FB
 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
 github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
-go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
-go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
+go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
+go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -533,6 +533,7 @@ golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44 h1:Bli41pIlzTzf3KEY06n+xnzK/BESIg2ze4Pgfh/aI8c=
@@ -567,6 +568,7 @@ golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69 h1:yBHHx+XZqXJBm6Exke3N7V9gnlsyXxoCPEb1yVenjfk=
 golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

internal/imap/mailbox_append.go

@@ -20,6 +20,7 @@ package imap
 import (
 	"bufio"
 	"bytes"
+	"fmt"
 	"io/ioutil"
 	"net/mail"
 	"strings"
@@ -116,11 +117,10 @@ func (im *imapMailbox) createMessage(imapFlags []string, date time.Time, r imap.
 	if internalID != "" {
 		if msg, err := im.storeMailbox.GetMessage(internalID); err == nil {
 			if im.user.user.IsCombinedAddressMode() || im.storeAddress.AddressID() == msg.Message().AddressID {
-				return im.labelExistingMessage(msg.ID(), msg.IsMarkedDeleted())
+				return im.labelExistingMessage(msg)
 			}
 		}
 	}
-
 	return im.importMessage(kr, hdr, body, imapFlags, date)
 }
 
@@ -146,7 +146,17 @@ func (im *imapMailbox) createDraftMessage(kr *crypto.KeyRing, email string, body
 	return uidplus.AppendResponse(im.storeMailbox.UIDValidity(), im.storeMailbox.GetUIDList([]string{draft.ID}))
 }
 
-func (im *imapMailbox) labelExistingMessage(messageID string, isDeleted bool) error {
+func findMailboxForAddress(address storeAddressProvider, labelID string) (storeMailboxProvider, error) {
+	for _, mailBox := range address.ListMailboxes() {
+		if mailBox.LabelID() == labelID {
+			return mailBox, nil
+		}
+	}
+	return nil, fmt.Errorf("could not find %v label in mailbox for user %v", labelID,
+		address.AddressString())
+}
+
+func (im *imapMailbox) labelExistingMessage(msg storeMessageProvider) error { //nolint[funlen]
 	im.log.Info("Labelling existing message")
 
 	// IMAP clients can move message to local folder (setting \Deleted flag)
@@ -156,20 +166,37 @@ func (im *imapMailbox) labelExistingMessage(messageID string, isDeleted bool) er
 	// not delete the message (EXPUNGE would delete the original message and
 	// the new duplicate one would stay). API detects duplicates; therefore
 	// we need to remove \Deleted flag if IMAP client re-imports.
-	if isDeleted {
-		if err := im.storeMailbox.MarkMessagesUndeleted([]string{messageID}); err != nil {
+	if msg.IsMarkedDeleted() {
+		if err := im.storeMailbox.MarkMessagesUndeleted([]string{msg.ID()}); err != nil {
 			log.WithError(err).Error("Failed to undelete re-imported message")
 		}
 	}
 
-	if err := im.storeMailbox.LabelMessages([]string{messageID}); err != nil {
+	// Outlook Uses APPEND instead of COPY. There is no need to copy to All Mail because messages are already there.
+	// If the message is copied from Spam or Trash, it must be moved otherwise we will have data loss.
+	// If the message is moved from any folder, the moment when expunge happens on source we will move message trash unless we move it to archive.
+	// If the message is already in Archive we should not call API at all.
+	// Otherwise the message is already in All mail, Return OK.
+	var storeMBox = im.storeMailbox
+	if pmapi.AllMailLabel == storeMBox.LabelID() {
+		if msg.Message().HasLabelID(pmapi.ArchiveLabel) {
+			return uidplus.AppendResponse(storeMBox.UIDValidity(), storeMBox.GetUIDList([]string{msg.ID()}))
+		}
+		var err error
+		storeMBox, err = findMailboxForAddress(im.storeAddress, pmapi.ArchiveLabel)
+		if err != nil {
+			return err
+		}
+	}
+
+	if err := storeMBox.LabelMessages([]string{msg.ID()}); err != nil {
 		return err
 	}
 
-	return uidplus.AppendResponse(im.storeMailbox.UIDValidity(), im.storeMailbox.GetUIDList([]string{messageID}))
+	return uidplus.AppendResponse(im.storeMailbox.UIDValidity(), im.storeMailbox.GetUIDList([]string{msg.ID()}))
 }
 
-func (im *imapMailbox) importMessage(kr *crypto.KeyRing, hdr textproto.Header, body []byte, imapFlags []string, date time.Time) error {
+func (im *imapMailbox) importMessage(kr *crypto.KeyRing, hdr textproto.Header, body []byte, imapFlags []string, date time.Time) error { //nolint[funlen]
 	im.log.Info("Importing external message")
 
 	var (
@@ -211,18 +238,29 @@ func (im *imapMailbox) importMessage(kr *crypto.KeyRing, hdr textproto.Header, b
 		return err
 	}
 
-	messageID, err := im.storeMailbox.ImportMessage(enc, seen, labelIDs, flags, time)
+	var targetMailbox = im.storeMailbox
+	if targetMailbox.LabelID() == pmapi.AllMailLabel {
+		// Importing mail in directly into All Mail is not allowed. Instead we redirect the import to Archive
+		// The mail will automatically appear in All mail. The appends response still reports that the mail was
+		// successfully APPEND to All Mail.
+		targetMailbox, err = findMailboxForAddress(im.storeAddress, pmapi.ArchiveLabel)
+		if err != nil {
+			return err
+		}
+	}
+
+	messageID, err := targetMailbox.ImportMessage(enc, seen, labelIDs, flags, time)
 	if err != nil {
 		return err
 	}
 
-	msg, err := im.storeMailbox.GetMessage(messageID)
+	msg, err := targetMailbox.GetMessage(messageID)
 	if err != nil {
 		return err
 	}
 
 	if msg.IsMarkedDeleted() {
-		if err := im.storeMailbox.MarkMessagesUndeleted([]string{messageID}); err != nil {
+		if err := targetMailbox.MarkMessagesUndeleted([]string{messageID}); err != nil {
 			log.WithError(err).Error("Failed to undelete re-imported message")
 		}
 	}

internal/imap/mailbox_messages.go

@@ -137,8 +137,14 @@ func (im *imapMailbox) setFlags(messageIDs, flags []string) error { //nolint
 	return nil
 }
 
-func (im *imapMailbox) addOrRemoveFlags(operation imap.FlagsOp, messageIDs, flags []string) error {
+func (im *imapMailbox) addOrRemoveFlags(operation imap.FlagsOp, messageIDs, flags []string) error { //nolint[funlen]
 	for _, f := range flags {
+		// Adding flag 'nojunk' is equivalent to removing flag 'junk'
+		if (operation == imap.AddFlags) && (f == "nojunk") {
+			operation = imap.RemoveFlags
+			f = "junk"
+		}
+
 		switch f {
 		case imap.SeenFlag:
 			switch operation { //nolint[exhaustive] imap.SetFlags is processed by im.setFlags
@@ -175,23 +181,37 @@ func (im *imapMailbox) addOrRemoveFlags(operation imap.FlagsOp, messageIDs, flag
 			}
 		case imap.AnsweredFlag, imap.DraftFlag, imap.RecentFlag:
 			// Not supported.
-		case message.AppleMailJunkFlag, message.ThunderbirdJunkFlag:
-			storeMailbox, err := im.storeAddress.GetMailbox("Spam")
+		case strings.ToLower(message.AppleMailJunkFlag), strings.ToLower(message.ThunderbirdJunkFlag):
+			spamMailbox, err := im.storeAddress.GetMailbox("Spam")
 			if err != nil {
 				return err
 			}
-
 			// Handle custom junk flags for Apple Mail and Thunderbird.
 			switch operation { //nolint[exhaustive] imap.SetFlag is processed by im.setFlags
 			// No label removal is necessary because Spam and Inbox are both exclusive labels so the backend
 			// will automatically take care of label removal.
 			case imap.AddFlags:
-				if err := storeMailbox.LabelMessages(messageIDs); err != nil {
+				if err := spamMailbox.LabelMessages(messageIDs); err != nil {
 					return err
 				}
 			case imap.RemoveFlags:
-				if err := storeMailbox.UnlabelMessages(messageIDs); err != nil {
-					return err
+				// During spam flag removal only messages which
+				// are in Spam folder should be moved to Inbox.
+				// For other messages it is NOOP.
+				messagesInSpam := []string{}
+				for _, mID := range messageIDs {
+					if uid := spamMailbox.GetUIDList([]string{mID}); len(*uid) != 0 {
+						messagesInSpam = append(messagesInSpam, mID)
+					}
+				}
+				if len(messagesInSpam) != 0 {
+					inboxMailbox, err := im.storeAddress.GetMailbox("INBOX")
+					if err != nil {
+						return err
+					}
+					if err := inboxMailbox.LabelMessages(messagesInSpam); err != nil {
+						return err
+					}
 				}
 			}
 		}
@@ -230,6 +250,10 @@ func (im *imapMailbox) moveMessages(uid bool, seqSet *imap.SeqSet, targetLabel s
 	// Called from go-imap in goroutines - we need to handle panics for each function.
 	defer im.panicHandler.HandlePanic()
 
+	// Moving from All Mail is not allowed.
+	if im.storeMailbox.LabelID() == pmapi.AllMailLabel {
+		return errors.New("move from All Mail is not allowed")
+	}
 	return im.labelMessages(uid, seqSet, targetLabel, true)
 }
 

internal/sentry/reporter.go

@@ -61,9 +61,17 @@ func NewReporter(appName, appVersion string, userAgent fmt.Stringer) *Reporter {
 }
 
 func (r *Reporter) ReportException(i interface{}) error {
+	return r.ReportExceptionWithContext(i, make(map[string]interface{}))
+}
+
+func (r *Reporter) ReportMessage(msg string) error {
+	return r.ReportMessageWithContext(msg, make(map[string]interface{}))
+}
+
+func (r *Reporter) ReportExceptionWithContext(i interface{}, context map[string]interface{}) error {
 	err := fmt.Errorf("recover: %v", i)
 
-	return r.scopedReport(func() {
+	return r.scopedReport(context, func() {
 		if eventID := sentry.CaptureException(err); eventID != nil {
 			logrus.WithError(err).
 				WithField("reportID", *eventID).
@@ -72,8 +80,8 @@ func (r *Reporter) ReportException(i interface{}) error {
 	})
 }
 
-func (r *Reporter) ReportMessage(msg string) error {
-	return r.scopedReport(func() {
+func (r *Reporter) ReportMessageWithContext(msg string, context map[string]interface{}) error {
+	return r.scopedReport(context, func() {
 		if eventID := sentry.CaptureMessage(msg); eventID != nil {
 			logrus.WithField("message", msg).
 				WithField("reportID", *eventID).
@@ -83,7 +91,7 @@ func (r *Reporter) ReportMessage(msg string) error {
 }
 
 // Report reports a sentry crash with stacktrace from all goroutines.
-func (r *Reporter) scopedReport(doReport func()) error {
+func (r *Reporter) scopedReport(context map[string]interface{}, doReport func()) error {
 	SkipDuringUnwind()
 
 	if os.Getenv("PROTONMAIL_ENV") == "dev" {
@@ -101,6 +109,7 @@ func (r *Reporter) scopedReport(doReport func()) error {
 	sentry.WithScope(func(scope *sentry.Scope) {
 		SkipDuringUnwind()
 		scope.SetTags(tags)
+		scope.SetContexts(context)
 		doReport()
 	})
 

internal/store/event_loop.go

@@ -247,7 +247,12 @@ func (loop *eventLoop) processNextEvent() (more bool, err error) { // nolint[fun
 			l.WithError(err).WithField("errors", loop.errCounter).Error("Error skipped")
 			loop.errCounter++
 			if loop.errCounter == errMaxSentry {
-				if sentryErr := loop.store.sentryReporter.ReportMessage("Warning: event loop issues: " + err.Error() + ", " + loop.currentEventID); sentryErr != nil {
+				context := map[string]interface{}{
+					"EventLoop": map[string]interface{}{
+						"EventID": loop.currentEventID,
+					},
+				}
+				if sentryErr := loop.store.sentryReporter.ReportMessageWithContext("Warning: event loop issues: "+err.Error(), context); sentryErr != nil {
 					l.WithError(sentryErr).Error("Failed to report error to sentry")
 				}
 			}
@@ -302,7 +307,12 @@ func (loop *eventLoop) processEvent(event *pmapi.Event) (err error) {
 		eventLog.Info("Processing refresh event")
 		loop.store.triggerSync()
 
-		if sentryErr := loop.store.sentryReporter.ReportMessage("Warning: refresh occurred, " + loop.currentEventID); sentryErr != nil {
+		context := map[string]interface{}{
+			"EventLoop": map[string]interface{}{
+				"EventID": loop.currentEventID,
+			},
+		}
+		if sentryErr := loop.store.sentryReporter.ReportMessageWithContext("Warning: refresh occurred", context); sentryErr != nil {
 			loop.log.WithError(sentryErr).Error("Failed to report refresh to sentry")
 		}
 

pkg/pmapi/keyring.go

@@ -37,6 +37,7 @@ type PMKey struct {
 	PrivateKey  *crypto.Key
 	Primary     int
 	Token       string
+	Active      Boolean
 	Signature   string
 }
 
@@ -135,6 +136,11 @@ func (keys *PMKeys) UnlockAll(passphrase []byte, userKey *crypto.KeyRing) (kr *c
 	}
 
 	for _, key := range *keys {
+		if !key.Active {
+			logrus.WithField("fingerprint", key.Fingerprint).Warn("Skipping inactive key")
+			continue
+		}
+
 		var secret []byte
 
 		if key.Token == "" || key.Signature == "" {

pkg/pmapi/messages_test.go

@@ -24,8 +24,7 @@ import (
 	"testing"
 
 	"github.com/ProtonMail/gopenpgp/v2/crypto"
-	a "github.com/stretchr/testify/assert"
-	r "github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/require"
 )
 
 const testMessageCleartext = `<div>jeej saas<br></div><div><br></div><div class="protonmail_signature_block"><div>Sent from <a href="https://protonmail.ch">ProtonMail</a>, encrypted email based in Switzerland.<br></div><div><br></div></div>`
@@ -127,70 +126,78 @@ ClW54lp9eeOfYTsdTSbn9VaSO0E6m2/Q4Tk=
 -----END PGP PUBLIC KEY BLOCK-----`
 
 func TestMessage_IsBodyEncrypted(t *testing.T) {
+	r := require.New(t)
 	msg := &Message{Body: testMessageEncrypted}
-	r.True(t, msg.IsBodyEncrypted(), "the body should be encrypted")
+	r.True(msg.IsBodyEncrypted(), "the body should be encrypted")
 
 	msg.Body = testMessageCleartext
-	r.True(t, !msg.IsBodyEncrypted(), "the body should not be encrypted")
+	r.True(!msg.IsBodyEncrypted(), "the body should not be encrypted")
 }
 
 func TestMessage_Decrypt(t *testing.T) {
+	r := require.New(t)
 	msg := &Message{Body: testMessageEncrypted}
 	dec, err := msg.Decrypt(testPrivateKeyRing)
-	r.NoError(t, err)
-	r.Equal(t, testMessageCleartext, string(dec))
+	r.NoError(err)
+	r.Equal(testMessageCleartext, string(dec))
 }
 
 func TestMessage_Decrypt_Legacy(t *testing.T) {
+	r := require.New(t)
 	testPrivateKeyLegacy := readTestFile("testPrivateKeyLegacy", false)
 
 	key, err := crypto.NewKeyFromArmored(testPrivateKeyLegacy)
-	r.NoError(t, err)
+	r.NoError(err)
 
 	unlockedKey, err := key.Unlock([]byte(testMailboxPasswordLegacy))
-	r.NoError(t, err)
+	r.NoError(err)
 
 	testPrivateKeyRingLegacy, err := crypto.NewKeyRing(unlockedKey)
-	r.NoError(t, err)
+	r.NoError(err)
 
 	msg := &Message{Body: testMessageEncryptedLegacy}
 
 	dec, err := msg.Decrypt(testPrivateKeyRingLegacy)
-	r.NoError(t, err)
+	r.NoError(err)
 
-	r.Equal(t, testMessageCleartextLegacy, string(dec))
+	r.Equal(testMessageCleartextLegacy, string(dec))
 }
 
 func TestMessage_Decrypt_signed(t *testing.T) {
+	r := require.New(t)
 	msg := &Message{Body: testMessageSigned}
 	dec, err := msg.Decrypt(testPrivateKeyRing)
-	r.NoError(t, err)
-	r.Equal(t, testMessageCleartext, string(dec))
+	r.NoError(err)
+	r.Equal(testMessageCleartext, string(dec))
 }
 
 func TestMessage_Encrypt(t *testing.T) {
+	r := require.New(t)
+
 	key, err := crypto.NewKeyFromArmored(testMessageSigner)
-	r.NoError(t, err)
+	r.NoError(err)
 
 	signer, err := crypto.NewKeyRing(key)
-	r.NoError(t, err)
+	r.NoError(err)
 
 	msg := &Message{Body: testMessageCleartext}
-	r.NoError(t, msg.Encrypt(testPrivateKeyRing, testPrivateKeyRing))
+	r.NoError(msg.Encrypt(testPrivateKeyRing, testPrivateKeyRing))
 
 	dec, err := msg.Decrypt(testPrivateKeyRing)
-	r.NoError(t, err)
+	r.NoError(err)
 
-	r.Equal(t, testMessageCleartext, string(dec))
-	r.Equal(t, testIdentity, signer.GetIdentities()[0])
+	r.Equal(testMessageCleartext, string(dec))
+	r.Equal(testIdentity, signer.GetIdentities()[0])
 }
 
 func routeLabelMessages(tb testing.TB, w http.ResponseWriter, req *http.Request) string {
-	r.NoError(tb, checkMethodAndPath(req, "PUT", "/mail/v4/messages/label"))
+	require.NoError(tb, checkMethodAndPath(req, "PUT", "/mail/v4/messages/label"))
 	return "messages/label/put_response.json"
 }
 
 func TestMessage_LabelMessages_NoPaging(t *testing.T) {
+	r := require.New(t)
+
 	// This should be only enough IDs to produce one page.
 	testIDs := []string{}
 	for i := 0; i < messageIDPageSize-1; i++ {
@@ -203,10 +210,12 @@ func TestMessage_LabelMessages_NoPaging(t *testing.T) {
 	)
 	defer finish()
 
-	a.NoError(t, c.LabelMessages(context.Background(), testIDs, "mylabel"))
+	r.NoError(c.LabelMessages(context.Background(), testIDs, "mylabel"))
 }
 
 func TestMessage_LabelMessages_Paging(t *testing.T) {
+	r := require.New(t)
+
 	// This should be enough IDs to produce three pages.
 	testIDs := []string{}
 	for i := 0; i < 3*messageIDPageSize; i++ {
@@ -221,5 +230,26 @@ func TestMessage_LabelMessages_Paging(t *testing.T) {
 	)
 	defer finish()
 
-	a.NoError(t, c.LabelMessages(context.Background(), testIDs, "mylabel"))
+	r.NoError(c.LabelMessages(context.Background(), testIDs, "mylabel"))
+}
+
+// TestClient_GetMessage might look like no actual functionality is tested
+// here. But there was case when API was responding with bad payload and it was
+// useful to have this to quickly test it.
+func TestClient_GetMessage(t *testing.T) {
+	r := require.New(t)
+	testID := "AeUizgtA3H44qRgcr-HdBApwLiUhlQg5kB81mg_QalWotmQJIHep9OScWIo7Wu9pnYxM4RqQxJnr3BE4kh4y_Q=="
+
+	finish, c := newTestClientCallbacks(t,
+		func(tb testing.TB, w http.ResponseWriter, req *http.Request) string {
+			r.NoError(checkMethodAndPath(req, "GET", "/mail/v4/messages/"+testID))
+
+			return "/messages/get_response.json"
+		},
+	)
+	defer finish()
+
+	msg, err := c.GetMessage(context.Background(), testID)
+	r.NoError(err)
+	r.Equal(testID, msg.ID)
 }

pkg/pmapi/testdata/keyring_addressKeysPrimaryHasToken_JSON

@@ -2,6 +2,7 @@
   {
 	  "ID": "hKRtZeTDhvzfAaycb5BOVx6Y3hc3gs4QvET8H_YZBTwAQBPp3h6FI4nnkJePCYuM9CG0zf7TQzOJeB2rPi0YmQ==",
 	  "Primary": 1,
+    "Active": 1,
 	  "Flags": 3,
 	  "Version": 3,
 	  "Activation": null,
@@ -12,6 +13,7 @@
   {
     "ID": "MhF8dxtN5Lz_GruskN3L9kTKWusZHBdhWaxc7w1tgze2qB6uM9AyC6mWRQg1B7WGZ_r-9gn-XC95-IkpNJr0jg==",
     "Primary": 0,
+    "Active": 1,
     "Flags": 3,
     "Version": 3,
     "Activation": null,

pkg/pmapi/testdata/keyring_addressKeysSecondaryHasToken_JSON

@@ -2,6 +2,7 @@
   {
     "ID": "MhF8dxtN5Lz_GruskN3L9kTKWusZHBdhWaxc7w1tgze2qB6uM9AyC6mWRQg1B7WGZ_r-9gn-XC95-IkpNJr0jg==",
     "Primary": 1,
+    "Active": 1,
     "Flags": 3,
     "Version": 3,
     "Activation": null,
@@ -12,6 +13,7 @@
   {
 	  "ID": "hKRtZeTDhvzfAaycb5BOVx6Y3hc3gs4QvET8H_YZBTwAQBPp3h6FI4nnkJePCYuM9CG0zf7TQzOJeB2rPi0YmQ==",
 	  "Primary": 0,
+    "Active": 1,
 	  "Flags": 3,
 	  "Version": 3,
 	  "Activation": null,

pkg/pmapi/testdata/keyring_addressKeysWithTokens_JSON

@@ -2,6 +2,7 @@
   {
     "ID": "hKRtZeTDhvzfAaycb5BOVx6Y3hc3gs4QvET8H_YZBTwAQBPp3h6FI4nnkJePCYuM9CG0zf7TQzOJeB2rPi0YmQ==",
     "Primary": 1,
+    "Active": 1,
     "Flags": 3,
     "Version": 3,
     "Activation": null,

pkg/pmapi/testdata/keyring_addressKeysWithoutTokens_JSON

@@ -2,6 +2,7 @@
 	{
 	  "ID": "MhF8dxtN5Lz_GruskN3L9kTKWusZHBdhWaxc7w1tgze2qB6uM9AyC6mWRQg1B7WGZ_r-9gn-XC95-IkpNJr0jg==",
 	  "Primary": 1,
+    "Active": 1,
 	  "Flags": 3,
 	  "Version": 3,
 	  "Activation": null,

pkg/pmapi/testdata/keyring_userKey_JSON

@@ -5,6 +5,7 @@
         "PrivateKey": "-----BEGIN PGP PRIVATE KEY BLOCK-----\r\nVersion: OpenPGP.js v0.7.1\r\nComment: http://openpgpjs.org\r\n\r\n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\nqqGRQm3MxoTdgQUShAwbNwNNQR9cInfMnA==\r\n=2wIY\r\n-----END PGP PRIVATE KEY BLOCK-----\r\n",
         "Fingerprint": "c93f767df53b0ca8395cfde90483475164ec6353",
         "Activation": null,
-        "Primary": 1
+        "Primary": 1,
+        "Active": 1
     }
 ]

pkg/pmapi/testdata/routes/addresses/get_response.json

@@ -21,7 +21,8 @@
                     "PrivateKey": "-----BEGIN PGP PRIVATE KEY BLOCK-----\r\nVersion: OpenPGP.js v0.7.1\r\nComment: http://openpgpjs.org\r\n\r\n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\nqqGRQm3MxoTdgQUShAwbNwNNQR9cInfMnA==\r\n=2wIY\r\n-----END PGP PRIVATE KEY BLOCK-----\r\n",
                     "Activation": null,
                     "Primary": 1,
-                    "Token": null
+                    "Token": null,
+                    "Active": 1
                 }
             ]
         },

pkg/pmapi/testdata/routes/messages/get_response.json

@@ -42,9 +42,11 @@
                 "MIMEType": "text/plain",
                 "KeyPackets": "wcBMA0fcZ7XLgmf2AQgAiRsOlnm1kSB4/lr7tYe6pBsRGn10GqwUhrwU5PMKOHdCgnO12jO3y3CzP0Yl/jGhAYja9wLDqH8X0sk3tY32u4Sb1Qe5IuzggAiCa4dwOJj5gEFMTHMzjIMPHR7A70XqUxMhmILye8V4KRm/j4c1sxbzA1rM3lYBumQuB5l/ck0Kgt4ZqxHVXHK5Q1l65FHhSXRj8qnunasHa30TYNzP8nmBA8BinnJxpiQ7FGc2umnUhgkFtjm5ixu9vyjr9ukwDTbwAXXfmY+o7tK7kqIXJcmTL6k2UeC6Mz1AagQtRCRtU+bv/3zGojq/trZo9lom3naIeQYa36Ketmcpj2Qwjg==",
                 "Headers": {
-                    "content-description": "You'll never believe what's in this text file"
+                    "content-description": "attachment",
+                    "x-pm-incorporated":"1",
+                    "x-pm-notes": ["You'll never believe", "what's in this text file"]
                 },
-                "MessageID": "h3CD-DT7rLoAw1vmpcajvIPAl-wwDfXR2MHtWID3wuQURDBKTiGUAwd6E2WBbS44QQKeXImW-axm6X0hAfcVCA=="
+                "MessageID": "AeUizgtA3H44qRgcr-HdBApwLiUhlQg5kB81mg_QalWotmQJIHep9OScWIo7Wu9pnYxM4RqQxJnr3BE4kh4y_Q=="
             }
         ],
         "LabelIDs": [

pkg/pmapi/testdata/routes/users/get_response.json

@@ -20,7 +20,8 @@
                 "PrivateKey": "-----BEGIN PGP PRIVATE KEY BLOCK-----\r\nVersion: OpenPGP.js v0.7.1\r\nComment: http://openpgpjs.org\r\n\r\n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\nqqGRQm3MxoTdgQUShAwbNwNNQR9cInfMnA==\r\n=2wIY\r\n-----END PGP PRIVATE KEY BLOCK-----\r\n",
                 "Fingerprint": "c93f767df53b0ca8395cfde90483475164ec6353",
                 "Activation": null,
-                "Primary": 1
+                "Primary": 1,
+                "Active": 1
             }
         ]
     }

pkg/pmapi/users_test.go

@@ -61,5 +61,5 @@ func TestClient_CurrentUser(t *testing.T) {
 	// Ignore KeyRings during the check because they have unexported fields and cannot be compared
 	r.True(t, cmp.Equal(user, testCurrentUser, cmpopts.IgnoreTypes(&crypto.Key{})))
 
-	r.Nil(t, c.Unlock(context.Background(), []byte(testMailboxPassword)))
+	r.NoError(t, c.Unlock(context.Background(), []byte(testMailboxPassword)))
 }

test/Makefile

@@ -1,7 +1,7 @@
 .PHONY: check-go check-godog install-godog test test-bridge test-ie test-live test-live-bridge test-live-ie test-stage test-debug test-live-debug bench
 
 export GO111MODULE=on
-export BRIDGE_VERSION:=1.8.10+integrationtests
+export BRIDGE_VERSION:=1.8.12+integrationtests
 export VERBOSITY?=fatal
 export TEST_DATA=testdata
 export TEST_APP?=bridge

test/context/context.go

@@ -177,3 +177,6 @@ func (ctx *TestContext) SetLastError(err error) {
 func (ctx *TestContext) GetLastError() error {
 	return ctx.lastError
 }
+
+func (ctx *TestContext) MessagePreparationStarted()  { ctx.pmapiController.LockEvents() }
+func (ctx *TestContext) MessagePreparationFinished() { ctx.pmapiController.UnlockEvents() }

test/context/pmapi_controller.go

@@ -42,6 +42,8 @@ type PMAPIController interface {
 	WasCalled(method, path string, expectedRequest []byte) bool
 	WasCalledRegex(methodRegex, pathRegex string, expectedRequest []byte) (bool, error)
 	GetCalls(method, path string) [][]byte
+	LockEvents()
+	UnlockEvents()
 }
 
 func newPMAPIController(app string, listener listener.Listener) (PMAPIController, pmapi.Manager) {

test/fakeapi/controller_control.go

@@ -197,3 +197,9 @@ func (ctl *Controller) GetAuthClient(username string) pmapi.Client {
 
 	return nil
 }
+
+// LockEvents doesn't needs to be implemented for fakeAPI.
+func (ctl *Controller) LockEvents() {}
+
+// UnlockEvents doesn't needs to be implemented for fakeAPI.
+func (ctl *Controller) UnlockEvents() {}

test/fakeapi/labels.go

@@ -30,7 +30,16 @@ func (api *FakePMAPI) isLabelFolder(labelID string) bool {
 			return bool(label.Exclusive)
 		}
 	}
-	return labelID == pmapi.InboxLabel || labelID == pmapi.ArchiveLabel || labelID == pmapi.SentLabel
+	switch labelID {
+	case pmapi.InboxLabel,
+		pmapi.TrashLabel,
+		pmapi.SpamLabel,
+		pmapi.ArchiveLabel,
+		pmapi.SentLabel,
+		pmapi.DraftLabel:
+		return true
+	}
+	return false
 }
 
 func (api *FakePMAPI) ListLabels(context.Context) ([]*pmapi.Label, error) {

test/features/bridge/imap/message/copy.feature

@@ -48,6 +48,26 @@ Feature: IMAP copy messages
       | from              | to         | subject | body  | read | deleted |
       | john.doe@mail.com | user@pm.me | foo     | hello | true | false   |
 
+  Scenario: Copy message from All mail moves from the original location
+    Given there is IMAP client selected in "All Mail"
+    When IMAP client copies message seq "1" to "Folders/mbox"
+    Then IMAP response is "OK"
+    And mailbox "INBOX" for "user" has 2 messages
+    And mailbox "INBOX" for "user" has messages
+      | from              | to         | subject  | body  | read  | deleted |
+      | jane.doe@mail.com | name@pm.me | bar      | world | false | true    |
+      | john.doe@mail.com | user@pm.me | response | hello | true  | false   |
+    And mailbox "All Mail" for "user" has 3 messages
+    And mailbox "All Mail" for "user" has messages
+      | from              | to         | subject  | body  | read  | deleted |
+      | john.doe@mail.com | user@pm.me | foo      | hello | true  | false   |
+      | jane.doe@mail.com | name@pm.me | bar      | world | false | false   |
+      | john.doe@mail.com | user@pm.me | response | hello | true  | false   |
+    And mailbox "Folders/mbox" for "user" has 1 messages
+    And mailbox "Folders/mbox" for "user" has messages
+      | from              | to         | subject | body  | read | deleted |
+      | john.doe@mail.com | user@pm.me | foo     | hello | true | false   |
+
   Scenario: Copy all messages to folder does move
     Given there is IMAP client selected in "INBOX"
     When IMAP client copies message seq "1:*" to "Folders/mbox"

test/features/bridge/imap/message/create.feature

@@ -65,6 +65,7 @@ Feature: IMAP create messages
       | from      | to             | subject        | body                |
       | [primary] | chosen@one.com | Meet the Twins | Hello, Mr. Anderson |
     And there is IMAP client selected in "Sent"
+    Then mailbox "Sent" for "userMoreAddresses" has 1 messages
     When IMAP client creates message "Meet the Twins" from address "primary" of "userMoreAddresses" to "chosen@one.com" with body "Hello, Mr. Anderson" in "Sent"
     Then IMAP response is "OK"
     And mailbox "Sent" for "userMoreAddresses" has 2 messages

test/features/bridge/imap/message/delete.feature

@@ -96,12 +96,22 @@ Feature: IMAP remove messages from mailbox
       | LOGOUT        | 9  |
       | UNSELECT      | 10 |
 
-  Scenario: Not possible to delete from All Mail
-    Given there are 1 messages in mailbox "INBOX" for "user"
+  Scenario: Not possible to delete from All Mail and expunge does nothing
+    Given there are messages in mailbox "INBOX" for "user"
+      | id | from              | to         | subject | body  |
+      | 1  | john.doe@mail.com | user@pm.me | subj1   | body1 |
     And there is IMAP client logged in as "user"
     And there is IMAP client selected in "All Mail"
     When IMAP client marks message seq "1" as deleted
     Then IMAP response is "IMAP error: NO operation not allowed for 'All Mail' folder"
+    And mailbox "All Mail" for "user" has messages
+      | from              | to         | subject |
+      | john.doe@mail.com | user@pm.me | subj1   |
+    When IMAP client sends expunge
+    Then IMAP response is "OK"
+    And mailbox "All Mail" for "user" has messages
+      | from              | to         | subject |
+      | john.doe@mail.com | user@pm.me | subj1   |
 
   Scenario: Expunge specific message only
     Given there are 5 messages in mailbox "INBOX" for "user"

test/features/bridge/imap/message/import.feature

@@ -198,3 +198,23 @@ Feature: IMAP import messages
 
       """
     Then IMAP response is "OK \[APPENDUID \d 1\] APPEND completed"
+
+  Scenario: Import message to All Mail
+    When IMAP client imports message to "All Mail"
+      """
+      From: Foo <from1@pm.me>
+      To: Bridge Test <to1@pm.me>
+      Subject: subj1
+      Received: by 2002:0:0:0:0:0:0:0 with SMTP id 0123456789abcdef; Wed, 30 Dec 2020 01:23:45 0000
+
+      body1
+      """
+    Then IMAP response is "OK \[APPENDUID \d 1\] APPEND completed"
+    Then mailbox "Archive" for "user" has messages
+      | from        | to        | subject | body
+      | from1@pm.me | to1@pm.me | subj1   | body1
+    And API mailbox "Archive" for "user" has 1 message
+    And mailbox "All Mail" for "user" has messages
+      | from        | to        | subject | body
+      | from1@pm.me | to1@pm.me | subj1   | body1
+    And API mailbox "All Mail" for "user" has 1 message

test/features/bridge/imap/message/move.feature

@@ -80,16 +80,12 @@ Feature: IMAP move messages
   Scenario: Move message from All Mail is not possible
     Given there is IMAP client selected in "All Mail"
     When IMAP client moves message seq "1" to "Folders/folder"
-    Then IMAP response is "OK"
+    Then IMAP response is "NO move from All Mail is not allowed"
     And mailbox "All Mail" for "user" has messages
       | from              | to         | subject |
       | john.doe@mail.com | user@pm.me | foo     |
       | jane.doe@mail.com | name@pm.me | bar     |
-    And mailbox "Folders/folder" for "user" has messages
-      | from              | to         | subject |
-      | john.doe@mail.com | user@pm.me | baz     |
-    And API endpoint "PUT /mail/v4/messages/label" is called
-    And API endpoint "PUT /mail/v4/messages/unlabel" is not called
+    And mailbox "Folders/folder" for "user" has 0 messages
 
   Scenario: Move message from Inbox to Sent is not possible
     Given there is IMAP client selected in "INBOX"

test/features/bridge/imap/message/move_without_support.feature

@@ -5,52 +5,73 @@ Feature: IMAP move messages by append and delete (without MOVE support, e.g., Ou
     And there is IMAP client "source" logged in as "user"
     And there is IMAP client "target" logged in as "user"
 
-  Scenario Outline: Move message from INBOX to mailbox by append and delete
-    Given there are messages in mailbox "INBOX" for "user"
-      | id | from              | to         | subject | body  |
-      | 1  | john.doe@mail.com | user@pm.me | foo     | hello |
-      | 2  | jane.doe@mail.com | name@pm.me | bar     | world |
-    And there is IMAP client "source" selected in "INBOX"
-    And there is IMAP client "target" selected in "<mailbox>"
-    When IMAP clients "source" and "target" move message seq "2" of "user" from "INBOX" to "<mailbox>" by append and delete
+  Scenario Outline: Move message from <srcMailbox> to <dstMailbox> by <order>
+    Given there are messages in mailbox "<srcMailbox>" for "user"
+      | id | from        | to          | subject | body  |
+      | 1  | sndr1@pm.me | rcvr1@pm.me | subj1   | body1 |
+      | 2  | sndr2@pm.me | rcvr2@pm.me | subj2   | body2 |
+    And there is IMAP client "source" selected in "<srcMailbox>"
+    And there is IMAP client "target" selected in "<dstMailbox>"
+    When IMAP clients "source" and "target" move message seq "2" of "user" to "<dstMailbox>" by <order>
     Then IMAP response to "source" is "OK"
     Then IMAP response to "target" is "OK"
-    When IMAP client "source" sends expunge
-    Then IMAP response to "source" is "OK"
-    And mailbox "INBOX" for "user" has messages
-      | from              | to         | subject |
-      | john.doe@mail.com | user@pm.me | foo     |
-    And mailbox "<mailbox>" for "user" has messages
-      | from              | to         | subject |
-      | jane.doe@mail.com | name@pm.me | bar     |
-
+    And mailbox "<dstMailbox>" for "user" has 1 messages
+    And mailbox "<dstMailbox>" for "user" has messages
+      | from        | to          | subject |
+      | sndr2@pm.me | rcvr2@pm.me | subj2   |
+    And mailbox "<srcMailbox>" for "user" has 1 messages
+    And mailbox "<srcMailbox>" for "user" has messages
+      | from        | to          | subject |
+      | sndr1@pm.me | rcvr1@pm.me | subj1   |
     Examples:
-      | mailbox      |
-      | Archive      |
-      | Folders/mbox |
-      | Spam         |
-      | Trash        |
+      | srcMailbox | dstMailbox   | order                 |
+      | Trash      | INBOX        | APPEND DELETE EXPUNGE |
+      | Spam       | INBOX        | APPEND DELETE EXPUNGE |
+      | INBOX      | Archive      | APPEND DELETE EXPUNGE |
+      | INBOX      | Folders/mbox | APPEND DELETE EXPUNGE |
+      | INBOX      | Spam         | APPEND DELETE EXPUNGE |
+      | INBOX      | Trash        | APPEND DELETE EXPUNGE |
+      | Trash      | INBOX        | DELETE APPEND EXPUNGE |
+      | Spam       | INBOX        | DELETE APPEND EXPUNGE |
+      | INBOX      | Archive      | DELETE APPEND EXPUNGE |
+      | INBOX      | Folders/mbox | DELETE APPEND EXPUNGE |
+      | INBOX      | Spam         | DELETE APPEND EXPUNGE |
+      | INBOX      | Trash        | DELETE APPEND EXPUNGE |
+      | Trash      | INBOX        | DELETE EXPUNGE APPEND |
+      | Spam       | INBOX        | DELETE EXPUNGE APPEND |
+      | INBOX      | Archive      | DELETE EXPUNGE APPEND |
+      | INBOX      | Folders/mbox | DELETE EXPUNGE APPEND |
+      | INBOX      | Spam         | DELETE EXPUNGE APPEND |
+      | INBOX      | Trash        | DELETE EXPUNGE APPEND |
 
-  Scenario Outline: Move message from Trash/Spam to INBOX by append and delete
+  Scenario Outline: Move message from <mailbox> to All Mail by <order>
     Given there are messages in mailbox "<mailbox>" for "user"
       | id | from              | to         | subject | body  |
-      | 1  | john.doe@mail.com | user@pm.me | foo     | hello |
-      | 2  | jane.doe@mail.com | name@pm.me | bar     | world |
+      | 1  | john.doe@mail.com | user@pm.me | subj1   | body1 |
+      | 2  | john.doe@mail.com | name@pm.me | subj2   | body2 |
     And there is IMAP client "source" selected in "<mailbox>"
-    And there is IMAP client "target" selected in "INBOX"
-    When IMAP clients "source" and "target" move message seq "2" of "user" from "<mailbox>" to "INBOX" by append and delete
+    And there is IMAP client "target" selected in "All Mail"
+    When IMAP clients "source" and "target" move message seq "2" of "user" to "All Mail" by <order>
     Then IMAP response to "source" is "OK"
     Then IMAP response to "target" is "OK"
-    When IMAP client "source" sends expunge
-    Then IMAP response to "source" is "OK"
-    And mailbox "INBOX" for "user" has messages
-      | from              | to         | subject |
-      | jane.doe@mail.com | name@pm.me | bar     |
     And mailbox "<mailbox>" for "user" has messages
       | from              | to         | subject |
-      | john.doe@mail.com | user@pm.me | foo     |
-
+      | john.doe@mail.com | user@pm.me | subj1   |
+    And mailbox "All Mail" for "user" has messages
+       | from              | to         | subject |
+       | john.doe@mail.com | user@pm.me | subj1   |
+       | john.doe@mail.com | name@pm.me | subj2   |
     Examples:
-      | mailbox |
-      | Spam    |
-      | Trash   |
+      | mailbox | order                 |
+      | INBOX   | APPEND DELETE EXPUNGE |
+      | Archive | APPEND DELETE EXPUNGE |
+      | Trash   | APPEND DELETE EXPUNGE |
+      | Spam    | APPEND DELETE EXPUNGE |
+      | INBOX   | DELETE APPEND EXPUNGE |
+      | Archive | DELETE APPEND EXPUNGE |
+      | Trash   | DELETE APPEND EXPUNGE |
+      | Spam    | DELETE APPEND EXPUNGE |
+      | INBOX   | DELETE EXPUNGE APPEND |
+      | Archive | DELETE EXPUNGE APPEND |
+      | Trash   | DELETE EXPUNGE APPEND |
+      | Spam    | DELETE EXPUNGE APPEND |

test/features/bridge/imap/message/update_spam.feature

@@ -19,3 +19,44 @@ Feature: IMAP update messages in Spam folder
       | from              | to         | subject |
       | john.doe@mail.com | user@pm.me | foo     |
       | jane.doe@mail.com | name@pm.me | bar     |
+
+  Scenario Outline: Move from Spam to INBOX when client <operation> <flag>
+    When IMAP client <operation> flags "<flag>" <suffix> message seq "1"
+    Then IMAP response is "OK"
+    And mailbox "INBOX" for "user" has 1 messages
+    And mailbox "INBOX" for "user" has messages
+      | from              | to         | subject |
+      | john.doe@mail.com | user@pm.me | foo     |
+    And mailbox "Spam" for "user" has 1 messages
+    And mailbox "Spam" for "user" has messages
+      | from              | to         | subject |
+      | jane.doe@mail.com | name@pm.me | bar     |
+    Examples:
+    | operation | suffix | flag   |
+    | adds      | to     | nojunk |
+    | adds      | to     | NoJunk |
+    | removes   | from   | junk   |
+    | removes   | from   | Junk   |
+    | removes   | from   | $Junk  |
+
+  Scenario Outline: Do not move from Archive to INBOX when client <operation> <flag>
+    Given there are messages in mailbox "Archive" for "user"
+      | id | from              | to         | subject  | body  | read  | starred | deleted |
+      | 1  | john.doe@mail.com | user@pm.me | Archived | hello | false | false   | false   |
+    And there is IMAP client selected in "Archive"
+    When IMAP client <operation> flags "<flag>" <suffix> message seq "1"
+    Then IMAP response is "OK"
+    And mailbox "INBOX" for "user" has 0 messages
+    And mailbox "Archive" for "user" has 1 messages
+    And mailbox "Archive" for "user" has messages
+      | from              | to         | subject  |
+      | john.doe@mail.com | user@pm.me | Archived |
+    Examples:
+    | operation | suffix | flag   |
+    | adds      | to     | nojunk |
+    | adds      | to     | NoJunk |
+    | removes   | from   | junk   |
+    | removes   | from   | Junk   |
+    | removes   | from   | $Junk  |
+
+

test/imap_actions_messages_test.go

@@ -18,10 +18,14 @@
 package tests
 
 import (
+	"errors"
 	"fmt"
 	"strconv"
+	"strings"
 	"sync"
+	"time"
 
+	"github.com/ProtonMail/proton-bridge/test/mocks"
 	"github.com/cucumber/godog"
 	"golang.org/x/net/html/charset"
 )
@@ -35,7 +39,8 @@ func IMAPActionsMessagesFeatureContext(s *godog.ScenarioContext) {
 	s.Step(`^IMAP client searches for "([^"]*)"$`, imapClientSearchesFor)
 	s.Step(`^IMAP client copies message seq "([^"]*)" to "([^"]*)"$`, imapClientCopiesMessagesTo)
 	s.Step(`^IMAP client moves message seq "([^"]*)" to "([^"]*)"$`, imapClientMovesMessagesTo)
-	s.Step(`^IMAP clients "([^"]*)" and "([^"]*)" move message seq "([^"]*)" of "([^"]*)" from "([^"]*)" to "([^"]*)" by append and delete$`, imapClientsMoveMessageSeqOfUserFromToByAppendAndDelete)
+	s.Step(`^IMAP clients "([^"]*)" and "([^"]*)" move message seq "([^"]*)" of "([^"]*)" from "([^"]*)" to "([^"]*)"$`, imapClientsMoveMessageSeqOfUserFromTo)
+	s.Step(`^IMAP clients "([^"]*)" and "([^"]*)" move message seq "([^"]*)" of "([^"]*)" to "([^"]*)" by ([^"]*) ([^"]*) ([^"]*)`, imapClientsMoveMessageSeqOfUserFromToByOrederedOperations)
 	s.Step(`^IMAP client imports message to "([^"]*)"$`, imapClientCreatesMessage)
 	s.Step(`^IMAP client imports message to "([^"]*)" with encoding "([^"]*)"$`, imapClientCreatesMessageWithEncoding)
 	s.Step(`^IMAP client creates message "([^"]*)" from "([^"]*)" to "([^"]*)" with body "([^"]*)" in "([^"]*)"$`, imapClientCreatesMessageFromToWithBody)
@@ -43,6 +48,10 @@ func IMAPActionsMessagesFeatureContext(s *godog.ScenarioContext) {
 	s.Step(`^IMAP client creates message "([^"]*)" from address "([^"]*)" of "([^"]*)" to "([^"]*)" with body "([^"]*)" in "([^"]*)"$`, imapClientCreatesMessageFromAddressOfUserToWithBody)
 	s.Step(`^IMAP client marks message seq "([^"]*)" with "([^"]*)"$`, imapClientMarksMessageSeqWithFlags)
 	s.Step(`^IMAP client "([^"]*)" marks message seq "([^"]*)" with "([^"]*)"$`, imapClientNamedMarksMessageSeqWithFlags)
+	s.Step(`^IMAP client adds flags "([^"]*)" to message seq "([^"]*)"$`, imapClientAddsFlagsToMessageSeq)
+	s.Step(`^IMAP client "([^"]*)" adds flags "([^"]*)" to message seq "([^"]*)"$`, imapClientNamedAddsFlagsToMessageSeq)
+	s.Step(`^IMAP client removes flags "([^"]*)" from message seq "([^"]*)"$`, imapClientRemovesFlagsFromMessageSeq)
+	s.Step(`^IMAP client "([^"]*)" removes flags "([^"]*)" from message seq "([^"]*)"$`, imapClientNamedRemovesFlagsFromMessageSeq)
 	s.Step(`^IMAP client marks message seq "([^"]*)" as read$`, imapClientMarksMessageSeqAsRead)
 	s.Step(`^IMAP client "([^"]*)" marks message seq "([^"]*)" as read$`, imapClientNamedMarksMessageSeqAsRead)
 	s.Step(`^IMAP client marks message seq "([^"]*)" as unread$`, imapClientMarksMessageSeqAsUnread)
@@ -113,7 +122,7 @@ func imapClientMovesMessagesTo(messageSeq, newMailboxName string) error {
 	return nil
 }
 
-func imapClientsMoveMessageSeqOfUserFromToByAppendAndDelete(sourceIMAPClient, targetIMAPClient, messageSeq, bddUserID, sourceMailboxName, targetMailboxName string) error {
+func imapClientsMoveMessageSeqOfUserFromTo(sourceIMAPClient, targetIMAPClient, messageSeq, bddUserID, sourceMailboxName, targetMailboxName string) error {
 	account := ctx.GetTestAccount(bddUserID)
 	if account == nil {
 		return godog.ErrPending
@@ -160,6 +169,49 @@ func imapClientsMoveMessageSeqOfUserFromToByAppendAndDelete(sourceIMAPClient, ta
 	return nil
 }
 
+func extractMessageBodyFromImapResponse(response *mocks.IMAPResponse) (string, error) {
+	sections := response.Sections()
+	if len(sections) != 1 {
+		return "", internalError(errors.New("unexpected result from FETCH"), "retrieving message body using FETCH")
+	}
+	sections = strings.Split(sections[0], "\n")
+	if len(sections) < 2 {
+		return "", internalError(errors.New("failed to parse FETCH result"), "extraction body from FETCH reply")
+	}
+	return strings.Join(sections[1:], "\n"), nil
+}
+
+func imapClientsMoveMessageSeqOfUserFromToByOrederedOperations(sourceIMAPClient, targetIMAPClient, messageSeq, bddUserID, targetMailboxName, op1, op2, op3 string) error {
+	account := ctx.GetTestAccount(bddUserID)
+	if account == nil {
+		return godog.ErrPending
+	}
+
+	// call NOOP to prevent unilateral updates in following FETCH
+	ctx.GetIMAPClient(sourceIMAPClient).Noop().AssertOK()
+
+	msgStr, err := extractMessageBodyFromImapResponse(ctx.GetIMAPClient(sourceIMAPClient).Fetch(messageSeq, "BODY.PEEK[]").AssertOK())
+	if err != nil {
+		return err
+	}
+
+	for _, op := range []string{op1, op2, op3} {
+		switch op {
+		case "APPEND":
+			res := ctx.GetIMAPClient(targetIMAPClient).Append(targetMailboxName, msgStr)
+			ctx.SetIMAPLastResponse(targetIMAPClient, res)
+		case "DELETE":
+			_ = imapClientNamedMarksMessageSeqAsDeleted(sourceIMAPClient, messageSeq)
+		case "EXPUNGE":
+			_ = imapClientNamedExpunge(sourceIMAPClient)
+		default:
+			return errors.New("unknow IMAP operation " + op)
+		}
+		time.Sleep(100 * time.Millisecond)
+	}
+	return nil
+}
+
 func imapClientCreatesMessage(mailboxName string, message *godog.DocString) error {
 	return imapClientCreatesMessageWithEncoding(mailboxName, "utf8", message)
 }
@@ -222,6 +274,26 @@ func imapClientNamedMarksMessageSeqWithFlags(imapClient, messageSeq, flags strin
 	return nil
 }
 
+func imapClientAddsFlagsToMessageSeq(flags, messageSeq string) error {
+	return imapClientNamedAddsFlagsToMessageSeq("imap", flags, messageSeq)
+}
+
+func imapClientNamedAddsFlagsToMessageSeq(imapClient, flags, messageSeq string) error {
+	res := ctx.GetIMAPClient(imapClient).AddFlags(messageSeq, flags)
+	ctx.SetIMAPLastResponse(imapClient, res)
+	return nil
+}
+
+func imapClientRemovesFlagsFromMessageSeq(flags, messageSeq string) error {
+	return imapClientNamedRemovesFlagsFromMessageSeq("imap", flags, messageSeq)
+}
+
+func imapClientNamedRemovesFlagsFromMessageSeq(imapClient, flags, messageSeq string) error {
+	res := ctx.GetIMAPClient(imapClient).RemoveFlags(messageSeq, flags)
+	ctx.SetIMAPLastResponse(imapClient, res)
+	return nil
+}
+
 func imapClientMarksMessageSeqAsRead(messageSeq string) error {
 	return imapClientNamedMarksMessageSeqAsRead("imap", messageSeq)
 }

test/liveapi/events.go

@@ -0,0 +1,26 @@
+// Copyright (c) 2021 Proton Technologies AG
+//
+// This file is part of ProtonMail Bridge.Bridge.
+//
+// ProtonMail Bridge is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// ProtonMail Bridge is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
+
+package liveapi
+
+func (ctl *Controller) LockEvents() {
+	persistentClients.eventsPaused.Add(1)
+}
+
+func (ctl *Controller) UnlockEvents() {
+	persistentClients.eventsPaused.Done()
+}

test/liveapi/persistent_clients.go

@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"math/rand"
 	"os"
+	"sync"
 
 	"github.com/ProtonMail/go-srp"
 	"github.com/ProtonMail/proton-bridge/internal/constants"
@@ -47,6 +48,8 @@ var persistentClients = struct {
 	manager    pmapi.Manager
 	byName     map[string]clientAuthGetter
 	saltByName map[string]string
+
+	eventsPaused sync.WaitGroup
 }{}
 
 type persistentClient struct {
@@ -69,6 +72,17 @@ func (pc *persistentClient) AuthSalt(_ context.Context) (string, error) {
 	return persistentClients.saltByName[pc.username], nil
 }
 
+// GetEvent needs to wait for preparation to finish. Otherwise messages will be
+// in wrong order and test will fail.
+func (pc *persistentClient) GetEvent(ctx context.Context, eventID string) (*pmapi.Event, error) {
+	persistentClients.eventsPaused.Wait()
+	normalClient, ok := persistentClients.byName[pc.username].(pmapi.Client)
+	if !ok {
+		return nil, errors.New("cannot convert to normal client")
+	}
+	return normalClient.GetEvent(ctx, eventID)
+}
+
 func SetupPersistentClients() {
 	app := os.Getenv("TEST_APP")
 

test/mocks/imap_client.go

@@ -253,6 +253,10 @@ func (c *IMAPClient) ExpungeUID(ids string) *IMAPResponse {
 	return c.SendCommand(fmt.Sprintf("UID EXPUNGE %s", ids))
 }
 
+func (c *IMAPClient) Noop() *IMAPResponse {
+	return c.SendCommand("NOOP")
+}
+
 // Extennsions
 // Extennsions: IDLE
 

test/mocks/imap_response.go

@@ -107,6 +107,11 @@ func (ir *IMAPResponse) AssertOK() *IMAPResponse {
 	return ir
 }
 
+func (ir *IMAPResponse) Sections() []string {
+	ir.wait()
+	return ir.sections
+}
+
 func (ir *IMAPResponse) AssertResult(wantResult string) *IMAPResponse {
 	ir.wait()
 	a.NoError(ir.t, ir.err)

test/store_setup_test.go

@@ -75,6 +75,13 @@ func thereAreMessagesInMailboxesForUser(mailboxNames, bddUserID string, messages
 }
 
 func thereAreMessagesInMailboxesForAddressOfUser(mailboxNames, bddAddressID, bddUserID string, messages *godog.Table) error {
+	// It is needed to prevent event processing before syncing these message
+	// otherwise the seqID and UID will be in reverse order. The
+	// synchronization add newest message first, the eventloop adds the oldest
+	// message first.
+	ctx.MessagePreparationStarted()
+	defer ctx.MessagePreparationFinished()
+
 	account := ctx.GetTestAccountWithAddress(bddUserID, bddAddressID)
 	if account == nil {
 		return godog.ErrPending
@@ -101,6 +108,11 @@ func thereAreMessagesInMailboxesForAddressOfUser(mailboxNames, bddAddressID, bdd
 
 		if message.HasLabelID(pmapi.SentLabel) {
 			message.Flags |= pmapi.FlagSent
+		} else {
+			// some tests (Outlook move by DELETE EXPUNGE APPEND) imply creating hard copies of emails,
+			// and the importMessage() function flags the email as Sent if the 'Received' key in not present in the
+			// header.
+			header.Add("Received", "from dummy.protonmail.com")
 		}
 
 		bddMessageID := ""
@@ -258,6 +270,13 @@ func processMailboxStructureDataTable(structure *godog.Table, callback func(stri
 }
 
 func thereAreSomeMessagesInMailboxesForAddressOfUser(numberOfMessages int, mailboxNames, bddAddressID, bddUserID string) error {
+	// It is needed to prevent event processing before syncing these message
+	// otherwise the seqID and UID will be in reverse order. The
+	// synchronization add newest message first, the eventloop adds the oldest
+	// message first.
+	ctx.MessagePreparationStarted()
+	defer ctx.MessagePreparationFinished()
+
 	account := ctx.GetTestAccountWithAddress(bddUserID, bddAddressID)
 	if account == nil {
 		return godog.ErrPending

test/testdata/address_key.json

@@ -2,6 +2,7 @@
     {
         "ID": "MhF8dxtN5Lz_GruskN3L9kTKWusZHBdhWaxc7w1tgze2qB6uM9AyC6mWRQg1B7WGZ_r-9gn-XC95-IkpNJr0jg==",
         "Primary": 1,
+        "Active": 1,
         "Flags": 3,
         "Version": 3,
         "Activation": null,

test/testdata/user_key.json

@@ -5,6 +5,7 @@
         "PrivateKey": "-----BEGIN PGP PRIVATE KEY BLOCK-----\r\n\r\n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\r\na7RmMPBR30nWAMrvteun5z2n8rizgEZHcmE=\r\n=2e5K\r\n-----END PGP PRIVATE KEY BLOCK-----",
         "Fingerprint": "c93f767df53b0ca8395cfde90483475164ec6353",
         "Activation": null,
-        "Primary": 1
+        "Primary": 1,
+        "Active": 1
     }
 ]