fix(GODT-1617): correctly parse headers with space lines.

rfc822/header.go

@@ -218,7 +218,7 @@ func ParseHeader(header []byte) *Header {
 		split := splitLine(line)
 
 		switch {
-		case len(bytes.TrimSpace(line)) == 0:
+		case len(bytes.Trim(line, "\r\n")) == 0:
 			lines = append(lines, line)
 
 		case quote%2 != 0, rxWhitespace.Match(split[0]), len(split) != 2:

rfc822/header_test.go

@@ -180,10 +180,10 @@ func TestParseHeaderMultilineFilenameWithColonAndNewline(t *testing.T) {
 }
 
 func TestParseHeaderMultilineIndent(t *testing.T) {
-	const header = "Subject: a very\r\n\tlong: line with a colon and indent\r\nFrom: sender\r\n"
+	const header = "Subject: a very\r\n\tlong: line with a colon and indent\r\n \r\nand space line\r\nFrom: sender\r\n"
 
 	assert.Equal(t, [][]byte{
-		[]byte("Subject: a very\r\n\tlong: line with a colon and indent\r\n"),
+		[]byte("Subject: a very\r\n\tlong: line with a colon and indent\r\n \r\nand space line\r\n"),
 		[]byte("From: sender\r\n"),
 	}, ParseHeader([]byte(header)).lines)
 }

rfc822/parser.go

@@ -143,7 +143,7 @@ func Split(b []byte) ([]byte, []byte, error) {
 
 		header = append(header, b...)
 
-		if len(bytes.TrimSpace(b)) == 0 {
+		if len(bytes.Trim(b, "\r\n")) == 0 {
 			break
 		}
 	}

rfc822/parser_test.go

@@ -159,3 +159,46 @@ From me`, string(section.Part(2, 1).Literal()))
 
 This part is also embedded`, string(section.Part(2, 2).Literal()))
 }
+
+func TestParseSpaceLineHeaderMessage(t *testing.T) {
+	const literal = `Content-Type: text/plain
+Date: Thu, 03 Sep 2020 16:47:43 +0000 (UTC)
+Subject: Sometimes
+ 
+ header fields can be long and contain space line :shrug:
+From: Dad <[email protected]>
+To: Ships <[email protected]>
+
+Why does the Norway navy have bar codes on the side of their ships?
+
+So when they com back to port they can
+
+Scandinavian
+`
+
+	section, err := Parse([]byte(literal))
+	require.NoError(t, err)
+
+	assert.Equal(t, literal, string(section.Literal()))
+
+	assert.Equal(t, `Content-Type: text/plain
+Date: Thu, 03 Sep 2020 16:47:43 +0000 (UTC)
+Subject: Sometimes
+ 
+ header fields can be long and contain space line :shrug:
+From: Dad <[email protected]>
+To: Ships <[email protected]>
+
+`,
+		string(section.Header()),
+	)
+
+	assert.Equal(t, `Why does the Norway navy have bar codes on the side of their ships?
+
+So when they com back to port they can
+
+Scandinavian
+`,
+		string(section.Body()),
+	)
+}

tests/append_test.go

@@ -1,6 +1,8 @@
 package tests
 
 import (
+	"bytes"
+	"os"
 	"testing"
 	"time"
 
@@ -126,3 +128,49 @@ func TestAppendWhileSelected(t *testing.T) {
 		require.Equal(t, uint32(1), status.Messages, "Expected message count does not match")
 	})
 }
+
+func TestAppendHeaderWithSpaceLine(t *testing.T) {
+	r := require.New(t)
+
+	const (
+		mailboxName = "saved-messages"
+		messagePath = "testdata/space_line_header.eml"
+	)
+
+	// Get full header from file
+	fullMessage, err := os.ReadFile(messagePath)
+	r.NoError(err)
+
+	endOfHeader := []byte{13, 10, 13, 10}
+	endOfHeaderKey := bytes.Index(fullMessage, endOfHeader)
+
+	r.NotEqual(-1, endOfHeaderKey)
+	wantHeader := string(fullMessage[0 : endOfHeaderKey+len(endOfHeader)])
+
+	runOneToOneTestClientWithAuth(t, defaultServerOptions(t), func(client *client.Client, _ *testSession) {
+		r.NoError(client.Create(mailboxName))
+		// Mailbox should have read-write modifier
+		mailboxStatus, err := client.Select(mailboxName, false)
+		r.NoError(err)
+		r.False(mailboxStatus.ReadOnly)
+
+		// Add new message
+		require.NoError(t, doAppendWithClientFromFile(t, client, mailboxName, messagePath, time.Now(), goimap.SeenFlag))
+		// EXISTS response is assigned to Messages member
+		require.Equal(t, uint32(1), client.Mailbox().Messages)
+		// Check if added
+		status, err := client.Status(mailboxName, []goimap.StatusItem{goimap.StatusMessages})
+		require.NoError(t, err)
+		require.Equal(t, uint32(1), status.Messages, "Expected message count does not match")
+		// Check has full header
+		newFetchCommand(t, client).
+			withItems(goimap.FetchRFC822Header).fetch("1").
+			forSeqNum(1, func(v *validatorBuilder) {
+				v.ignoreFlags()
+				v.wantSectionString(goimap.FetchRFC822Header, func(t testing.TB, literal string) {
+					haveHeader := skipGLUONHeader(literal)
+					r.Equal(wantHeader, haveHeader)
+				})
+			}).check()
+	})
+}

tests/testdata/space_line_header.eml

@@ -0,0 +1,14 @@
+Content-Type: text/plain
+Date: Thu, 03 Sep 2020 16:47:43 +0000 (UTC)
+Subject: Sometimes
+
+ header fields can be long and contain space line :shrug:
+From: Dad <[email protected]>
+To: Ships <[email protected]>
+
+Why does the Norway navy have bar codes on the side of their ships?
+
+So when they com back to port they can
+
+Scandinavian
+