mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-11-27 12:16:10 +01:00
50b7009603
**Backport:** https://codeberg.org/forgejo/forgejo/pulls/3504 If incoming email is configured and an email is sent, inline attachments are currently not added to the comment if it has the `Content-Disposition: inline` instead of `Content-Disposition: attachment` as e.g. with Apple Mail. This adds inline attachments (`Content-Disposition: inline`) that *have a filename* as attachment to the comment. Other elements with `Content-Disposition: inline` are not attached as attachment to the comment. In addition, a check has been added to prevent mails from being processed twice. Fixes #3496 Co-authored-by: Beowulf <beowulf@beocode.eu> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3566 Reviewed-by: Beowulf <beowulf@beocode.eu> Co-authored-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org> Co-committed-by: forgejo-backport-action <forgejo-backport-action@noreply.codeberg.org>
179 lines
4.7 KiB
Go
179 lines
4.7 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package incoming
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/emersion/go-imap"
|
|
"github.com/jhillyerd/enmime"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestNotHandleTwice(t *testing.T) {
|
|
handledSet := new(imap.SeqSet)
|
|
msg := imap.NewMessage(90, []imap.FetchItem{imap.FetchBody})
|
|
|
|
handled := isAlreadyHandled(handledSet, msg)
|
|
assert.Equal(t, false, handled)
|
|
|
|
handledSet.AddNum(msg.SeqNum)
|
|
|
|
handled = isAlreadyHandled(handledSet, msg)
|
|
assert.Equal(t, true, handled)
|
|
}
|
|
|
|
func TestIsAutomaticReply(t *testing.T) {
|
|
cases := []struct {
|
|
Headers map[string]string
|
|
Expected bool
|
|
}{
|
|
{
|
|
Headers: map[string]string{},
|
|
Expected: false,
|
|
},
|
|
{
|
|
Headers: map[string]string{
|
|
"Auto-Submitted": "no",
|
|
},
|
|
Expected: false,
|
|
},
|
|
{
|
|
Headers: map[string]string{
|
|
"Auto-Submitted": "yes",
|
|
},
|
|
Expected: true,
|
|
},
|
|
{
|
|
Headers: map[string]string{
|
|
"X-Autoreply": "no",
|
|
},
|
|
Expected: false,
|
|
},
|
|
{
|
|
Headers: map[string]string{
|
|
"X-Autoreply": "yes",
|
|
},
|
|
Expected: true,
|
|
},
|
|
{
|
|
Headers: map[string]string{
|
|
"X-Autorespond": "yes",
|
|
},
|
|
Expected: true,
|
|
},
|
|
}
|
|
|
|
for _, c := range cases {
|
|
b := enmime.Builder().
|
|
From("Dummy", "dummy@gitea.io").
|
|
To("Dummy", "dummy@gitea.io")
|
|
for k, v := range c.Headers {
|
|
b = b.Header(k, v)
|
|
}
|
|
root, err := b.Build()
|
|
assert.NoError(t, err)
|
|
env, err := enmime.EnvelopeFromPart(root)
|
|
assert.NoError(t, err)
|
|
|
|
assert.Equal(t, c.Expected, isAutomaticReply(env))
|
|
}
|
|
}
|
|
|
|
func TestGetContentFromMailReader(t *testing.T) {
|
|
mailString := "Content-Type: multipart/mixed; boundary=message-boundary\r\n" +
|
|
"\r\n" +
|
|
"--message-boundary\r\n" +
|
|
"Content-Type: multipart/alternative; boundary=text-boundary\r\n" +
|
|
"\r\n" +
|
|
"--text-boundary\r\n" +
|
|
"Content-Type: text/plain\r\n" +
|
|
"Content-Disposition: inline\r\n" +
|
|
"\r\n" +
|
|
"mail content\r\n" +
|
|
"--text-boundary--\r\n" +
|
|
"--message-boundary\r\n" +
|
|
"Content-Type: text/plain\r\n" +
|
|
"Content-Disposition: attachment; filename=attachment.txt\r\n" +
|
|
"\r\n" +
|
|
"attachment content\r\n" +
|
|
"--message-boundary--\r\n"
|
|
|
|
env, err := enmime.ReadEnvelope(strings.NewReader(mailString))
|
|
assert.NoError(t, err)
|
|
content := getContentFromMailReader(env)
|
|
assert.Equal(t, "mail content", content.Content)
|
|
assert.Len(t, content.Attachments, 1)
|
|
assert.Equal(t, "attachment.txt", content.Attachments[0].Name)
|
|
assert.Equal(t, []byte("attachment content"), content.Attachments[0].Content)
|
|
|
|
mailString = "Content-Type: multipart/mixed; boundary=message-boundary\r\n" +
|
|
"\r\n" +
|
|
"--message-boundary\r\n" +
|
|
"Content-Type: multipart/alternative; boundary=text-boundary\r\n" +
|
|
"\r\n" +
|
|
"--text-boundary\r\n" +
|
|
"Content-Type: text/plain\r\n" +
|
|
"Content-Disposition: inline\r\n" +
|
|
"\r\n" +
|
|
"mail content\r\n" +
|
|
"--text-boundary--\r\n" +
|
|
"--message-boundary\r\n" +
|
|
"Content-Type: text/plain\r\n" +
|
|
"Content-Disposition: inline; filename=attachment.txt\r\n" +
|
|
"\r\n" +
|
|
"attachment content\r\n" +
|
|
"--message-boundary--\r\n"
|
|
|
|
env, err = enmime.ReadEnvelope(strings.NewReader(mailString))
|
|
assert.NoError(t, err)
|
|
content = getContentFromMailReader(env)
|
|
assert.Equal(t, "mail content", content.Content)
|
|
assert.Len(t, content.Attachments, 1)
|
|
assert.Equal(t, "attachment.txt", content.Attachments[0].Name)
|
|
assert.Equal(t, []byte("attachment content"), content.Attachments[0].Content)
|
|
|
|
mailString = "Content-Type: multipart/mixed; boundary=message-boundary\r\n" +
|
|
"\r\n" +
|
|
"--message-boundary\r\n" +
|
|
"Content-Type: multipart/alternative; boundary=text-boundary\r\n" +
|
|
"\r\n" +
|
|
"--text-boundary\r\n" +
|
|
"Content-Type: text/html\r\n" +
|
|
"Content-Disposition: inline\r\n" +
|
|
"\r\n" +
|
|
"<p>mail content</p>\r\n" +
|
|
"--text-boundary--\r\n" +
|
|
"--message-boundary--\r\n"
|
|
|
|
env, err = enmime.ReadEnvelope(strings.NewReader(mailString))
|
|
assert.NoError(t, err)
|
|
content = getContentFromMailReader(env)
|
|
assert.Equal(t, "mail content", content.Content)
|
|
assert.Empty(t, content.Attachments)
|
|
|
|
mailString = "Content-Type: multipart/mixed; boundary=message-boundary\r\n" +
|
|
"\r\n" +
|
|
"--message-boundary\r\n" +
|
|
"Content-Type: multipart/alternative; boundary=text-boundary\r\n" +
|
|
"\r\n" +
|
|
"--text-boundary\r\n" +
|
|
"Content-Type: text/plain\r\n" +
|
|
"Content-Disposition: inline\r\n" +
|
|
"\r\n" +
|
|
"mail content without signature\r\n" +
|
|
"--\r\n" +
|
|
"signature\r\n" +
|
|
"--text-boundary--\r\n" +
|
|
"--message-boundary--\r\n"
|
|
|
|
env, err = enmime.ReadEnvelope(strings.NewReader(mailString))
|
|
assert.NoError(t, err)
|
|
content = getContentFromMailReader(env)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, "mail content without signature", content.Content)
|
|
assert.Empty(t, content.Attachments)
|
|
}
|