yesBad/proton-bridge
1
0
Fork 0
Code Actions Activity

GODT-1081 Return newline after headers with every fetch

Browse Source
This commit is contained in:
Michal Horejsek
2021-04-08 14:07:51 +02:00
parent 2b8d92e82d
commit 14d42b5e76
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/imap/mailbox_message.go
View File

@ -410,12 +410,13 @@ func isMessageInDraftFolder(m *pmapi.Message) bool {
// This will download message (or read from cache) and pick up the section, // This will download message (or read from cache) and pick up the section,
// extract data (header,body, both) and trim the output if needed. // extract data (header,body, both) and trim the output if needed.
func (im *imapMailbox) getMessageBodySection( func (im *imapMailbox) getMessageBodySection( //nolint[funlen]
storeMessage storeMessageProvider, storeMessage storeMessageProvider,
section *imap.BodySectionName, section *imap.BodySectionName,
msgBuildCountHistogram *msgBuildCountHistogram, msgBuildCountHistogram *msgBuildCountHistogram,
) (imap.Literal, error) { ) (imap.Literal, error) {
var header textproto.MIMEHeader var header textproto.MIMEHeader
var extraNewlineAfterHeader bool
var response []byte var response []byte
im.log.WithField("msgID", storeMessage.ID()).Trace("Getting message body") im.log.WithField("msgID", storeMessage.ID()).Trace("Getting message body")
@ -449,6 +450,9 @@ func (im *imapMailbox) getMessageBodySection(
case section.Specifier == imap.MIMESpecifier: // The MIME part specifier refers to the [MIME-IMB] header for this part. case section.Specifier == imap.MIMESpecifier: // The MIME part specifier refers to the [MIME-IMB] header for this part.
fallthrough fallthrough
case section.Specifier == imap.HeaderSpecifier: case section.Specifier == imap.HeaderSpecifier:
if content, err := structure.GetSectionContent(bodyReader, section.Path); err == nil && content != nil {
extraNewlineAfterHeader = true
}
header, err = structure.GetSectionHeader(section.Path) header, err = structure.GetSectionHeader(section.Path)
default: default:
err = errors.New("Unknown specifier " + string(section.Specifier)) err = errors.New("Unknown specifier " + string(section.Specifier))
@ -461,6 +465,11 @@ func (im *imapMailbox) getMessageBodySection(
if header != nil { if header != nil {
response = filteredHeaderAsBytes(header, section) response = filteredHeaderAsBytes(header, section)
// The blank line is included in all header fetches,
// except in the case of a message which has no body.
if extraNewlineAfterHeader {
response = append(response, []byte("\r\n")...)
}
} }
// Trim any output if requested. // Trim any output if requested.