diff options
| author | Julian Swagemakers <julian@swagemakers.org> | 2024-10-23 20:48:04 +0200 |
|---|---|---|
| committer | Robin Jarry <robin@jarry.cc> | 2024-10-24 22:13:51 +0200 |
| commit | 4f866e6894ef5731193ee88a2c5a5b00c1113de4 (patch) | |
| tree | 78ff0065815426d490aeef3369b22b8a8205e5d7 /worker/imap/imap.go | |
| parent | fc31a5c20032b45d314ecef4c9ebde7fd7f90bc8 (diff) | |
| download | aerc-4f866e6894ef5731193ee88a2c5a5b00c1113de4.tar.gz | |
imap: strip whitespace from Message-Id and In-Reply-To
Outlook.com is generating fairly long Message-IDs and using folding[0]
to put the ID on a new line. This is resulting in the Message-ID to
contain a leading white space, which is preventing `TrimPrefix` from
removing the less than symbol. When replying the In-Reply-To header will
then contain "< <message-id>" which is not desired and prevents email
clients or lists form correctly associating the email replied to. For
example lore.kernel.org[1]. Trimming tabs, newlines, and spaces from
Message-ID resolves the issue.
[0]: https://datatracker.ietf.org/doc/html/rfc822#section-3.1.1
[1]: https://lore.kernel.org/git/D4U1RWVWEW5D.2T853XSBO1FPA@swagemakers.org/#t
Changelog-fixed: Remove unwanted less than symbol from In-Reply-To
header when Message-ID uses folding.
Signed-off-by: Julian Swagemakers <julian@swagemakers.org>
Acked-by: Robin Jarry <robin@jarry.cc>
Diffstat (limited to 'worker/imap/imap.go')
| -rw-r--r-- | worker/imap/imap.go | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/worker/imap/imap.go b/worker/imap/imap.go index 67d56264..9b6316b5 100644 --- a/worker/imap/imap.go +++ b/worker/imap/imap.go @@ -50,11 +50,6 @@ func translateEnvelope(e *imap.Envelope) *models.Envelope { return nil } - // we strip the msgid of "<>" in order to be more compatible with go-message - // which wants to handle msgids without the markers - msgID := strings.TrimSuffix(strings.TrimPrefix(e.MessageId, "<"), ">") - inReplyTo := strings.TrimSuffix(strings.TrimPrefix(e.InReplyTo, "<"), ">") - return &models.Envelope{ Date: e.Date, Subject: e.Subject, @@ -63,11 +58,17 @@ func translateEnvelope(e *imap.Envelope) *models.Envelope { To: translateAddresses(e.To), Cc: translateAddresses(e.Cc), Bcc: translateAddresses(e.Bcc), - MessageId: msgID, - InReplyTo: inReplyTo, + MessageId: translateMessageID(e.MessageId), + InReplyTo: translateMessageID(e.InReplyTo), } } +func translateMessageID(messageID string) string { + // Strip away unwanted characters, go-message expects the message id + // without brackets, spaces, tabs and new lines. + return strings.Trim(messageID, "<> \t\r\n") +} + func translateAddresses(addrs []*imap.Address) []*mail.Address { var converted []*mail.Address for _, addr := range addrs { |