aboutsummaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorsommerf-lf <159693954+sommerf-lf@users.noreply.github.com>2025-03-05 17:29:29 +0100
committerGitHub <noreply@github.com>2025-03-05 16:29:29 +0000
commit7cdde20c737c70e9b11f1ded71ad4b985f4167fd (patch)
tree297e2df1b65887eb8bc5222f0d13d288ce83ecd8 /services
parentf0f10413aeaa6970c07cc481ebd22ea2eb626a4c (diff)
downloadgitea-7cdde20c737c70e9b11f1ded71ad4b985f4167fd.tar.gz
gitea-7cdde20c737c70e9b11f1ded71ad4b985f4167fd.zip
Email option to embed images as base64 instead of link (#32061)
ref: #15081 ref: #14037 Documentation: https://gitea.com/gitea/docs/pulls/69 # Example Content: ![image](https://github.com/user-attachments/assets/e73ebfbe-e329-40f6-9c4a-f73832bbb181) Result in Email: ![image](https://github.com/user-attachments/assets/55b7019f-e17a-46c3-a374-3b4769d5c2d6) Result with source code: (first image is external image, 2nd is now embedded) ![image](https://github.com/user-attachments/assets/8e2804a1-580f-4a69-adcb-cc5d16f7da81) --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'services')
-rw-r--r--services/mailer/mail.go111
-rw-r--r--services/mailer/mail_issue_common.go16
-rw-r--r--services/mailer/mail_test.go120
3 files changed, 233 insertions, 14 deletions
diff --git a/services/mailer/mail.go b/services/mailer/mail.go
index 7db259ac2c..f7e5b0c9f0 100644
--- a/services/mailer/mail.go
+++ b/services/mailer/mail.go
@@ -6,16 +6,26 @@ package mailer
import (
"bytes"
+ "context"
+ "encoding/base64"
+ "fmt"
"html/template"
+ "io"
"mime"
"regexp"
"strings"
texttmpl "text/template"
+ repo_model "code.gitea.io/gitea/models/repo"
user_model "code.gitea.io/gitea/models/user"
+ "code.gitea.io/gitea/modules/httplib"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
+ "code.gitea.io/gitea/modules/storage"
+ "code.gitea.io/gitea/modules/typesniffer"
sender_service "code.gitea.io/gitea/services/mailer/sender"
+
+ "golang.org/x/net/html"
)
const mailMaxSubjectRunes = 256 // There's no actual limit for subject in RFC 5322
@@ -44,6 +54,107 @@ func sanitizeSubject(subject string) string {
return mime.QEncoding.Encode("utf-8", string(runes))
}
+type mailAttachmentBase64Embedder struct {
+ doer *user_model.User
+ repo *repo_model.Repository
+ maxSize int64
+ estimateSize int64
+}
+
+func newMailAttachmentBase64Embedder(doer *user_model.User, repo *repo_model.Repository, maxSize int64) *mailAttachmentBase64Embedder {
+ return &mailAttachmentBase64Embedder{doer: doer, repo: repo, maxSize: maxSize}
+}
+
+func (b64embedder *mailAttachmentBase64Embedder) Base64InlineImages(ctx context.Context, body template.HTML) (template.HTML, error) {
+ doc, err := html.Parse(strings.NewReader(string(body)))
+ if err != nil {
+ return "", fmt.Errorf("html.Parse failed: %w", err)
+ }
+
+ b64embedder.estimateSize = int64(len(string(body)))
+
+ var processNode func(*html.Node)
+ processNode = func(n *html.Node) {
+ if n.Type == html.ElementNode {
+ if n.Data == "img" {
+ for i, attr := range n.Attr {
+ if attr.Key == "src" {
+ attachmentSrc := attr.Val
+ dataURI, err := b64embedder.AttachmentSrcToBase64DataURI(ctx, attachmentSrc)
+ if err != nil {
+ // Not an error, just skip. This is probably an image from outside the gitea instance.
+ log.Trace("Unable to embed attachment %q to mail body: %v", attachmentSrc, err)
+ } else {
+ n.Attr[i].Val = dataURI
+ }
+ break
+ }
+ }
+ }
+ }
+ for c := n.FirstChild; c != nil; c = c.NextSibling {
+ processNode(c)
+ }
+ }
+
+ processNode(doc)
+
+ var buf bytes.Buffer
+ err = html.Render(&buf, doc)
+ if err != nil {
+ return "", fmt.Errorf("html.Render failed: %w", err)
+ }
+ return template.HTML(buf.String()), nil
+}
+
+func (b64embedder *mailAttachmentBase64Embedder) AttachmentSrcToBase64DataURI(ctx context.Context, attachmentSrc string) (string, error) {
+ parsedSrc := httplib.ParseGiteaSiteURL(ctx, attachmentSrc)
+ var attachmentUUID string
+ if parsedSrc != nil {
+ var ok bool
+ attachmentUUID, ok = strings.CutPrefix(parsedSrc.RoutePath, "/attachments/")
+ if !ok {
+ attachmentUUID, ok = strings.CutPrefix(parsedSrc.RepoSubPath, "/attachments/")
+ }
+ if !ok {
+ return "", fmt.Errorf("not an attachment")
+ }
+ }
+ attachment, err := repo_model.GetAttachmentByUUID(ctx, attachmentUUID)
+ if err != nil {
+ return "", err
+ }
+
+ if attachment.RepoID != b64embedder.repo.ID {
+ return "", fmt.Errorf("attachment does not belong to the repository")
+ }
+ if attachment.Size+b64embedder.estimateSize > b64embedder.maxSize {
+ return "", fmt.Errorf("total embedded images exceed max limit")
+ }
+
+ fr, err := storage.Attachments.Open(attachment.RelativePath())
+ if err != nil {
+ return "", err
+ }
+ defer fr.Close()
+
+ lr := &io.LimitedReader{R: fr, N: b64embedder.maxSize + 1}
+ content, err := io.ReadAll(lr)
+ if err != nil {
+ return "", fmt.Errorf("LimitedReader ReadAll: %w", err)
+ }
+
+ mimeType := typesniffer.DetectContentType(content)
+ if !mimeType.IsImage() {
+ return "", fmt.Errorf("not an image")
+ }
+
+ encoded := base64.StdEncoding.EncodeToString(content)
+ dataURI := fmt.Sprintf("data:%s;base64,%s", mimeType.GetMimeType(), encoded)
+ b64embedder.estimateSize += int64(len(dataURI))
+ return dataURI, nil
+}
+
func fromDisplayName(u *user_model.User) string {
if setting.MailService.FromDisplayNameFormatTemplate != nil {
var ctx bytes.Buffer
diff --git a/services/mailer/mail_issue_common.go b/services/mailer/mail_issue_common.go
index 23ca4c3f15..85fe7c1f9a 100644
--- a/services/mailer/mail_issue_common.go
+++ b/services/mailer/mail_issue_common.go
@@ -25,6 +25,10 @@ import (
"code.gitea.io/gitea/services/mailer/token"
)
+// maxEmailBodySize is the approximate maximum size of an email body in bytes
+// Many e-mail service providers have limitations on the size of the email body, it's usually from 10MB to 25MB
+const maxEmailBodySize = 9_000_000
+
func fallbackMailSubject(issue *issues_model.Issue) string {
return fmt.Sprintf("[%s] %s (#%d)", issue.Repo.FullName(), issue.Title, issue.Index)
}
@@ -64,12 +68,20 @@ func composeIssueCommentMessages(ctx *mailCommentContext, lang string, recipient
// This is the body of the new issue or comment, not the mail body
rctx := renderhelper.NewRenderContextRepoComment(ctx.Context, ctx.Issue.Repo).WithUseAbsoluteLink(true)
- body, err := markdown.RenderString(rctx,
- ctx.Content)
+ body, err := markdown.RenderString(rctx, ctx.Content)
if err != nil {
return nil, err
}
+ if setting.MailService.EmbedAttachmentImages {
+ attEmbedder := newMailAttachmentBase64Embedder(ctx.Doer, ctx.Issue.Repo, maxEmailBodySize)
+ bodyAfterEmbedding, err := attEmbedder.Base64InlineImages(ctx, body)
+ if err != nil {
+ log.Error("Failed to embed images in mail body: %v", err)
+ } else {
+ body = bodyAfterEmbedding
+ }
+ }
actType, actName, tplName := actionToTemplate(ctx.Issue, ctx.ActionType, commentType, reviewType)
if actName != "new" {
diff --git a/services/mailer/mail_test.go b/services/mailer/mail_test.go
index 1860257e2e..85ee345545 100644
--- a/services/mailer/mail_test.go
+++ b/services/mailer/mail_test.go
@@ -6,6 +6,7 @@ package mailer
import (
"bytes"
"context"
+ "encoding/base64"
"fmt"
"html/template"
"io"
@@ -23,9 +24,12 @@ import (
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/setting"
+ "code.gitea.io/gitea/modules/storage"
+ "code.gitea.io/gitea/services/attachment"
sender_service "code.gitea.io/gitea/services/mailer/sender"
"github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
)
const subjectTpl = `
@@ -53,22 +57,44 @@ const bodyTpl = `
func prepareMailerTest(t *testing.T) (doer *user_model.User, repo *repo_model.Repository, issue *issues_model.Issue, comment *issues_model.Comment) {
assert.NoError(t, unittest.PrepareTestDatabase())
- mailService := setting.Mailer{
- From: "test@gitea.com",
- }
-
- setting.MailService = &mailService
+ setting.MailService = &setting.Mailer{From: "test@gitea.com"}
setting.Domain = "localhost"
+ setting.AppURL = "https://try.gitea.io/"
doer = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
repo = unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1, Owner: doer})
issue = unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1, Repo: repo, Poster: doer})
- assert.NoError(t, issue.LoadRepo(db.DefaultContext))
comment = unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 2, Issue: issue})
+ require.NoError(t, issue.LoadRepo(db.DefaultContext))
return doer, repo, issue, comment
}
-func TestComposeIssueCommentMessage(t *testing.T) {
+func prepareMailerBase64Test(t *testing.T) (doer *user_model.User, repo *repo_model.Repository, issue *issues_model.Issue, att1, att2 *repo_model.Attachment) {
+ user, repo, issue, comment := prepareMailerTest(t)
+ setting.MailService.EmbedAttachmentImages = true
+
+ att1, err := attachment.NewAttachment(t.Context(), &repo_model.Attachment{
+ RepoID: repo.ID,
+ IssueID: issue.ID,
+ UploaderID: user.ID,
+ CommentID: comment.ID,
+ Name: "test.png",
+ }, bytes.NewReader([]byte("\x89\x50\x4e\x47\x0d\x0a\x1a\x0a")), 8)
+ require.NoError(t, err)
+
+ att2, err = attachment.NewAttachment(t.Context(), &repo_model.Attachment{
+ RepoID: repo.ID,
+ IssueID: issue.ID,
+ UploaderID: user.ID,
+ CommentID: comment.ID,
+ Name: "test.png",
+ }, bytes.NewReader([]byte("\x89\x50\x4e\x47\x0d\x0a\x1a\x0a"+strings.Repeat("\x00", 1024))), 8+1024)
+ require.NoError(t, err)
+
+ return user, repo, issue, att1, att2
+}
+
+func TestComposeIssueComment(t *testing.T) {
doer, _, issue, comment := prepareMailerTest(t)
markup.Init(&markup.RenderHelperFuncs{
@@ -109,7 +135,8 @@ func TestComposeIssueCommentMessage(t *testing.T) {
assert.Len(t, gomailMsg.GetGenHeader("List-Unsubscribe"), 2) // url + mailto
var buf bytes.Buffer
- gomailMsg.WriteTo(&buf)
+ _, err = gomailMsg.WriteTo(&buf)
+ require.NoError(t, err)
b, err := io.ReadAll(quotedprintable.NewReader(&buf))
assert.NoError(t, err)
@@ -404,9 +431,9 @@ func TestGenerateMessageIDForRelease(t *testing.T) {
}
func TestFromDisplayName(t *testing.T) {
- template, err := texttmpl.New("mailFrom").Parse("{{ .DisplayName }}")
+ tmpl, err := texttmpl.New("mailFrom").Parse("{{ .DisplayName }}")
assert.NoError(t, err)
- setting.MailService = &setting.Mailer{FromDisplayNameFormatTemplate: template}
+ setting.MailService = &setting.Mailer{FromDisplayNameFormatTemplate: tmpl}
defer func() { setting.MailService = nil }()
tests := []struct {
@@ -435,9 +462,9 @@ func TestFromDisplayName(t *testing.T) {
}
t.Run("template with all available vars", func(t *testing.T) {
- template, err = texttmpl.New("mailFrom").Parse("{{ .DisplayName }} (by {{ .AppName }} on [{{ .Domain }}])")
+ tmpl, err = texttmpl.New("mailFrom").Parse("{{ .DisplayName }} (by {{ .AppName }} on [{{ .Domain }}])")
assert.NoError(t, err)
- setting.MailService = &setting.Mailer{FromDisplayNameFormatTemplate: template}
+ setting.MailService = &setting.Mailer{FromDisplayNameFormatTemplate: tmpl}
oldAppName := setting.AppName
setting.AppName = "Code IT"
oldDomain := setting.Domain
@@ -450,3 +477,72 @@ func TestFromDisplayName(t *testing.T) {
assert.EqualValues(t, "Mister X (by Code IT on [code.it])", fromDisplayName(&user_model.User{FullName: "Mister X", Name: "tmp"}))
})
}
+
+func TestEmbedBase64Images(t *testing.T) {
+ user, repo, issue, att1, att2 := prepareMailerBase64Test(t)
+ ctx := &mailCommentContext{Context: t.Context(), Issue: issue, Doer: user}
+
+ imgExternalURL := "https://via.placeholder.com/10"
+ imgExternalImg := fmt.Sprintf(`<img src="%s"/>`, imgExternalURL)
+
+ att1URL := setting.AppURL + repo.Owner.Name + "/" + repo.Name + "/attachments/" + att1.UUID
+ att1Img := fmt.Sprintf(`<img src="%s"/>`, att1URL)
+ att1Base64 := "data:image/png;base64,iVBORw0KGgo="
+ att1ImgBase64 := fmt.Sprintf(`<img src="%s"/>`, att1Base64)
+
+ att2URL := setting.AppURL + repo.Owner.Name + "/" + repo.Name + "/attachments/" + att2.UUID
+ att2Img := fmt.Sprintf(`<img src="%s"/>`, att2URL)
+ att2File, err := storage.Attachments.Open(att2.RelativePath())
+ require.NoError(t, err)
+ defer att2File.Close()
+ att2Bytes, err := io.ReadAll(att2File)
+ require.NoError(t, err)
+ require.Greater(t, len(att2Bytes), 1024)
+ att2Base64 := "data:image/png;base64," + base64.StdEncoding.EncodeToString(att2Bytes)
+ att2ImgBase64 := fmt.Sprintf(`<img src="%s"/>`, att2Base64)
+
+ t.Run("ComposeMessage", func(t *testing.T) {
+ subjectTemplates = texttmpl.Must(texttmpl.New("issue/new").Parse(subjectTpl))
+ bodyTemplates = template.Must(template.New("issue/new").Parse(bodyTpl))
+
+ issue.Content = fmt.Sprintf(`MSG-BEFORE <image src="attachments/%s"> MSG-AFTER`, att1.UUID)
+ require.NoError(t, issues_model.UpdateIssueCols(t.Context(), issue, "content"))
+
+ recipients := []*user_model.User{{Name: "Test", Email: "test@gitea.com"}}
+ msgs, err := composeIssueCommentMessages(&mailCommentContext{
+ Context: t.Context(),
+ Issue: issue,
+ Doer: user,
+ ActionType: activities_model.ActionCreateIssue,
+ Content: issue.Content,
+ }, "en-US", recipients, false, "issue create")
+ require.NoError(t, err)
+
+ mailBody := msgs[0].Body
+ assert.Regexp(t, `MSG-BEFORE <a[^>]+><img src="data:image/png;base64,iVBORw0KGgo="/></a> MSG-AFTER`, mailBody)
+ })
+
+ t.Run("EmbedInstanceImageSkipExternalImage", func(t *testing.T) {
+ mailBody := "<html><head></head><body><p>Test1</p>" + imgExternalImg + "<p>Test2</p>" + att1Img + "<p>Test3</p></body></html>"
+ expectedMailBody := "<html><head></head><body><p>Test1</p>" + imgExternalImg + "<p>Test2</p>" + att1ImgBase64 + "<p>Test3</p></body></html>"
+ b64embedder := newMailAttachmentBase64Embedder(user, repo, 1024)
+ resultMailBody, err := b64embedder.Base64InlineImages(ctx, template.HTML(mailBody))
+ require.NoError(t, err)
+ assert.Equal(t, expectedMailBody, string(resultMailBody))
+ })
+
+ t.Run("LimitedEmailBodySize", func(t *testing.T) {
+ mailBody := fmt.Sprintf("<html><head></head><body>%s%s</body></html>", att1Img, att2Img)
+ b64embedder := newMailAttachmentBase64Embedder(user, repo, 1024)
+ resultMailBody, err := b64embedder.Base64InlineImages(ctx, template.HTML(mailBody))
+ require.NoError(t, err)
+ expected := fmt.Sprintf("<html><head></head><body>%s%s</body></html>", att1ImgBase64, att2Img)
+ assert.Equal(t, expected, string(resultMailBody))
+
+ b64embedder = newMailAttachmentBase64Embedder(user, repo, 4096)
+ resultMailBody, err = b64embedder.Base64InlineImages(ctx, template.HTML(mailBody))
+ require.NoError(t, err)
+ expected = fmt.Sprintf("<html><head></head><body>%s%s</body></html>", att1ImgBase64, att2ImgBase64)
+ assert.Equal(t, expected, string(resultMailBody))
+ })
+}