mirror of
https://github.com/go-gitea/gitea
synced 2025-01-07 22:36:00 +01:00
Merge branch 'main' into private-reusable-workflow
This commit is contained in:
commit
c76e8217e6
models
modules/markup/orgmode
routers
api/v1
private
web
services
feed
mailer
tests/integration
@ -448,65 +448,13 @@ type GetFeedsOptions struct {
|
|||||||
Date string // the day we want activity for: YYYY-MM-DD
|
Date string // the day we want activity for: YYYY-MM-DD
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetFeeds returns actions according to the provided options
|
|
||||||
func GetFeeds(ctx context.Context, opts GetFeedsOptions) (ActionList, int64, error) {
|
|
||||||
if opts.RequestedUser == nil && opts.RequestedTeam == nil && opts.RequestedRepo == nil {
|
|
||||||
return nil, 0, fmt.Errorf("need at least one of these filters: RequestedUser, RequestedTeam, RequestedRepo")
|
|
||||||
}
|
|
||||||
|
|
||||||
cond, err := activityQueryCondition(ctx, opts)
|
|
||||||
if err != nil {
|
|
||||||
return nil, 0, err
|
|
||||||
}
|
|
||||||
|
|
||||||
actions := make([]*Action, 0, opts.PageSize)
|
|
||||||
var count int64
|
|
||||||
opts.SetDefaultValues()
|
|
||||||
|
|
||||||
if opts.Page < 10 { // TODO: why it's 10 but other values? It's an experience value.
|
|
||||||
sess := db.GetEngine(ctx).Where(cond)
|
|
||||||
sess = db.SetSessionPagination(sess, &opts)
|
|
||||||
|
|
||||||
count, err = sess.Desc("`action`.created_unix").FindAndCount(&actions)
|
|
||||||
if err != nil {
|
|
||||||
return nil, 0, fmt.Errorf("FindAndCount: %w", err)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// First, only query which IDs are necessary, and only then query all actions to speed up the overall query
|
|
||||||
sess := db.GetEngine(ctx).Where(cond).Select("`action`.id")
|
|
||||||
sess = db.SetSessionPagination(sess, &opts)
|
|
||||||
|
|
||||||
actionIDs := make([]int64, 0, opts.PageSize)
|
|
||||||
if err := sess.Table("action").Desc("`action`.created_unix").Find(&actionIDs); err != nil {
|
|
||||||
return nil, 0, fmt.Errorf("Find(actionsIDs): %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
count, err = db.GetEngine(ctx).Where(cond).
|
|
||||||
Table("action").
|
|
||||||
Cols("`action`.id").Count()
|
|
||||||
if err != nil {
|
|
||||||
return nil, 0, fmt.Errorf("Count: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := db.GetEngine(ctx).In("`action`.id", actionIDs).Desc("`action`.created_unix").Find(&actions); err != nil {
|
|
||||||
return nil, 0, fmt.Errorf("Find: %w", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := ActionList(actions).LoadAttributes(ctx); err != nil {
|
|
||||||
return nil, 0, fmt.Errorf("LoadAttributes: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return actions, count, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ActivityReadable return whether doer can read activities of user
|
// ActivityReadable return whether doer can read activities of user
|
||||||
func ActivityReadable(user, doer *user_model.User) bool {
|
func ActivityReadable(user, doer *user_model.User) bool {
|
||||||
return !user.KeepActivityPrivate ||
|
return !user.KeepActivityPrivate ||
|
||||||
doer != nil && (doer.IsAdmin || user.ID == doer.ID)
|
doer != nil && (doer.IsAdmin || user.ID == doer.ID)
|
||||||
}
|
}
|
||||||
|
|
||||||
func activityQueryCondition(ctx context.Context, opts GetFeedsOptions) (builder.Cond, error) {
|
func ActivityQueryCondition(ctx context.Context, opts GetFeedsOptions) (builder.Cond, error) {
|
||||||
cond := builder.NewCond()
|
cond := builder.NewCond()
|
||||||
|
|
||||||
if opts.RequestedTeam != nil && opts.RequestedUser == nil {
|
if opts.RequestedTeam != nil && opts.RequestedUser == nil {
|
||||||
|
@ -201,3 +201,55 @@ func (actions ActionList) LoadIssues(ctx context.Context) error {
|
|||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetFeeds returns actions according to the provided options
|
||||||
|
func GetFeeds(ctx context.Context, opts GetFeedsOptions) (ActionList, int64, error) {
|
||||||
|
if opts.RequestedUser == nil && opts.RequestedTeam == nil && opts.RequestedRepo == nil {
|
||||||
|
return nil, 0, fmt.Errorf("need at least one of these filters: RequestedUser, RequestedTeam, RequestedRepo")
|
||||||
|
}
|
||||||
|
|
||||||
|
cond, err := ActivityQueryCondition(ctx, opts)
|
||||||
|
if err != nil {
|
||||||
|
return nil, 0, err
|
||||||
|
}
|
||||||
|
|
||||||
|
actions := make([]*Action, 0, opts.PageSize)
|
||||||
|
var count int64
|
||||||
|
opts.SetDefaultValues()
|
||||||
|
|
||||||
|
if opts.Page < 10 { // TODO: why it's 10 but other values? It's an experience value.
|
||||||
|
sess := db.GetEngine(ctx).Where(cond)
|
||||||
|
sess = db.SetSessionPagination(sess, &opts)
|
||||||
|
|
||||||
|
count, err = sess.Desc("`action`.created_unix").FindAndCount(&actions)
|
||||||
|
if err != nil {
|
||||||
|
return nil, 0, fmt.Errorf("FindAndCount: %w", err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// First, only query which IDs are necessary, and only then query all actions to speed up the overall query
|
||||||
|
sess := db.GetEngine(ctx).Where(cond).Select("`action`.id")
|
||||||
|
sess = db.SetSessionPagination(sess, &opts)
|
||||||
|
|
||||||
|
actionIDs := make([]int64, 0, opts.PageSize)
|
||||||
|
if err := sess.Table("action").Desc("`action`.created_unix").Find(&actionIDs); err != nil {
|
||||||
|
return nil, 0, fmt.Errorf("Find(actionsIDs): %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
count, err = db.GetEngine(ctx).Where(cond).
|
||||||
|
Table("action").
|
||||||
|
Cols("`action`.id").Count()
|
||||||
|
if err != nil {
|
||||||
|
return nil, 0, fmt.Errorf("Count: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := db.GetEngine(ctx).In("`action`.id", actionIDs).Desc("`action`.created_unix").Find(&actions); err != nil {
|
||||||
|
return nil, 0, fmt.Errorf("Find: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := ActionList(actions).LoadAttributes(ctx); err != nil {
|
||||||
|
return nil, 0, fmt.Errorf("LoadAttributes: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return actions, count, nil
|
||||||
|
}
|
||||||
|
@ -42,114 +42,6 @@ func TestAction_GetRepoLink(t *testing.T) {
|
|||||||
assert.Equal(t, comment.HTMLURL(db.DefaultContext), action.GetCommentHTMLURL(db.DefaultContext))
|
assert.Equal(t, comment.HTMLURL(db.DefaultContext), action.GetCommentHTMLURL(db.DefaultContext))
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestGetFeeds(t *testing.T) {
|
|
||||||
// test with an individual user
|
|
||||||
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
||||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
|
||||||
|
|
||||||
actions, count, err := activities_model.GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
|
||||||
RequestedUser: user,
|
|
||||||
Actor: user,
|
|
||||||
IncludePrivate: true,
|
|
||||||
OnlyPerformedBy: false,
|
|
||||||
IncludeDeleted: true,
|
|
||||||
})
|
|
||||||
assert.NoError(t, err)
|
|
||||||
if assert.Len(t, actions, 1) {
|
|
||||||
assert.EqualValues(t, 1, actions[0].ID)
|
|
||||||
assert.EqualValues(t, user.ID, actions[0].UserID)
|
|
||||||
}
|
|
||||||
assert.Equal(t, int64(1), count)
|
|
||||||
|
|
||||||
actions, count, err = activities_model.GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
|
||||||
RequestedUser: user,
|
|
||||||
Actor: user,
|
|
||||||
IncludePrivate: false,
|
|
||||||
OnlyPerformedBy: false,
|
|
||||||
})
|
|
||||||
assert.NoError(t, err)
|
|
||||||
assert.Len(t, actions, 0)
|
|
||||||
assert.Equal(t, int64(0), count)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetFeedsForRepos(t *testing.T) {
|
|
||||||
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
||||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
|
||||||
privRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
|
|
||||||
pubRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 8})
|
|
||||||
|
|
||||||
// private repo & no login
|
|
||||||
actions, count, err := activities_model.GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
|
||||||
RequestedRepo: privRepo,
|
|
||||||
IncludePrivate: true,
|
|
||||||
})
|
|
||||||
assert.NoError(t, err)
|
|
||||||
assert.Len(t, actions, 0)
|
|
||||||
assert.Equal(t, int64(0), count)
|
|
||||||
|
|
||||||
// public repo & no login
|
|
||||||
actions, count, err = activities_model.GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
|
||||||
RequestedRepo: pubRepo,
|
|
||||||
IncludePrivate: true,
|
|
||||||
})
|
|
||||||
assert.NoError(t, err)
|
|
||||||
assert.Len(t, actions, 1)
|
|
||||||
assert.Equal(t, int64(1), count)
|
|
||||||
|
|
||||||
// private repo and login
|
|
||||||
actions, count, err = activities_model.GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
|
||||||
RequestedRepo: privRepo,
|
|
||||||
IncludePrivate: true,
|
|
||||||
Actor: user,
|
|
||||||
})
|
|
||||||
assert.NoError(t, err)
|
|
||||||
assert.Len(t, actions, 1)
|
|
||||||
assert.Equal(t, int64(1), count)
|
|
||||||
|
|
||||||
// public repo & login
|
|
||||||
actions, count, err = activities_model.GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
|
||||||
RequestedRepo: pubRepo,
|
|
||||||
IncludePrivate: true,
|
|
||||||
Actor: user,
|
|
||||||
})
|
|
||||||
assert.NoError(t, err)
|
|
||||||
assert.Len(t, actions, 1)
|
|
||||||
assert.Equal(t, int64(1), count)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetFeeds2(t *testing.T) {
|
|
||||||
// test with an organization user
|
|
||||||
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
||||||
org := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
|
|
||||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
|
||||||
|
|
||||||
actions, count, err := activities_model.GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
|
||||||
RequestedUser: org,
|
|
||||||
Actor: user,
|
|
||||||
IncludePrivate: true,
|
|
||||||
OnlyPerformedBy: false,
|
|
||||||
IncludeDeleted: true,
|
|
||||||
})
|
|
||||||
assert.NoError(t, err)
|
|
||||||
assert.Len(t, actions, 1)
|
|
||||||
if assert.Len(t, actions, 1) {
|
|
||||||
assert.EqualValues(t, 2, actions[0].ID)
|
|
||||||
assert.EqualValues(t, org.ID, actions[0].UserID)
|
|
||||||
}
|
|
||||||
assert.Equal(t, int64(1), count)
|
|
||||||
|
|
||||||
actions, count, err = activities_model.GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
|
||||||
RequestedUser: org,
|
|
||||||
Actor: user,
|
|
||||||
IncludePrivate: false,
|
|
||||||
OnlyPerformedBy: false,
|
|
||||||
IncludeDeleted: true,
|
|
||||||
})
|
|
||||||
assert.NoError(t, err)
|
|
||||||
assert.Len(t, actions, 0)
|
|
||||||
assert.Equal(t, int64(0), count)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestActivityReadable(t *testing.T) {
|
func TestActivityReadable(t *testing.T) {
|
||||||
tt := []struct {
|
tt := []struct {
|
||||||
desc string
|
desc string
|
||||||
@ -227,26 +119,6 @@ func TestNotifyWatchers(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestGetFeedsCorrupted(t *testing.T) {
|
|
||||||
// Now we will not check for corrupted data in the feeds
|
|
||||||
// users should run doctor to fix their data
|
|
||||||
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
||||||
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
|
|
||||||
unittest.AssertExistsAndLoadBean(t, &activities_model.Action{
|
|
||||||
ID: 8,
|
|
||||||
RepoID: 1700,
|
|
||||||
})
|
|
||||||
|
|
||||||
actions, count, err := activities_model.GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
|
||||||
RequestedUser: user,
|
|
||||||
Actor: user,
|
|
||||||
IncludePrivate: true,
|
|
||||||
})
|
|
||||||
assert.NoError(t, err)
|
|
||||||
assert.Len(t, actions, 1)
|
|
||||||
assert.Equal(t, int64(1), count)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestConsistencyUpdateAction(t *testing.T) {
|
func TestConsistencyUpdateAction(t *testing.T) {
|
||||||
if !setting.Database.Type.IsSQLite3() {
|
if !setting.Database.Type.IsSQLite3() {
|
||||||
t.Skip("Test is only for SQLite database.")
|
t.Skip("Test is only for SQLite database.")
|
||||||
@ -322,24 +194,3 @@ func TestDeleteIssueActions(t *testing.T) {
|
|||||||
assert.NoError(t, activities_model.DeleteIssueActions(db.DefaultContext, issue.RepoID, issue.ID, issue.Index))
|
assert.NoError(t, activities_model.DeleteIssueActions(db.DefaultContext, issue.RepoID, issue.ID, issue.Index))
|
||||||
unittest.AssertCount(t, &activities_model.Action{}, 0)
|
unittest.AssertCount(t, &activities_model.Action{}, 0)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestRepoActions(t *testing.T) {
|
|
||||||
assert.NoError(t, unittest.PrepareTestDatabase())
|
|
||||||
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
|
||||||
_ = db.TruncateBeans(db.DefaultContext, &activities_model.Action{})
|
|
||||||
for i := 0; i < 3; i++ {
|
|
||||||
_ = db.Insert(db.DefaultContext, &activities_model.Action{
|
|
||||||
UserID: 2 + int64(i),
|
|
||||||
ActUserID: 2,
|
|
||||||
RepoID: repo.ID,
|
|
||||||
OpType: activities_model.ActionCommentIssue,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
count, _ := db.Count[activities_model.Action](db.DefaultContext, &db.ListOptions{})
|
|
||||||
assert.EqualValues(t, 3, count)
|
|
||||||
actions, _, err := activities_model.GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
|
||||||
RequestedRepo: repo,
|
|
||||||
})
|
|
||||||
assert.NoError(t, err)
|
|
||||||
assert.Len(t, actions, 1)
|
|
||||||
}
|
|
||||||
|
@ -47,7 +47,7 @@ func getUserHeatmapData(ctx context.Context, user *user_model.User, team *organi
|
|||||||
groupByName = groupBy
|
groupByName = groupBy
|
||||||
}
|
}
|
||||||
|
|
||||||
cond, err := activityQueryCondition(ctx, GetFeedsOptions{
|
cond, err := ActivityQueryCondition(ctx, GetFeedsOptions{
|
||||||
RequestedUser: user,
|
RequestedUser: user,
|
||||||
RequestedTeam: team,
|
RequestedTeam: team,
|
||||||
Actor: doer,
|
Actor: doer,
|
||||||
|
@ -12,6 +12,8 @@ import (
|
|||||||
"code.gitea.io/gitea/modules/markup"
|
"code.gitea.io/gitea/modules/markup"
|
||||||
"code.gitea.io/gitea/modules/markup/markdown"
|
"code.gitea.io/gitea/modules/markup/markdown"
|
||||||
|
|
||||||
|
_ "code.gitea.io/gitea/modules/markup/orgmode"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -81,3 +83,40 @@ func TestRepoFile(t *testing.T) {
|
|||||||
</video>`, rendered)
|
</video>`, rendered)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestRepoFileOrgMode(t *testing.T) {
|
||||||
|
unittest.PrepareTestEnv(t)
|
||||||
|
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
||||||
|
|
||||||
|
t.Run("Links", func(t *testing.T) {
|
||||||
|
rctx := NewRenderContextRepoFile(context.Background(), repo1, RepoFileOptions{
|
||||||
|
CurrentRefPath: "/commit/1234",
|
||||||
|
CurrentTreePath: "my-dir",
|
||||||
|
}).WithRelativePath("my-dir/a.org")
|
||||||
|
|
||||||
|
rendered, err := markup.RenderString(rctx, `
|
||||||
|
[[https://google.com/]]
|
||||||
|
[[ImageLink.svg][The Image Desc]]
|
||||||
|
`)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, `<p>
|
||||||
|
<a href="https://google.com/" rel="nofollow">https://google.com/</a>
|
||||||
|
<a href="/user2/repo1/media/commit/1234/my-dir/ImageLink.svg" rel="nofollow">The Image Desc</a></p>
|
||||||
|
`, rendered)
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("CodeHighlight", func(t *testing.T) {
|
||||||
|
rctx := NewRenderContextRepoFile(context.Background(), repo1, RepoFileOptions{}).WithRelativePath("my-dir/a.org")
|
||||||
|
|
||||||
|
rendered, err := markup.RenderString(rctx, `
|
||||||
|
#+begin_src c
|
||||||
|
int a = 1;
|
||||||
|
#+end_src
|
||||||
|
`)
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Equal(t, `<div>
|
||||||
|
<pre><code class="chroma language-c"><span class="kt">int</span> <span class="n">a</span> <span class="o">=</span> <span class="mi">1</span><span class="p">;</span></code></pre>
|
||||||
|
</div>
|
||||||
|
`, rendered)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
@ -6,10 +6,12 @@ package markup
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"html"
|
"html"
|
||||||
|
"html/template"
|
||||||
"io"
|
"io"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"code.gitea.io/gitea/modules/highlight"
|
"code.gitea.io/gitea/modules/highlight"
|
||||||
|
"code.gitea.io/gitea/modules/htmlutil"
|
||||||
"code.gitea.io/gitea/modules/log"
|
"code.gitea.io/gitea/modules/log"
|
||||||
"code.gitea.io/gitea/modules/markup"
|
"code.gitea.io/gitea/modules/markup"
|
||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
@ -20,33 +22,36 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
markup.RegisterRenderer(Renderer{})
|
markup.RegisterRenderer(renderer{})
|
||||||
}
|
}
|
||||||
|
|
||||||
// Renderer implements markup.Renderer for orgmode
|
// Renderer implements markup.Renderer for orgmode
|
||||||
type Renderer struct{}
|
type renderer struct{}
|
||||||
|
|
||||||
var _ markup.PostProcessRenderer = (*Renderer)(nil)
|
var (
|
||||||
|
_ markup.Renderer = (*renderer)(nil)
|
||||||
|
_ markup.PostProcessRenderer = (*renderer)(nil)
|
||||||
|
)
|
||||||
|
|
||||||
// Name implements markup.Renderer
|
// Name implements markup.Renderer
|
||||||
func (Renderer) Name() string {
|
func (renderer) Name() string {
|
||||||
return "orgmode"
|
return "orgmode"
|
||||||
}
|
}
|
||||||
|
|
||||||
// NeedPostProcess implements markup.PostProcessRenderer
|
// NeedPostProcess implements markup.PostProcessRenderer
|
||||||
func (Renderer) NeedPostProcess() bool { return true }
|
func (renderer) NeedPostProcess() bool { return true }
|
||||||
|
|
||||||
// Extensions implements markup.Renderer
|
// Extensions implements markup.Renderer
|
||||||
func (Renderer) Extensions() []string {
|
func (renderer) Extensions() []string {
|
||||||
return []string{".org"}
|
return []string{".org"}
|
||||||
}
|
}
|
||||||
|
|
||||||
// SanitizerRules implements markup.Renderer
|
// SanitizerRules implements markup.Renderer
|
||||||
func (Renderer) SanitizerRules() []setting.MarkupSanitizerRule {
|
func (renderer) SanitizerRules() []setting.MarkupSanitizerRule {
|
||||||
return []setting.MarkupSanitizerRule{}
|
return []setting.MarkupSanitizerRule{}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Render renders orgmode rawbytes to HTML
|
// Render renders orgmode raw bytes to HTML
|
||||||
func Render(ctx *markup.RenderContext, input io.Reader, output io.Writer) error {
|
func Render(ctx *markup.RenderContext, input io.Reader, output io.Writer) error {
|
||||||
htmlWriter := org.NewHTMLWriter()
|
htmlWriter := org.NewHTMLWriter()
|
||||||
htmlWriter.HighlightCodeBlock = func(source, lang string, inline bool, params map[string]string) string {
|
htmlWriter.HighlightCodeBlock = func(source, lang string, inline bool, params map[string]string) string {
|
||||||
@ -56,10 +61,7 @@ func Render(ctx *markup.RenderContext, input io.Reader, output io.Writer) error
|
|||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
var w strings.Builder
|
w := &strings.Builder{}
|
||||||
if _, err := w.WriteString(`<pre>`); err != nil {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
lexer := lexers.Get(lang)
|
lexer := lexers.Get(lang)
|
||||||
if lexer == nil && lang == "" {
|
if lexer == nil && lang == "" {
|
||||||
@ -70,26 +72,20 @@ func Render(ctx *markup.RenderContext, input io.Reader, output io.Writer) error
|
|||||||
lang = strings.ToLower(lexer.Config().Name)
|
lang = strings.ToLower(lexer.Config().Name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// include language-x class as part of commonmark spec
|
||||||
|
if err := ctx.RenderInternal.FormatWithSafeAttrs(w, `<pre><code class="chroma language-%s">`, lang); err != nil {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
if lexer == nil {
|
if lexer == nil {
|
||||||
// include language-x class as part of commonmark spec
|
|
||||||
if _, err := w.WriteString(`<code class="chroma language-` + lang + `">`); err != nil {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
if _, err := w.WriteString(html.EscapeString(source)); err != nil {
|
if _, err := w.WriteString(html.EscapeString(source)); err != nil {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// include language-x class as part of commonmark spec
|
|
||||||
if _, err := w.WriteString(`<code class="chroma language-` + lang + `">`); err != nil {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
lexer = chroma.Coalesce(lexer)
|
lexer = chroma.Coalesce(lexer)
|
||||||
|
|
||||||
if _, err := w.WriteString(string(highlight.CodeFromLexer(lexer, source))); err != nil {
|
if _, err := w.WriteString(string(highlight.CodeFromLexer(lexer, source))); err != nil {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, err := w.WriteString("</code></pre>"); err != nil {
|
if _, err := w.WriteString("</code></pre>"); err != nil {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
@ -97,11 +93,7 @@ func Render(ctx *markup.RenderContext, input io.Reader, output io.Writer) error
|
|||||||
return w.String()
|
return w.String()
|
||||||
}
|
}
|
||||||
|
|
||||||
w := &Writer{
|
w := &orgWriter{rctx: ctx, HTMLWriter: htmlWriter}
|
||||||
HTMLWriter: htmlWriter,
|
|
||||||
Ctx: ctx,
|
|
||||||
}
|
|
||||||
|
|
||||||
htmlWriter.ExtendingWriter = w
|
htmlWriter.ExtendingWriter = w
|
||||||
|
|
||||||
res, err := org.New().Silent().Parse(input, "").Write(w)
|
res, err := org.New().Silent().Parse(input, "").Write(w)
|
||||||
@ -122,17 +114,18 @@ func RenderString(ctx *markup.RenderContext, content string) (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Render renders orgmode string to HTML string
|
// Render renders orgmode string to HTML string
|
||||||
func (Renderer) Render(ctx *markup.RenderContext, input io.Reader, output io.Writer) error {
|
func (renderer) Render(ctx *markup.RenderContext, input io.Reader, output io.Writer) error {
|
||||||
return Render(ctx, input, output)
|
return Render(ctx, input, output)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Writer implements org.Writer
|
type orgWriter struct {
|
||||||
type Writer struct {
|
|
||||||
*org.HTMLWriter
|
*org.HTMLWriter
|
||||||
Ctx *markup.RenderContext
|
rctx *markup.RenderContext
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *Writer) resolveLink(kind, link string) string {
|
var _ org.Writer = (*orgWriter)(nil)
|
||||||
|
|
||||||
|
func (r *orgWriter) resolveLink(kind, link string) string {
|
||||||
link = strings.TrimPrefix(link, "file:")
|
link = strings.TrimPrefix(link, "file:")
|
||||||
if !strings.HasPrefix(link, "#") && // not a URL fragment
|
if !strings.HasPrefix(link, "#") && // not a URL fragment
|
||||||
!markup.IsFullURLString(link) {
|
!markup.IsFullURLString(link) {
|
||||||
@ -142,39 +135,42 @@ func (r *Writer) resolveLink(kind, link string) string {
|
|||||||
kind = org.RegularLink{URL: link}.Kind()
|
kind = org.RegularLink{URL: link}.Kind()
|
||||||
}
|
}
|
||||||
if kind == "image" || kind == "video" {
|
if kind == "image" || kind == "video" {
|
||||||
link = r.Ctx.RenderHelper.ResolveLink(link, markup.LinkTypeMedia)
|
link = r.rctx.RenderHelper.ResolveLink(link, markup.LinkTypeMedia)
|
||||||
} else {
|
} else {
|
||||||
link = r.Ctx.RenderHelper.ResolveLink(link, markup.LinkTypeDefault)
|
link = r.rctx.RenderHelper.ResolveLink(link, markup.LinkTypeDefault)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return link
|
return link
|
||||||
}
|
}
|
||||||
|
|
||||||
// WriteRegularLink renders images, links or videos
|
// WriteRegularLink renders images, links or videos
|
||||||
func (r *Writer) WriteRegularLink(l org.RegularLink) {
|
func (r *orgWriter) WriteRegularLink(l org.RegularLink) {
|
||||||
link := r.resolveLink(l.Kind(), l.URL)
|
link := r.resolveLink(l.Kind(), l.URL)
|
||||||
|
|
||||||
|
printHTML := func(html string, a ...any) {
|
||||||
|
_, _ = fmt.Fprint(r, htmlutil.HTMLFormat(html, a...))
|
||||||
|
}
|
||||||
// Inspired by https://github.com/niklasfasching/go-org/blob/6eb20dbda93cb88c3503f7508dc78cbbc639378f/org/html_writer.go#L406-L427
|
// Inspired by https://github.com/niklasfasching/go-org/blob/6eb20dbda93cb88c3503f7508dc78cbbc639378f/org/html_writer.go#L406-L427
|
||||||
switch l.Kind() {
|
switch l.Kind() {
|
||||||
case "image":
|
case "image":
|
||||||
if l.Description == nil {
|
if l.Description == nil {
|
||||||
_, _ = fmt.Fprintf(r, `<img src="%s" alt="%s" />`, link, link)
|
printHTML(`<img src="%s" alt="%s">`, link, link)
|
||||||
} else {
|
} else {
|
||||||
imageSrc := r.resolveLink(l.Kind(), org.String(l.Description...))
|
imageSrc := r.resolveLink(l.Kind(), org.String(l.Description...))
|
||||||
_, _ = fmt.Fprintf(r, `<a href="%s"><img src="%s" alt="%s" /></a>`, link, imageSrc, imageSrc)
|
printHTML(`<a href="%s"><img src="%s" alt="%s"></a>`, link, imageSrc, imageSrc)
|
||||||
}
|
}
|
||||||
case "video":
|
case "video":
|
||||||
if l.Description == nil {
|
if l.Description == nil {
|
||||||
_, _ = fmt.Fprintf(r, `<video src="%s">%s</video>`, link, link)
|
printHTML(`<video src="%s">%s</video>`, link, link)
|
||||||
} else {
|
} else {
|
||||||
videoSrc := r.resolveLink(l.Kind(), org.String(l.Description...))
|
videoSrc := r.resolveLink(l.Kind(), org.String(l.Description...))
|
||||||
_, _ = fmt.Fprintf(r, `<a href="%s"><video src="%s">%s</video></a>`, link, videoSrc, videoSrc)
|
printHTML(`<a href="%s"><video src="%s">%s</video></a>`, link, videoSrc, videoSrc)
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
description := link
|
var description any = link
|
||||||
if l.Description != nil {
|
if l.Description != nil {
|
||||||
description = r.WriteNodesAsString(l.Description...)
|
description = template.HTML(r.WriteNodesAsString(l.Description...)) // orgmode HTMLWriter outputs HTML content
|
||||||
}
|
}
|
||||||
_, _ = fmt.Fprintf(r, `<a href="%s">%s</a>`, link, description)
|
printHTML(`<a href="%s">%s</a>`, link, description)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -58,15 +58,15 @@ func TestRender_Media(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
test("[[file:../../.images/src/02/train.jpg]]",
|
test("[[file:../../.images/src/02/train.jpg]]",
|
||||||
`<p><img src=".images/src/02/train.jpg" alt=".images/src/02/train.jpg" /></p>`)
|
`<p><img src=".images/src/02/train.jpg" alt=".images/src/02/train.jpg"></p>`)
|
||||||
test("[[file:train.jpg]]",
|
test("[[file:train.jpg]]",
|
||||||
`<p><img src="relative-path/train.jpg" alt="relative-path/train.jpg" /></p>`)
|
`<p><img src="relative-path/train.jpg" alt="relative-path/train.jpg"></p>`)
|
||||||
|
|
||||||
// With description.
|
// With description.
|
||||||
test("[[https://example.com][https://example.com/example.svg]]",
|
test("[[https://example.com][https://example.com/example.svg]]",
|
||||||
`<p><a href="https://example.com"><img src="https://example.com/example.svg" alt="https://example.com/example.svg" /></a></p>`)
|
`<p><a href="https://example.com"><img src="https://example.com/example.svg" alt="https://example.com/example.svg"></a></p>`)
|
||||||
test("[[https://example.com][pre https://example.com/example.svg post]]",
|
test("[[https://example.com][pre https://example.com/example.svg post]]",
|
||||||
`<p><a href="https://example.com">pre <img src="https://example.com/example.svg" alt="https://example.com/example.svg" /> post</a></p>`)
|
`<p><a href="https://example.com">pre <img src="https://example.com/example.svg" alt="https://example.com/example.svg"> post</a></p>`)
|
||||||
test("[[https://example.com][https://example.com/example.mp4]]",
|
test("[[https://example.com][https://example.com/example.mp4]]",
|
||||||
`<p><a href="https://example.com"><video src="https://example.com/example.mp4">https://example.com/example.mp4</video></a></p>`)
|
`<p><a href="https://example.com"><video src="https://example.com/example.mp4">https://example.com/example.mp4</video></a></p>`)
|
||||||
test("[[https://example.com][pre https://example.com/example.mp4 post]]",
|
test("[[https://example.com][pre https://example.com/example.mp4 post]]",
|
||||||
@ -74,19 +74,19 @@ func TestRender_Media(t *testing.T) {
|
|||||||
|
|
||||||
// Without description.
|
// Without description.
|
||||||
test("[[https://example.com/example.svg]]",
|
test("[[https://example.com/example.svg]]",
|
||||||
`<p><img src="https://example.com/example.svg" alt="https://example.com/example.svg" /></p>`)
|
`<p><img src="https://example.com/example.svg" alt="https://example.com/example.svg"></p>`)
|
||||||
test("[[https://example.com/example.mp4]]",
|
test("[[https://example.com/example.mp4]]",
|
||||||
`<p><video src="https://example.com/example.mp4">https://example.com/example.mp4</video></p>`)
|
`<p><video src="https://example.com/example.mp4">https://example.com/example.mp4</video></p>`)
|
||||||
|
|
||||||
// test [[LINK][DESCRIPTION]] syntax with "file:" prefix
|
// test [[LINK][DESCRIPTION]] syntax with "file:" prefix
|
||||||
test(`[[https://example.com/][file:https://example.com/foo%20bar.svg]]`,
|
test(`[[https://example.com/][file:https://example.com/foo%20bar.svg]]`,
|
||||||
`<p><a href="https://example.com/"><img src="https://example.com/foo%20bar.svg" alt="https://example.com/foo%20bar.svg" /></a></p>`)
|
`<p><a href="https://example.com/"><img src="https://example.com/foo%20bar.svg" alt="https://example.com/foo%20bar.svg"></a></p>`)
|
||||||
test(`[[file:https://example.com/foo%20bar.svg][Goto Image]]`,
|
test(`[[file:https://example.com/foo%20bar.svg][Goto Image]]`,
|
||||||
`<p><a href="https://example.com/foo%20bar.svg">Goto Image</a></p>`)
|
`<p><a href="https://example.com/foo%20bar.svg">Goto Image</a></p>`)
|
||||||
test(`[[file:https://example.com/link][https://example.com/image.jpg]]`,
|
test(`[[file:https://example.com/link][https://example.com/image.jpg]]`,
|
||||||
`<p><a href="https://example.com/link"><img src="https://example.com/image.jpg" alt="https://example.com/image.jpg" /></a></p>`)
|
`<p><a href="https://example.com/link"><img src="https://example.com/image.jpg" alt="https://example.com/image.jpg"></a></p>`)
|
||||||
test(`[[file:https://example.com/link][file:https://example.com/image.jpg]]`,
|
test(`[[file:https://example.com/link][file:https://example.com/image.jpg]]`,
|
||||||
`<p><a href="https://example.com/link"><img src="https://example.com/image.jpg" alt="https://example.com/image.jpg" /></a></p>`)
|
`<p><a href="https://example.com/link"><img src="https://example.com/image.jpg" alt="https://example.com/image.jpg"></a></p>`)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestRender_Source(t *testing.T) {
|
func TestRender_Source(t *testing.T) {
|
||||||
|
@ -19,6 +19,7 @@ import (
|
|||||||
"code.gitea.io/gitea/routers/api/v1/utils"
|
"code.gitea.io/gitea/routers/api/v1/utils"
|
||||||
"code.gitea.io/gitea/services/context"
|
"code.gitea.io/gitea/services/context"
|
||||||
"code.gitea.io/gitea/services/convert"
|
"code.gitea.io/gitea/services/convert"
|
||||||
|
feed_service "code.gitea.io/gitea/services/feed"
|
||||||
"code.gitea.io/gitea/services/org"
|
"code.gitea.io/gitea/services/org"
|
||||||
user_service "code.gitea.io/gitea/services/user"
|
user_service "code.gitea.io/gitea/services/user"
|
||||||
)
|
)
|
||||||
@ -447,7 +448,7 @@ func ListOrgActivityFeeds(ctx *context.APIContext) {
|
|||||||
ListOptions: listOptions,
|
ListOptions: listOptions,
|
||||||
}
|
}
|
||||||
|
|
||||||
feeds, count, err := activities_model.GetFeeds(ctx, opts)
|
feeds, count, err := feed_service.GetFeeds(ctx, opts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.Error(http.StatusInternalServerError, "GetFeeds", err)
|
ctx.Error(http.StatusInternalServerError, "GetFeeds", err)
|
||||||
return
|
return
|
||||||
|
@ -22,6 +22,7 @@ import (
|
|||||||
"code.gitea.io/gitea/routers/api/v1/utils"
|
"code.gitea.io/gitea/routers/api/v1/utils"
|
||||||
"code.gitea.io/gitea/services/context"
|
"code.gitea.io/gitea/services/context"
|
||||||
"code.gitea.io/gitea/services/convert"
|
"code.gitea.io/gitea/services/convert"
|
||||||
|
feed_service "code.gitea.io/gitea/services/feed"
|
||||||
org_service "code.gitea.io/gitea/services/org"
|
org_service "code.gitea.io/gitea/services/org"
|
||||||
repo_service "code.gitea.io/gitea/services/repository"
|
repo_service "code.gitea.io/gitea/services/repository"
|
||||||
)
|
)
|
||||||
@ -882,7 +883,7 @@ func ListTeamActivityFeeds(ctx *context.APIContext) {
|
|||||||
ListOptions: listOptions,
|
ListOptions: listOptions,
|
||||||
}
|
}
|
||||||
|
|
||||||
feeds, count, err := activities_model.GetFeeds(ctx, opts)
|
feeds, count, err := feed_service.GetFeeds(ctx, opts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.Error(http.StatusInternalServerError, "GetFeeds", err)
|
ctx.Error(http.StatusInternalServerError, "GetFeeds", err)
|
||||||
return
|
return
|
||||||
|
@ -34,6 +34,7 @@ import (
|
|||||||
actions_service "code.gitea.io/gitea/services/actions"
|
actions_service "code.gitea.io/gitea/services/actions"
|
||||||
"code.gitea.io/gitea/services/context"
|
"code.gitea.io/gitea/services/context"
|
||||||
"code.gitea.io/gitea/services/convert"
|
"code.gitea.io/gitea/services/convert"
|
||||||
|
feed_service "code.gitea.io/gitea/services/feed"
|
||||||
"code.gitea.io/gitea/services/issue"
|
"code.gitea.io/gitea/services/issue"
|
||||||
repo_service "code.gitea.io/gitea/services/repository"
|
repo_service "code.gitea.io/gitea/services/repository"
|
||||||
)
|
)
|
||||||
@ -1313,7 +1314,7 @@ func ListRepoActivityFeeds(ctx *context.APIContext) {
|
|||||||
ListOptions: listOptions,
|
ListOptions: listOptions,
|
||||||
}
|
}
|
||||||
|
|
||||||
feeds, count, err := activities_model.GetFeeds(ctx, opts)
|
feeds, count, err := feed_service.GetFeeds(ctx, opts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.Error(http.StatusInternalServerError, "GetFeeds", err)
|
ctx.Error(http.StatusInternalServerError, "GetFeeds", err)
|
||||||
return
|
return
|
||||||
|
@ -13,6 +13,7 @@ import (
|
|||||||
"code.gitea.io/gitea/routers/api/v1/utils"
|
"code.gitea.io/gitea/routers/api/v1/utils"
|
||||||
"code.gitea.io/gitea/services/context"
|
"code.gitea.io/gitea/services/context"
|
||||||
"code.gitea.io/gitea/services/convert"
|
"code.gitea.io/gitea/services/convert"
|
||||||
|
feed_service "code.gitea.io/gitea/services/feed"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Search search users
|
// Search search users
|
||||||
@ -214,7 +215,7 @@ func ListUserActivityFeeds(ctx *context.APIContext) {
|
|||||||
ListOptions: listOptions,
|
ListOptions: listOptions,
|
||||||
}
|
}
|
||||||
|
|
||||||
feeds, count, err := activities_model.GetFeeds(ctx, opts)
|
feeds, count, err := feed_service.GetFeeds(ctx, opts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
ctx.Error(http.StatusInternalServerError, "GetFeeds", err)
|
ctx.Error(http.StatusInternalServerError, "GetFeeds", err)
|
||||||
return
|
return
|
||||||
|
@ -17,6 +17,7 @@ import (
|
|||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
"code.gitea.io/gitea/services/context"
|
"code.gitea.io/gitea/services/context"
|
||||||
"code.gitea.io/gitea/services/mailer"
|
"code.gitea.io/gitea/services/mailer"
|
||||||
|
sender_service "code.gitea.io/gitea/services/mailer/sender"
|
||||||
)
|
)
|
||||||
|
|
||||||
// SendEmail pushes messages to mail queue
|
// SendEmail pushes messages to mail queue
|
||||||
@ -81,7 +82,7 @@ func SendEmail(ctx *context.PrivateContext) {
|
|||||||
|
|
||||||
func sendEmail(ctx *context.PrivateContext, subject, message string, to []string) {
|
func sendEmail(ctx *context.PrivateContext, subject, message string, to []string) {
|
||||||
for _, email := range to {
|
for _, email := range to {
|
||||||
msg := mailer.NewMessage(email, subject, message)
|
msg := sender_service.NewMessage(email, subject, message)
|
||||||
mailer.SendAsync(msg)
|
mailer.SendAsync(msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,6 +10,7 @@ import (
|
|||||||
"code.gitea.io/gitea/models/renderhelper"
|
"code.gitea.io/gitea/models/renderhelper"
|
||||||
"code.gitea.io/gitea/modules/markup/markdown"
|
"code.gitea.io/gitea/modules/markup/markdown"
|
||||||
"code.gitea.io/gitea/services/context"
|
"code.gitea.io/gitea/services/context"
|
||||||
|
feed_service "code.gitea.io/gitea/services/feed"
|
||||||
|
|
||||||
"github.com/gorilla/feeds"
|
"github.com/gorilla/feeds"
|
||||||
)
|
)
|
||||||
@ -28,7 +29,7 @@ func ShowUserFeedAtom(ctx *context.Context) {
|
|||||||
func showUserFeed(ctx *context.Context, formatType string) {
|
func showUserFeed(ctx *context.Context, formatType string) {
|
||||||
includePrivate := ctx.IsSigned && (ctx.Doer.IsAdmin || ctx.Doer.ID == ctx.ContextUser.ID)
|
includePrivate := ctx.IsSigned && (ctx.Doer.IsAdmin || ctx.Doer.ID == ctx.ContextUser.ID)
|
||||||
|
|
||||||
actions, _, err := activities_model.GetFeeds(ctx, activities_model.GetFeedsOptions{
|
actions, _, err := feed_service.GetFeeds(ctx, activities_model.GetFeedsOptions{
|
||||||
RequestedUser: ctx.ContextUser,
|
RequestedUser: ctx.ContextUser,
|
||||||
Actor: ctx.Doer,
|
Actor: ctx.Doer,
|
||||||
IncludePrivate: includePrivate,
|
IncludePrivate: includePrivate,
|
||||||
|
@ -9,13 +9,14 @@ import (
|
|||||||
activities_model "code.gitea.io/gitea/models/activities"
|
activities_model "code.gitea.io/gitea/models/activities"
|
||||||
repo_model "code.gitea.io/gitea/models/repo"
|
repo_model "code.gitea.io/gitea/models/repo"
|
||||||
"code.gitea.io/gitea/services/context"
|
"code.gitea.io/gitea/services/context"
|
||||||
|
feed_service "code.gitea.io/gitea/services/feed"
|
||||||
|
|
||||||
"github.com/gorilla/feeds"
|
"github.com/gorilla/feeds"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ShowRepoFeed shows user activity on the repo as RSS / Atom feed
|
// ShowRepoFeed shows user activity on the repo as RSS / Atom feed
|
||||||
func ShowRepoFeed(ctx *context.Context, repo *repo_model.Repository, formatType string) {
|
func ShowRepoFeed(ctx *context.Context, repo *repo_model.Repository, formatType string) {
|
||||||
actions, _, err := activities_model.GetFeeds(ctx, activities_model.GetFeedsOptions{
|
actions, _, err := feed_service.GetFeeds(ctx, activities_model.GetFeedsOptions{
|
||||||
RequestedRepo: repo,
|
RequestedRepo: repo,
|
||||||
Actor: ctx.Doer,
|
Actor: ctx.Doer,
|
||||||
IncludePrivate: true,
|
IncludePrivate: true,
|
||||||
|
@ -33,6 +33,7 @@ import (
|
|||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
"code.gitea.io/gitea/routers/web/feed"
|
"code.gitea.io/gitea/routers/web/feed"
|
||||||
"code.gitea.io/gitea/services/context"
|
"code.gitea.io/gitea/services/context"
|
||||||
|
feed_service "code.gitea.io/gitea/services/feed"
|
||||||
issue_service "code.gitea.io/gitea/services/issue"
|
issue_service "code.gitea.io/gitea/services/issue"
|
||||||
pull_service "code.gitea.io/gitea/services/pull"
|
pull_service "code.gitea.io/gitea/services/pull"
|
||||||
|
|
||||||
@ -113,7 +114,7 @@ func Dashboard(ctx *context.Context) {
|
|||||||
ctx.Data["HeatmapTotalContributions"] = activities_model.GetTotalContributionsInHeatmap(data)
|
ctx.Data["HeatmapTotalContributions"] = activities_model.GetTotalContributionsInHeatmap(data)
|
||||||
}
|
}
|
||||||
|
|
||||||
feeds, count, err := activities_model.GetFeeds(ctx, activities_model.GetFeedsOptions{
|
feeds, count, err := feed_service.GetFeeds(ctx, activities_model.GetFeedsOptions{
|
||||||
RequestedUser: ctxUser,
|
RequestedUser: ctxUser,
|
||||||
RequestedTeam: ctx.Org.Team,
|
RequestedTeam: ctx.Org.Team,
|
||||||
Actor: ctx.Doer,
|
Actor: ctx.Doer,
|
||||||
|
@ -26,6 +26,7 @@ import (
|
|||||||
"code.gitea.io/gitea/routers/web/org"
|
"code.gitea.io/gitea/routers/web/org"
|
||||||
shared_user "code.gitea.io/gitea/routers/web/shared/user"
|
shared_user "code.gitea.io/gitea/routers/web/shared/user"
|
||||||
"code.gitea.io/gitea/services/context"
|
"code.gitea.io/gitea/services/context"
|
||||||
|
feed_service "code.gitea.io/gitea/services/feed"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -167,7 +168,7 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
|
|||||||
case "activity":
|
case "activity":
|
||||||
date := ctx.FormString("date")
|
date := ctx.FormString("date")
|
||||||
pagingNum = setting.UI.FeedPagingNum
|
pagingNum = setting.UI.FeedPagingNum
|
||||||
items, count, err := activities_model.GetFeeds(ctx, activities_model.GetFeedsOptions{
|
items, count, err := feed_service.GetFeeds(ctx, activities_model.GetFeedsOptions{
|
||||||
RequestedUser: ctx.ContextUser,
|
RequestedUser: ctx.ContextUser,
|
||||||
Actor: ctx.Doer,
|
Actor: ctx.Doer,
|
||||||
IncludePrivate: showPrivate,
|
IncludePrivate: showPrivate,
|
||||||
|
15
services/feed/feed.go
Normal file
15
services/feed/feed.go
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package feed
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
activities_model "code.gitea.io/gitea/models/activities"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetFeeds returns actions according to the provided options
|
||||||
|
func GetFeeds(ctx context.Context, opts activities_model.GetFeedsOptions) (activities_model.ActionList, int64, error) {
|
||||||
|
return activities_model.GetFeeds(ctx, opts)
|
||||||
|
}
|
165
services/feed/feed_test.go
Normal file
165
services/feed/feed_test.go
Normal file
@ -0,0 +1,165 @@
|
|||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package feed
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
activities_model "code.gitea.io/gitea/models/activities"
|
||||||
|
"code.gitea.io/gitea/models/db"
|
||||||
|
repo_model "code.gitea.io/gitea/models/repo"
|
||||||
|
"code.gitea.io/gitea/models/unittest"
|
||||||
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestGetFeeds(t *testing.T) {
|
||||||
|
// test with an individual user
|
||||||
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
||||||
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||||
|
|
||||||
|
actions, count, err := GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
||||||
|
RequestedUser: user,
|
||||||
|
Actor: user,
|
||||||
|
IncludePrivate: true,
|
||||||
|
OnlyPerformedBy: false,
|
||||||
|
IncludeDeleted: true,
|
||||||
|
})
|
||||||
|
assert.NoError(t, err)
|
||||||
|
if assert.Len(t, actions, 1) {
|
||||||
|
assert.EqualValues(t, 1, actions[0].ID)
|
||||||
|
assert.EqualValues(t, user.ID, actions[0].UserID)
|
||||||
|
}
|
||||||
|
assert.Equal(t, int64(1), count)
|
||||||
|
|
||||||
|
actions, count, err = GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
||||||
|
RequestedUser: user,
|
||||||
|
Actor: user,
|
||||||
|
IncludePrivate: false,
|
||||||
|
OnlyPerformedBy: false,
|
||||||
|
})
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Len(t, actions, 0)
|
||||||
|
assert.Equal(t, int64(0), count)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetFeedsForRepos(t *testing.T) {
|
||||||
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
||||||
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||||
|
privRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 2})
|
||||||
|
pubRepo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 8})
|
||||||
|
|
||||||
|
// private repo & no login
|
||||||
|
actions, count, err := GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
||||||
|
RequestedRepo: privRepo,
|
||||||
|
IncludePrivate: true,
|
||||||
|
})
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Len(t, actions, 0)
|
||||||
|
assert.Equal(t, int64(0), count)
|
||||||
|
|
||||||
|
// public repo & no login
|
||||||
|
actions, count, err = GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
||||||
|
RequestedRepo: pubRepo,
|
||||||
|
IncludePrivate: true,
|
||||||
|
})
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Len(t, actions, 1)
|
||||||
|
assert.Equal(t, int64(1), count)
|
||||||
|
|
||||||
|
// private repo and login
|
||||||
|
actions, count, err = GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
||||||
|
RequestedRepo: privRepo,
|
||||||
|
IncludePrivate: true,
|
||||||
|
Actor: user,
|
||||||
|
})
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Len(t, actions, 1)
|
||||||
|
assert.Equal(t, int64(1), count)
|
||||||
|
|
||||||
|
// public repo & login
|
||||||
|
actions, count, err = GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
||||||
|
RequestedRepo: pubRepo,
|
||||||
|
IncludePrivate: true,
|
||||||
|
Actor: user,
|
||||||
|
})
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Len(t, actions, 1)
|
||||||
|
assert.Equal(t, int64(1), count)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetFeeds2(t *testing.T) {
|
||||||
|
// test with an organization user
|
||||||
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
||||||
|
org := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 3})
|
||||||
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
||||||
|
|
||||||
|
actions, count, err := GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
||||||
|
RequestedUser: org,
|
||||||
|
Actor: user,
|
||||||
|
IncludePrivate: true,
|
||||||
|
OnlyPerformedBy: false,
|
||||||
|
IncludeDeleted: true,
|
||||||
|
})
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Len(t, actions, 1)
|
||||||
|
if assert.Len(t, actions, 1) {
|
||||||
|
assert.EqualValues(t, 2, actions[0].ID)
|
||||||
|
assert.EqualValues(t, org.ID, actions[0].UserID)
|
||||||
|
}
|
||||||
|
assert.Equal(t, int64(1), count)
|
||||||
|
|
||||||
|
actions, count, err = GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
||||||
|
RequestedUser: org,
|
||||||
|
Actor: user,
|
||||||
|
IncludePrivate: false,
|
||||||
|
OnlyPerformedBy: false,
|
||||||
|
IncludeDeleted: true,
|
||||||
|
})
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Len(t, actions, 0)
|
||||||
|
assert.Equal(t, int64(0), count)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestGetFeedsCorrupted(t *testing.T) {
|
||||||
|
// Now we will not check for corrupted data in the feeds
|
||||||
|
// users should run doctor to fix their data
|
||||||
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
||||||
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
|
||||||
|
unittest.AssertExistsAndLoadBean(t, &activities_model.Action{
|
||||||
|
ID: 8,
|
||||||
|
RepoID: 1700,
|
||||||
|
})
|
||||||
|
|
||||||
|
actions, count, err := GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
||||||
|
RequestedUser: user,
|
||||||
|
Actor: user,
|
||||||
|
IncludePrivate: true,
|
||||||
|
})
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Len(t, actions, 1)
|
||||||
|
assert.Equal(t, int64(1), count)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestRepoActions(t *testing.T) {
|
||||||
|
assert.NoError(t, unittest.PrepareTestDatabase())
|
||||||
|
repo := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 1})
|
||||||
|
_ = db.TruncateBeans(db.DefaultContext, &activities_model.Action{})
|
||||||
|
for i := 0; i < 3; i++ {
|
||||||
|
_ = db.Insert(db.DefaultContext, &activities_model.Action{
|
||||||
|
UserID: 2 + int64(i),
|
||||||
|
ActUserID: 2,
|
||||||
|
RepoID: repo.ID,
|
||||||
|
OpType: activities_model.ActionCommentIssue,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
count, _ := db.Count[activities_model.Action](db.DefaultContext, &db.ListOptions{})
|
||||||
|
assert.EqualValues(t, 3, count)
|
||||||
|
actions, _, err := GetFeeds(db.DefaultContext, activities_model.GetFeedsOptions{
|
||||||
|
RequestedRepo: repo,
|
||||||
|
})
|
||||||
|
assert.NoError(t, err)
|
||||||
|
assert.Len(t, actions, 1)
|
||||||
|
}
|
@ -29,9 +29,8 @@ import (
|
|||||||
"code.gitea.io/gitea/modules/timeutil"
|
"code.gitea.io/gitea/modules/timeutil"
|
||||||
"code.gitea.io/gitea/modules/translation"
|
"code.gitea.io/gitea/modules/translation"
|
||||||
incoming_payload "code.gitea.io/gitea/services/mailer/incoming/payload"
|
incoming_payload "code.gitea.io/gitea/services/mailer/incoming/payload"
|
||||||
|
sender_service "code.gitea.io/gitea/services/mailer/sender"
|
||||||
"code.gitea.io/gitea/services/mailer/token"
|
"code.gitea.io/gitea/services/mailer/token"
|
||||||
|
|
||||||
"gopkg.in/gomail.v2"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -60,7 +59,7 @@ func SendTestMail(email string) error {
|
|||||||
// No mail service configured
|
// No mail service configured
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
return gomail.Send(Sender, NewMessage(email, "Gitea Test Email!", "Gitea Test Email!").ToMessage())
|
return sender_service.Send(sender, sender_service.NewMessage(email, "Gitea Test Email!", "Gitea Test Email!"))
|
||||||
}
|
}
|
||||||
|
|
||||||
// sendUserMail sends a mail to the user
|
// sendUserMail sends a mail to the user
|
||||||
@ -82,7 +81,7 @@ func sendUserMail(language string, u *user_model.User, tpl base.TplName, code, s
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
msg := NewMessage(u.EmailTo(), subject, content.String())
|
msg := sender_service.NewMessage(u.EmailTo(), subject, content.String())
|
||||||
msg.Info = fmt.Sprintf("UID: %d, %s", u.ID, info)
|
msg.Info = fmt.Sprintf("UID: %d, %s", u.ID, info)
|
||||||
|
|
||||||
SendAsync(msg)
|
SendAsync(msg)
|
||||||
@ -130,7 +129,7 @@ func SendActivateEmailMail(u *user_model.User, email string) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
msg := NewMessage(email, locale.TrString("mail.activate_email"), content.String())
|
msg := sender_service.NewMessage(email, locale.TrString("mail.activate_email"), content.String())
|
||||||
msg.Info = fmt.Sprintf("UID: %d, activate email", u.ID)
|
msg.Info = fmt.Sprintf("UID: %d, activate email", u.ID)
|
||||||
|
|
||||||
SendAsync(msg)
|
SendAsync(msg)
|
||||||
@ -158,7 +157,7 @@ func SendRegisterNotifyMail(u *user_model.User) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
msg := NewMessage(u.EmailTo(), locale.TrString("mail.register_notify", setting.AppName), content.String())
|
msg := sender_service.NewMessage(u.EmailTo(), locale.TrString("mail.register_notify", setting.AppName), content.String())
|
||||||
msg.Info = fmt.Sprintf("UID: %d, registration notify", u.ID)
|
msg.Info = fmt.Sprintf("UID: %d, registration notify", u.ID)
|
||||||
|
|
||||||
SendAsync(msg)
|
SendAsync(msg)
|
||||||
@ -189,13 +188,13 @@ func SendCollaboratorMail(u, doer *user_model.User, repo *repo_model.Repository)
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
msg := NewMessage(u.EmailTo(), subject, content.String())
|
msg := sender_service.NewMessage(u.EmailTo(), subject, content.String())
|
||||||
msg.Info = fmt.Sprintf("UID: %d, add collaborator", u.ID)
|
msg.Info = fmt.Sprintf("UID: %d, add collaborator", u.ID)
|
||||||
|
|
||||||
SendAsync(msg)
|
SendAsync(msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
func composeIssueCommentMessages(ctx *mailCommentContext, lang string, recipients []*user_model.User, fromMention bool, info string) ([]*Message, error) {
|
func composeIssueCommentMessages(ctx *mailCommentContext, lang string, recipients []*user_model.User, fromMention bool, info string) ([]*sender_service.Message, error) {
|
||||||
var (
|
var (
|
||||||
subject string
|
subject string
|
||||||
link string
|
link string
|
||||||
@ -304,9 +303,9 @@ func composeIssueCommentMessages(ctx *mailCommentContext, lang string, recipient
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
msgs := make([]*Message, 0, len(recipients))
|
msgs := make([]*sender_service.Message, 0, len(recipients))
|
||||||
for _, recipient := range recipients {
|
for _, recipient := range recipients {
|
||||||
msg := NewMessageFrom(
|
msg := sender_service.NewMessageFrom(
|
||||||
recipient.Email,
|
recipient.Email,
|
||||||
fromDisplayName(ctx.Doer),
|
fromDisplayName(ctx.Doer),
|
||||||
setting.MailService.FromEmail,
|
setting.MailService.FromEmail,
|
||||||
|
@ -15,6 +15,7 @@ import (
|
|||||||
"code.gitea.io/gitea/modules/markup/markdown"
|
"code.gitea.io/gitea/modules/markup/markdown"
|
||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
"code.gitea.io/gitea/modules/translation"
|
"code.gitea.io/gitea/modules/translation"
|
||||||
|
sender_service "code.gitea.io/gitea/services/mailer/sender"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -80,11 +81,11 @@ func mailNewRelease(ctx context.Context, lang string, tos []*user_model.User, re
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
msgs := make([]*Message, 0, len(tos))
|
msgs := make([]*sender_service.Message, 0, len(tos))
|
||||||
publisherName := fromDisplayName(rel.Publisher)
|
publisherName := fromDisplayName(rel.Publisher)
|
||||||
msgID := generateMessageIDForRelease(rel)
|
msgID := generateMessageIDForRelease(rel)
|
||||||
for _, to := range tos {
|
for _, to := range tos {
|
||||||
msg := NewMessageFrom(to.EmailTo(), publisherName, setting.MailService.FromEmail, subject, mailBody.String())
|
msg := sender_service.NewMessageFrom(to.EmailTo(), publisherName, setting.MailService.FromEmail, subject, mailBody.String())
|
||||||
msg.Info = subject
|
msg.Info = subject
|
||||||
msg.SetHeader("Message-ID", msgID)
|
msg.SetHeader("Message-ID", msgID)
|
||||||
msgs = append(msgs, msg)
|
msgs = append(msgs, msg)
|
||||||
|
@ -13,6 +13,7 @@ import (
|
|||||||
user_model "code.gitea.io/gitea/models/user"
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
"code.gitea.io/gitea/modules/translation"
|
"code.gitea.io/gitea/modules/translation"
|
||||||
|
sender_service "code.gitea.io/gitea/services/mailer/sender"
|
||||||
)
|
)
|
||||||
|
|
||||||
// SendRepoTransferNotifyMail triggers a notification e-mail when a pending repository transfer was created
|
// SendRepoTransferNotifyMail triggers a notification e-mail when a pending repository transfer was created
|
||||||
@ -79,7 +80,7 @@ func sendRepoTransferNotifyMailPerLang(lang string, newOwner, doer *user_model.U
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, to := range emailTos {
|
for _, to := range emailTos {
|
||||||
msg := NewMessageFrom(to.EmailTo(), fromDisplayName(doer), setting.MailService.FromEmail, subject, content.String())
|
msg := sender_service.NewMessageFrom(to.EmailTo(), fromDisplayName(doer), setting.MailService.FromEmail, subject, content.String())
|
||||||
msg.Info = fmt.Sprintf("UID: %d, repository pending transfer notification", newOwner.ID)
|
msg.Info = fmt.Sprintf("UID: %d, repository pending transfer notification", newOwner.ID)
|
||||||
|
|
||||||
SendAsync(msg)
|
SendAsync(msg)
|
||||||
|
@ -15,6 +15,7 @@ import (
|
|||||||
"code.gitea.io/gitea/modules/log"
|
"code.gitea.io/gitea/modules/log"
|
||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
"code.gitea.io/gitea/modules/translation"
|
"code.gitea.io/gitea/modules/translation"
|
||||||
|
sender_service "code.gitea.io/gitea/services/mailer/sender"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
@ -67,7 +68,7 @@ func MailTeamInvite(ctx context.Context, inviter *user_model.User, team *org_mod
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
msg := NewMessage(invite.Email, subject, mailBody.String())
|
msg := sender_service.NewMessage(invite.Email, subject, mailBody.String())
|
||||||
msg.Info = subject
|
msg.Info = subject
|
||||||
|
|
||||||
SendAsync(msg)
|
SendAsync(msg)
|
||||||
|
@ -23,6 +23,7 @@ import (
|
|||||||
user_model "code.gitea.io/gitea/models/user"
|
user_model "code.gitea.io/gitea/models/user"
|
||||||
"code.gitea.io/gitea/modules/markup"
|
"code.gitea.io/gitea/modules/markup"
|
||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
sender_service "code.gitea.io/gitea/services/mailer/sender"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
)
|
)
|
||||||
@ -167,7 +168,7 @@ func TestTemplateSelection(t *testing.T) {
|
|||||||
template.Must(bodyTemplates.New("pull/comment").Parse("pull/comment/body"))
|
template.Must(bodyTemplates.New("pull/comment").Parse("pull/comment/body"))
|
||||||
template.Must(bodyTemplates.New("issue/close").Parse("issue/close/body"))
|
template.Must(bodyTemplates.New("issue/close").Parse("issue/close/body"))
|
||||||
|
|
||||||
expect := func(t *testing.T, msg *Message, expSubject, expBody string) {
|
expect := func(t *testing.T, msg *sender_service.Message, expSubject, expBody string) {
|
||||||
subject := msg.ToMessage().GetHeader("Subject")
|
subject := msg.ToMessage().GetHeader("Subject")
|
||||||
msgbuf := new(bytes.Buffer)
|
msgbuf := new(bytes.Buffer)
|
||||||
_, _ = msg.ToMessage().WriteTo(msgbuf)
|
_, _ = msg.ToMessage().WriteTo(msgbuf)
|
||||||
@ -252,7 +253,7 @@ func TestTemplateServices(t *testing.T) {
|
|||||||
"//Re: //")
|
"//Re: //")
|
||||||
}
|
}
|
||||||
|
|
||||||
func testComposeIssueCommentMessage(t *testing.T, ctx *mailCommentContext, recipients []*user_model.User, fromMention bool, info string) *Message {
|
func testComposeIssueCommentMessage(t *testing.T, ctx *mailCommentContext, recipients []*user_model.User, fromMention bool, info string) *sender_service.Message {
|
||||||
msgs, err := composeIssueCommentMessages(ctx, "en-US", recipients, fromMention, info)
|
msgs, err := composeIssueCommentMessages(ctx, "en-US", recipients, fromMention, info)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
assert.Len(t, msgs, 1)
|
assert.Len(t, msgs, 1)
|
||||||
|
@ -5,391 +5,21 @@
|
|||||||
package mailer
|
package mailer
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
|
||||||
"context"
|
"context"
|
||||||
"crypto/tls"
|
|
||||||
"fmt"
|
|
||||||
"hash/fnv"
|
|
||||||
"io"
|
|
||||||
"net"
|
|
||||||
"net/smtp"
|
|
||||||
"os"
|
|
||||||
"os/exec"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"code.gitea.io/gitea/modules/base"
|
|
||||||
"code.gitea.io/gitea/modules/graceful"
|
"code.gitea.io/gitea/modules/graceful"
|
||||||
"code.gitea.io/gitea/modules/log"
|
"code.gitea.io/gitea/modules/log"
|
||||||
"code.gitea.io/gitea/modules/process"
|
|
||||||
"code.gitea.io/gitea/modules/queue"
|
"code.gitea.io/gitea/modules/queue"
|
||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
"code.gitea.io/gitea/modules/templates"
|
"code.gitea.io/gitea/modules/templates"
|
||||||
|
sender_service "code.gitea.io/gitea/services/mailer/sender"
|
||||||
notify_service "code.gitea.io/gitea/services/notify"
|
notify_service "code.gitea.io/gitea/services/notify"
|
||||||
|
|
||||||
ntlmssp "github.com/Azure/go-ntlmssp"
|
|
||||||
"github.com/jaytaylor/html2text"
|
|
||||||
"gopkg.in/gomail.v2"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Message mail body and log info
|
var mailQueue *queue.WorkerPoolQueue[*sender_service.Message]
|
||||||
type Message struct {
|
|
||||||
Info string // Message information for log purpose.
|
|
||||||
FromAddress string
|
|
||||||
FromDisplayName string
|
|
||||||
To string // Use only one recipient to prevent leaking of addresses
|
|
||||||
ReplyTo string
|
|
||||||
Subject string
|
|
||||||
Date time.Time
|
|
||||||
Body string
|
|
||||||
Headers map[string][]string
|
|
||||||
}
|
|
||||||
|
|
||||||
// ToMessage converts a Message to gomail.Message
|
// sender sender for sending mail synchronously
|
||||||
func (m *Message) ToMessage() *gomail.Message {
|
var sender sender_service.Sender
|
||||||
msg := gomail.NewMessage()
|
|
||||||
msg.SetAddressHeader("From", m.FromAddress, m.FromDisplayName)
|
|
||||||
msg.SetHeader("To", m.To)
|
|
||||||
if m.ReplyTo != "" {
|
|
||||||
msg.SetHeader("Reply-To", m.ReplyTo)
|
|
||||||
}
|
|
||||||
for header := range m.Headers {
|
|
||||||
msg.SetHeader(header, m.Headers[header]...)
|
|
||||||
}
|
|
||||||
|
|
||||||
if setting.MailService.SubjectPrefix != "" {
|
|
||||||
msg.SetHeader("Subject", setting.MailService.SubjectPrefix+" "+m.Subject)
|
|
||||||
} else {
|
|
||||||
msg.SetHeader("Subject", m.Subject)
|
|
||||||
}
|
|
||||||
msg.SetDateHeader("Date", m.Date)
|
|
||||||
msg.SetHeader("X-Auto-Response-Suppress", "All")
|
|
||||||
|
|
||||||
plainBody, err := html2text.FromString(m.Body)
|
|
||||||
if err != nil || setting.MailService.SendAsPlainText {
|
|
||||||
if strings.Contains(base.TruncateString(m.Body, 100), "<html>") {
|
|
||||||
log.Warn("Mail contains HTML but configured to send as plain text.")
|
|
||||||
}
|
|
||||||
msg.SetBody("text/plain", plainBody)
|
|
||||||
} else {
|
|
||||||
msg.SetBody("text/plain", plainBody)
|
|
||||||
msg.AddAlternative("text/html", m.Body)
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(msg.GetHeader("Message-ID")) == 0 {
|
|
||||||
msg.SetHeader("Message-ID", m.generateAutoMessageID())
|
|
||||||
}
|
|
||||||
|
|
||||||
for k, v := range setting.MailService.OverrideHeader {
|
|
||||||
if len(msg.GetHeader(k)) != 0 {
|
|
||||||
log.Debug("Mailer override header '%s' as per config", k)
|
|
||||||
}
|
|
||||||
msg.SetHeader(k, v...)
|
|
||||||
}
|
|
||||||
|
|
||||||
return msg
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetHeader adds additional headers to a message
|
|
||||||
func (m *Message) SetHeader(field string, value ...string) {
|
|
||||||
m.Headers[field] = value
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *Message) generateAutoMessageID() string {
|
|
||||||
dateMs := m.Date.UnixNano() / 1e6
|
|
||||||
h := fnv.New64()
|
|
||||||
if len(m.To) > 0 {
|
|
||||||
_, _ = h.Write([]byte(m.To))
|
|
||||||
}
|
|
||||||
_, _ = h.Write([]byte(m.Subject))
|
|
||||||
_, _ = h.Write([]byte(m.Body))
|
|
||||||
return fmt.Sprintf("<autogen-%d-%016x@%s>", dateMs, h.Sum64(), setting.Domain)
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewMessageFrom creates new mail message object with custom From header.
|
|
||||||
func NewMessageFrom(to, fromDisplayName, fromAddress, subject, body string) *Message {
|
|
||||||
log.Trace("NewMessageFrom (body):\n%s", body)
|
|
||||||
|
|
||||||
return &Message{
|
|
||||||
FromAddress: fromAddress,
|
|
||||||
FromDisplayName: fromDisplayName,
|
|
||||||
To: to,
|
|
||||||
Subject: subject,
|
|
||||||
Date: time.Now(),
|
|
||||||
Body: body,
|
|
||||||
Headers: map[string][]string{},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewMessage creates new mail message object with default From header.
|
|
||||||
func NewMessage(to, subject, body string) *Message {
|
|
||||||
return NewMessageFrom(to, setting.MailService.FromName, setting.MailService.FromEmail, subject, body)
|
|
||||||
}
|
|
||||||
|
|
||||||
type loginAuth struct {
|
|
||||||
username, password string
|
|
||||||
}
|
|
||||||
|
|
||||||
// LoginAuth SMTP AUTH LOGIN Auth Handler
|
|
||||||
func LoginAuth(username, password string) smtp.Auth {
|
|
||||||
return &loginAuth{username, password}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Start start SMTP login auth
|
|
||||||
func (a *loginAuth) Start(server *smtp.ServerInfo) (string, []byte, error) {
|
|
||||||
return "LOGIN", []byte{}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Next next step of SMTP login auth
|
|
||||||
func (a *loginAuth) Next(fromServer []byte, more bool) ([]byte, error) {
|
|
||||||
if more {
|
|
||||||
switch string(fromServer) {
|
|
||||||
case "Username:":
|
|
||||||
return []byte(a.username), nil
|
|
||||||
case "Password:":
|
|
||||||
return []byte(a.password), nil
|
|
||||||
default:
|
|
||||||
return nil, fmt.Errorf("unknown fromServer: %s", string(fromServer))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
type ntlmAuth struct {
|
|
||||||
username, password, domain string
|
|
||||||
domainNeeded bool
|
|
||||||
}
|
|
||||||
|
|
||||||
// NtlmAuth SMTP AUTH NTLM Auth Handler
|
|
||||||
func NtlmAuth(username, password string) smtp.Auth {
|
|
||||||
user, domain, domainNeeded := ntlmssp.GetDomain(username)
|
|
||||||
return &ntlmAuth{user, password, domain, domainNeeded}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Start starts SMTP NTLM Auth
|
|
||||||
func (a *ntlmAuth) Start(server *smtp.ServerInfo) (string, []byte, error) {
|
|
||||||
negotiateMessage, err := ntlmssp.NewNegotiateMessage(a.domain, "")
|
|
||||||
return "NTLM", negotiateMessage, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Next next step of SMTP ntlm auth
|
|
||||||
func (a *ntlmAuth) Next(fromServer []byte, more bool) ([]byte, error) {
|
|
||||||
if more {
|
|
||||||
if len(fromServer) == 0 {
|
|
||||||
return nil, fmt.Errorf("ntlm ChallengeMessage is empty")
|
|
||||||
}
|
|
||||||
authenticateMessage, err := ntlmssp.ProcessChallenge(fromServer, a.username, a.password, a.domainNeeded)
|
|
||||||
return authenticateMessage, err
|
|
||||||
}
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sender SMTP mail sender
|
|
||||||
type smtpSender struct{}
|
|
||||||
|
|
||||||
// Send send email
|
|
||||||
func (s *smtpSender) Send(from string, to []string, msg io.WriterTo) error {
|
|
||||||
opts := setting.MailService
|
|
||||||
|
|
||||||
var network string
|
|
||||||
var address string
|
|
||||||
if opts.Protocol == "smtp+unix" {
|
|
||||||
network = "unix"
|
|
||||||
address = opts.SMTPAddr
|
|
||||||
} else {
|
|
||||||
network = "tcp"
|
|
||||||
address = net.JoinHostPort(opts.SMTPAddr, opts.SMTPPort)
|
|
||||||
}
|
|
||||||
|
|
||||||
conn, err := net.Dial(network, address)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to establish network connection to SMTP server: %w", err)
|
|
||||||
}
|
|
||||||
defer conn.Close()
|
|
||||||
|
|
||||||
var tlsconfig *tls.Config
|
|
||||||
if opts.Protocol == "smtps" || opts.Protocol == "smtp+starttls" {
|
|
||||||
tlsconfig = &tls.Config{
|
|
||||||
InsecureSkipVerify: opts.ForceTrustServerCert,
|
|
||||||
ServerName: opts.SMTPAddr,
|
|
||||||
}
|
|
||||||
|
|
||||||
if opts.UseClientCert {
|
|
||||||
cert, err := tls.LoadX509KeyPair(opts.ClientCertFile, opts.ClientKeyFile)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("could not load SMTP client certificate: %w", err)
|
|
||||||
}
|
|
||||||
tlsconfig.Certificates = []tls.Certificate{cert}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if opts.Protocol == "smtps" {
|
|
||||||
conn = tls.Client(conn, tlsconfig)
|
|
||||||
}
|
|
||||||
|
|
||||||
host := "localhost"
|
|
||||||
if opts.Protocol == "smtp+unix" {
|
|
||||||
host = opts.SMTPAddr
|
|
||||||
}
|
|
||||||
client, err := smtp.NewClient(conn, host)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("could not initiate SMTP session: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if opts.EnableHelo {
|
|
||||||
hostname := opts.HeloHostname
|
|
||||||
if len(hostname) == 0 {
|
|
||||||
hostname, err = os.Hostname()
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("could not retrieve system hostname: %w", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if err = client.Hello(hostname); err != nil {
|
|
||||||
return fmt.Errorf("failed to issue HELO command: %w", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if opts.Protocol == "smtp+starttls" {
|
|
||||||
hasStartTLS, _ := client.Extension("STARTTLS")
|
|
||||||
if hasStartTLS {
|
|
||||||
if err = client.StartTLS(tlsconfig); err != nil {
|
|
||||||
return fmt.Errorf("failed to start TLS connection: %w", err)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
log.Warn("StartTLS requested, but SMTP server does not support it; falling back to regular SMTP")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
canAuth, options := client.Extension("AUTH")
|
|
||||||
if len(opts.User) > 0 {
|
|
||||||
if !canAuth {
|
|
||||||
return fmt.Errorf("SMTP server does not support AUTH, but credentials provided")
|
|
||||||
}
|
|
||||||
|
|
||||||
var auth smtp.Auth
|
|
||||||
|
|
||||||
if strings.Contains(options, "CRAM-MD5") {
|
|
||||||
auth = smtp.CRAMMD5Auth(opts.User, opts.Passwd)
|
|
||||||
} else if strings.Contains(options, "PLAIN") {
|
|
||||||
auth = smtp.PlainAuth("", opts.User, opts.Passwd, host)
|
|
||||||
} else if strings.Contains(options, "LOGIN") {
|
|
||||||
// Patch for AUTH LOGIN
|
|
||||||
auth = LoginAuth(opts.User, opts.Passwd)
|
|
||||||
} else if strings.Contains(options, "NTLM") {
|
|
||||||
auth = NtlmAuth(opts.User, opts.Passwd)
|
|
||||||
}
|
|
||||||
|
|
||||||
if auth != nil {
|
|
||||||
if err = client.Auth(auth); err != nil {
|
|
||||||
return fmt.Errorf("failed to authenticate SMTP: %w", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if opts.OverrideEnvelopeFrom {
|
|
||||||
if err = client.Mail(opts.EnvelopeFrom); err != nil {
|
|
||||||
return fmt.Errorf("failed to issue MAIL command: %w", err)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if err = client.Mail(from); err != nil {
|
|
||||||
return fmt.Errorf("failed to issue MAIL command: %w", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, rec := range to {
|
|
||||||
if err = client.Rcpt(rec); err != nil {
|
|
||||||
return fmt.Errorf("failed to issue RCPT command: %w", err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
w, err := client.Data()
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("failed to issue DATA command: %w", err)
|
|
||||||
} else if _, err = msg.WriteTo(w); err != nil {
|
|
||||||
return fmt.Errorf("SMTP write failed: %w", err)
|
|
||||||
} else if err = w.Close(); err != nil {
|
|
||||||
return fmt.Errorf("SMTP close failed: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return client.Quit()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sender sendmail mail sender
|
|
||||||
type sendmailSender struct{}
|
|
||||||
|
|
||||||
// Send send email
|
|
||||||
func (s *sendmailSender) Send(from string, to []string, msg io.WriterTo) error {
|
|
||||||
var err error
|
|
||||||
var closeError error
|
|
||||||
var waitError error
|
|
||||||
|
|
||||||
envelopeFrom := from
|
|
||||||
if setting.MailService.OverrideEnvelopeFrom {
|
|
||||||
envelopeFrom = setting.MailService.EnvelopeFrom
|
|
||||||
}
|
|
||||||
|
|
||||||
args := []string{"-f", envelopeFrom, "-i"}
|
|
||||||
args = append(args, setting.MailService.SendmailArgs...)
|
|
||||||
args = append(args, to...)
|
|
||||||
log.Trace("Sending with: %s %v", setting.MailService.SendmailPath, args)
|
|
||||||
|
|
||||||
desc := fmt.Sprintf("SendMail: %s %v", setting.MailService.SendmailPath, args)
|
|
||||||
|
|
||||||
ctx, _, finished := process.GetManager().AddContextTimeout(graceful.GetManager().HammerContext(), setting.MailService.SendmailTimeout, desc)
|
|
||||||
defer finished()
|
|
||||||
|
|
||||||
cmd := exec.CommandContext(ctx, setting.MailService.SendmailPath, args...)
|
|
||||||
pipe, err := cmd.StdinPipe()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
process.SetSysProcAttribute(cmd)
|
|
||||||
|
|
||||||
if err = cmd.Start(); err != nil {
|
|
||||||
_ = pipe.Close()
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
if setting.MailService.SendmailConvertCRLF {
|
|
||||||
buf := &strings.Builder{}
|
|
||||||
_, err = msg.WriteTo(buf)
|
|
||||||
if err == nil {
|
|
||||||
_, err = strings.NewReplacer("\r\n", "\n").WriteString(pipe, buf.String())
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
_, err = msg.WriteTo(pipe)
|
|
||||||
}
|
|
||||||
|
|
||||||
// we MUST close the pipe or sendmail will hang waiting for more of the message
|
|
||||||
// Also we should wait on our sendmail command even if something fails
|
|
||||||
closeError = pipe.Close()
|
|
||||||
waitError = cmd.Wait()
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
} else if closeError != nil {
|
|
||||||
return closeError
|
|
||||||
}
|
|
||||||
return waitError
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sender sendmail mail sender
|
|
||||||
type dummySender struct{}
|
|
||||||
|
|
||||||
// Send send email
|
|
||||||
func (s *dummySender) Send(from string, to []string, msg io.WriterTo) error {
|
|
||||||
buf := bytes.Buffer{}
|
|
||||||
if _, err := msg.WriteTo(&buf); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
log.Debug("Mail From: %s To: %v Body: %s", from, to, buf.String())
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
var mailQueue *queue.WorkerPoolQueue[*Message]
|
|
||||||
|
|
||||||
// Sender sender for sending mail synchronously
|
|
||||||
var Sender gomail.Sender
|
|
||||||
|
|
||||||
// NewContext start mail queue service
|
// NewContext start mail queue service
|
||||||
func NewContext(ctx context.Context) {
|
func NewContext(ctx context.Context) {
|
||||||
@ -406,20 +36,20 @@ func NewContext(ctx context.Context) {
|
|||||||
|
|
||||||
switch setting.MailService.Protocol {
|
switch setting.MailService.Protocol {
|
||||||
case "sendmail":
|
case "sendmail":
|
||||||
Sender = &sendmailSender{}
|
sender = &sender_service.SendmailSender{}
|
||||||
case "dummy":
|
case "dummy":
|
||||||
Sender = &dummySender{}
|
sender = &sender_service.DummySender{}
|
||||||
default:
|
default:
|
||||||
Sender = &smtpSender{}
|
sender = &sender_service.SMTPSender{}
|
||||||
}
|
}
|
||||||
|
|
||||||
subjectTemplates, bodyTemplates = templates.Mailer(ctx)
|
subjectTemplates, bodyTemplates = templates.Mailer(ctx)
|
||||||
|
|
||||||
mailQueue = queue.CreateSimpleQueue(graceful.GetManager().ShutdownContext(), "mail", func(items ...*Message) []*Message {
|
mailQueue = queue.CreateSimpleQueue(graceful.GetManager().ShutdownContext(), "mail", func(items ...*sender_service.Message) []*sender_service.Message {
|
||||||
for _, msg := range items {
|
for _, msg := range items {
|
||||||
gomailMsg := msg.ToMessage()
|
gomailMsg := msg.ToMessage()
|
||||||
log.Trace("New e-mail sending request %s: %s", gomailMsg.GetHeader("To"), msg.Info)
|
log.Trace("New e-mail sending request %s: %s", gomailMsg.GetHeader("To"), msg.Info)
|
||||||
if err := gomail.Send(Sender, gomailMsg); err != nil {
|
if err := sender_service.Send(sender, msg); err != nil {
|
||||||
log.Error("Failed to send emails %s: %s - %v", gomailMsg.GetHeader("To"), msg.Info, err)
|
log.Error("Failed to send emails %s: %s - %v", gomailMsg.GetHeader("To"), msg.Info, err)
|
||||||
} else {
|
} else {
|
||||||
log.Trace("E-mails sent %s: %s", gomailMsg.GetHeader("To"), msg.Info)
|
log.Trace("E-mails sent %s: %s", gomailMsg.GetHeader("To"), msg.Info)
|
||||||
@ -436,7 +66,7 @@ func NewContext(ctx context.Context) {
|
|||||||
// SendAsync send emails asynchronously (make it mockable)
|
// SendAsync send emails asynchronously (make it mockable)
|
||||||
var SendAsync = sendAsync
|
var SendAsync = sendAsync
|
||||||
|
|
||||||
func sendAsync(msgs ...*Message) {
|
func sendAsync(msgs ...*sender_service.Message) {
|
||||||
if setting.MailService == nil {
|
if setting.MailService == nil {
|
||||||
log.Error("Mailer: SendAsync is being invoked but mail service hasn't been initialized")
|
log.Error("Mailer: SendAsync is being invoked but mail service hasn't been initialized")
|
||||||
return
|
return
|
||||||
|
26
services/mailer/sender/dummy.go
Normal file
26
services/mailer/sender/dummy.go
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package sender
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"io"
|
||||||
|
|
||||||
|
"code.gitea.io/gitea/modules/log"
|
||||||
|
)
|
||||||
|
|
||||||
|
// DummySender Sender sendmail mail sender
|
||||||
|
type DummySender struct{}
|
||||||
|
|
||||||
|
var _ Sender = &DummySender{}
|
||||||
|
|
||||||
|
// Send send email
|
||||||
|
func (s *DummySender) Send(from string, to []string, msg io.WriterTo) error {
|
||||||
|
buf := bytes.Buffer{}
|
||||||
|
if _, err := msg.WriteTo(&buf); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
log.Debug("Mail From: %s To: %v Body: %s", from, to, buf.String())
|
||||||
|
return nil
|
||||||
|
}
|
112
services/mailer/sender/message.go
Normal file
112
services/mailer/sender/message.go
Normal file
@ -0,0 +1,112 @@
|
|||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package sender
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"hash/fnv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"code.gitea.io/gitea/modules/base"
|
||||||
|
"code.gitea.io/gitea/modules/log"
|
||||||
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
|
||||||
|
"github.com/jaytaylor/html2text"
|
||||||
|
"gopkg.in/gomail.v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Message mail body and log info
|
||||||
|
type Message struct {
|
||||||
|
Info string // Message information for log purpose.
|
||||||
|
FromAddress string
|
||||||
|
FromDisplayName string
|
||||||
|
To string // Use only one recipient to prevent leaking of addresses
|
||||||
|
ReplyTo string
|
||||||
|
Subject string
|
||||||
|
Date time.Time
|
||||||
|
Body string
|
||||||
|
Headers map[string][]string
|
||||||
|
}
|
||||||
|
|
||||||
|
// ToMessage converts a Message to gomail.Message
|
||||||
|
func (m *Message) ToMessage() *gomail.Message {
|
||||||
|
msg := gomail.NewMessage()
|
||||||
|
msg.SetAddressHeader("From", m.FromAddress, m.FromDisplayName)
|
||||||
|
msg.SetHeader("To", m.To)
|
||||||
|
if m.ReplyTo != "" {
|
||||||
|
msg.SetHeader("Reply-To", m.ReplyTo)
|
||||||
|
}
|
||||||
|
for header := range m.Headers {
|
||||||
|
msg.SetHeader(header, m.Headers[header]...)
|
||||||
|
}
|
||||||
|
|
||||||
|
if setting.MailService.SubjectPrefix != "" {
|
||||||
|
msg.SetHeader("Subject", setting.MailService.SubjectPrefix+" "+m.Subject)
|
||||||
|
} else {
|
||||||
|
msg.SetHeader("Subject", m.Subject)
|
||||||
|
}
|
||||||
|
msg.SetDateHeader("Date", m.Date)
|
||||||
|
msg.SetHeader("X-Auto-Response-Suppress", "All")
|
||||||
|
|
||||||
|
plainBody, err := html2text.FromString(m.Body)
|
||||||
|
if err != nil || setting.MailService.SendAsPlainText {
|
||||||
|
if strings.Contains(base.TruncateString(m.Body, 100), "<html>") {
|
||||||
|
log.Warn("Mail contains HTML but configured to send as plain text.")
|
||||||
|
}
|
||||||
|
msg.SetBody("text/plain", plainBody)
|
||||||
|
} else {
|
||||||
|
msg.SetBody("text/plain", plainBody)
|
||||||
|
msg.AddAlternative("text/html", m.Body)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(msg.GetHeader("Message-ID")) == 0 {
|
||||||
|
msg.SetHeader("Message-ID", m.generateAutoMessageID())
|
||||||
|
}
|
||||||
|
|
||||||
|
for k, v := range setting.MailService.OverrideHeader {
|
||||||
|
if len(msg.GetHeader(k)) != 0 {
|
||||||
|
log.Debug("Mailer override header '%s' as per config", k)
|
||||||
|
}
|
||||||
|
msg.SetHeader(k, v...)
|
||||||
|
}
|
||||||
|
|
||||||
|
return msg
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetHeader adds additional headers to a message
|
||||||
|
func (m *Message) SetHeader(field string, value ...string) {
|
||||||
|
m.Headers[field] = value
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *Message) generateAutoMessageID() string {
|
||||||
|
dateMs := m.Date.UnixNano() / 1e6
|
||||||
|
h := fnv.New64()
|
||||||
|
if len(m.To) > 0 {
|
||||||
|
_, _ = h.Write([]byte(m.To))
|
||||||
|
}
|
||||||
|
_, _ = h.Write([]byte(m.Subject))
|
||||||
|
_, _ = h.Write([]byte(m.Body))
|
||||||
|
return fmt.Sprintf("<autogen-%d-%016x@%s>", dateMs, h.Sum64(), setting.Domain)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewMessageFrom creates new mail message object with custom From header.
|
||||||
|
func NewMessageFrom(to, fromDisplayName, fromAddress, subject, body string) *Message {
|
||||||
|
log.Trace("NewMessageFrom (body):\n%s", body)
|
||||||
|
|
||||||
|
return &Message{
|
||||||
|
FromAddress: fromAddress,
|
||||||
|
FromDisplayName: fromDisplayName,
|
||||||
|
To: to,
|
||||||
|
Subject: subject,
|
||||||
|
Date: time.Now(),
|
||||||
|
Body: body,
|
||||||
|
Headers: map[string][]string{},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewMessage creates new mail message object with default From header.
|
||||||
|
func NewMessage(to, subject, body string) *Message {
|
||||||
|
return NewMessageFrom(to, setting.MailService.FromName, setting.MailService.FromEmail, subject, body)
|
||||||
|
}
|
@ -1,7 +1,7 @@
|
|||||||
// Copyright 2021 The Gogs Authors. All rights reserved.
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
// SPDX-License-Identifier: MIT
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
package mailer
|
package sender
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"strings"
|
"strings"
|
27
services/mailer/sender/sender.go
Normal file
27
services/mailer/sender/sender.go
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package sender
|
||||||
|
|
||||||
|
import (
|
||||||
|
"code.gitea.io/gitea/modules/log"
|
||||||
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
|
||||||
|
"gopkg.in/gomail.v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Sender gomail.Sender
|
||||||
|
|
||||||
|
var Send = send
|
||||||
|
|
||||||
|
func send(sender Sender, msgs ...*Message) error {
|
||||||
|
if setting.MailService == nil {
|
||||||
|
log.Error("Mailer: Send is being invoked but mail service hasn't been initialized")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
goMsgs := []*gomail.Message{}
|
||||||
|
for _, msg := range msgs {
|
||||||
|
goMsgs = append(goMsgs, msg.ToMessage())
|
||||||
|
}
|
||||||
|
return gomail.Send(sender, goMsgs...)
|
||||||
|
}
|
76
services/mailer/sender/sendmail.go
Normal file
76
services/mailer/sender/sendmail.go
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package sender
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"os/exec"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"code.gitea.io/gitea/modules/graceful"
|
||||||
|
"code.gitea.io/gitea/modules/log"
|
||||||
|
"code.gitea.io/gitea/modules/process"
|
||||||
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
)
|
||||||
|
|
||||||
|
// SendmailSender Sender sendmail mail sender
|
||||||
|
type SendmailSender struct{}
|
||||||
|
|
||||||
|
var _ Sender = &SendmailSender{}
|
||||||
|
|
||||||
|
// Send send email
|
||||||
|
func (s *SendmailSender) Send(from string, to []string, msg io.WriterTo) error {
|
||||||
|
var err error
|
||||||
|
var closeError error
|
||||||
|
var waitError error
|
||||||
|
|
||||||
|
envelopeFrom := from
|
||||||
|
if setting.MailService.OverrideEnvelopeFrom {
|
||||||
|
envelopeFrom = setting.MailService.EnvelopeFrom
|
||||||
|
}
|
||||||
|
|
||||||
|
args := []string{"-f", envelopeFrom, "-i"}
|
||||||
|
args = append(args, setting.MailService.SendmailArgs...)
|
||||||
|
args = append(args, to...)
|
||||||
|
log.Trace("Sending with: %s %v", setting.MailService.SendmailPath, args)
|
||||||
|
|
||||||
|
desc := fmt.Sprintf("SendMail: %s %v", setting.MailService.SendmailPath, args)
|
||||||
|
|
||||||
|
ctx, _, finished := process.GetManager().AddContextTimeout(graceful.GetManager().HammerContext(), setting.MailService.SendmailTimeout, desc)
|
||||||
|
defer finished()
|
||||||
|
|
||||||
|
cmd := exec.CommandContext(ctx, setting.MailService.SendmailPath, args...)
|
||||||
|
pipe, err := cmd.StdinPipe()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
process.SetSysProcAttribute(cmd)
|
||||||
|
|
||||||
|
if err = cmd.Start(); err != nil {
|
||||||
|
_ = pipe.Close()
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if setting.MailService.SendmailConvertCRLF {
|
||||||
|
buf := &strings.Builder{}
|
||||||
|
_, err = msg.WriteTo(buf)
|
||||||
|
if err == nil {
|
||||||
|
_, err = strings.NewReplacer("\r\n", "\n").WriteString(pipe, buf.String())
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
_, err = msg.WriteTo(pipe)
|
||||||
|
}
|
||||||
|
|
||||||
|
// we MUST close the pipe or sendmail will hang waiting for more of the message
|
||||||
|
// Also we should wait on our sendmail command even if something fails
|
||||||
|
closeError = pipe.Close()
|
||||||
|
waitError = cmd.Wait()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
} else if closeError != nil {
|
||||||
|
return closeError
|
||||||
|
}
|
||||||
|
return waitError
|
||||||
|
}
|
150
services/mailer/sender/smtp.go
Normal file
150
services/mailer/sender/smtp.go
Normal file
@ -0,0 +1,150 @@
|
|||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package sender
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto/tls"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net"
|
||||||
|
"net/smtp"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"code.gitea.io/gitea/modules/log"
|
||||||
|
"code.gitea.io/gitea/modules/setting"
|
||||||
|
)
|
||||||
|
|
||||||
|
// SMTPSender Sender SMTP mail sender
|
||||||
|
type SMTPSender struct{}
|
||||||
|
|
||||||
|
var _ Sender = &SMTPSender{}
|
||||||
|
|
||||||
|
// Send send email
|
||||||
|
func (s *SMTPSender) Send(from string, to []string, msg io.WriterTo) error {
|
||||||
|
opts := setting.MailService
|
||||||
|
|
||||||
|
var network string
|
||||||
|
var address string
|
||||||
|
if opts.Protocol == "smtp+unix" {
|
||||||
|
network = "unix"
|
||||||
|
address = opts.SMTPAddr
|
||||||
|
} else {
|
||||||
|
network = "tcp"
|
||||||
|
address = net.JoinHostPort(opts.SMTPAddr, opts.SMTPPort)
|
||||||
|
}
|
||||||
|
|
||||||
|
conn, err := net.Dial(network, address)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to establish network connection to SMTP server: %w", err)
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
|
||||||
|
var tlsconfig *tls.Config
|
||||||
|
if opts.Protocol == "smtps" || opts.Protocol == "smtp+starttls" {
|
||||||
|
tlsconfig = &tls.Config{
|
||||||
|
InsecureSkipVerify: opts.ForceTrustServerCert,
|
||||||
|
ServerName: opts.SMTPAddr,
|
||||||
|
}
|
||||||
|
|
||||||
|
if opts.UseClientCert {
|
||||||
|
cert, err := tls.LoadX509KeyPair(opts.ClientCertFile, opts.ClientKeyFile)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("could not load SMTP client certificate: %w", err)
|
||||||
|
}
|
||||||
|
tlsconfig.Certificates = []tls.Certificate{cert}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if opts.Protocol == "smtps" {
|
||||||
|
conn = tls.Client(conn, tlsconfig)
|
||||||
|
}
|
||||||
|
|
||||||
|
host := "localhost"
|
||||||
|
if opts.Protocol == "smtp+unix" {
|
||||||
|
host = opts.SMTPAddr
|
||||||
|
}
|
||||||
|
client, err := smtp.NewClient(conn, host)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("could not initiate SMTP session: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if opts.EnableHelo {
|
||||||
|
hostname := opts.HeloHostname
|
||||||
|
if len(hostname) == 0 {
|
||||||
|
hostname, err = os.Hostname()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("could not retrieve system hostname: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err = client.Hello(hostname); err != nil {
|
||||||
|
return fmt.Errorf("failed to issue HELO command: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if opts.Protocol == "smtp+starttls" {
|
||||||
|
hasStartTLS, _ := client.Extension("STARTTLS")
|
||||||
|
if hasStartTLS {
|
||||||
|
if err = client.StartTLS(tlsconfig); err != nil {
|
||||||
|
return fmt.Errorf("failed to start TLS connection: %w", err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
log.Warn("StartTLS requested, but SMTP server does not support it; falling back to regular SMTP")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
canAuth, options := client.Extension("AUTH")
|
||||||
|
if len(opts.User) > 0 {
|
||||||
|
if !canAuth {
|
||||||
|
return fmt.Errorf("SMTP server does not support AUTH, but credentials provided")
|
||||||
|
}
|
||||||
|
|
||||||
|
var auth smtp.Auth
|
||||||
|
|
||||||
|
if strings.Contains(options, "CRAM-MD5") {
|
||||||
|
auth = smtp.CRAMMD5Auth(opts.User, opts.Passwd)
|
||||||
|
} else if strings.Contains(options, "PLAIN") {
|
||||||
|
auth = smtp.PlainAuth("", opts.User, opts.Passwd, host)
|
||||||
|
} else if strings.Contains(options, "LOGIN") {
|
||||||
|
// Patch for AUTH LOGIN
|
||||||
|
auth = LoginAuth(opts.User, opts.Passwd)
|
||||||
|
} else if strings.Contains(options, "NTLM") {
|
||||||
|
auth = NtlmAuth(opts.User, opts.Passwd)
|
||||||
|
}
|
||||||
|
|
||||||
|
if auth != nil {
|
||||||
|
if err = client.Auth(auth); err != nil {
|
||||||
|
return fmt.Errorf("failed to authenticate SMTP: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if opts.OverrideEnvelopeFrom {
|
||||||
|
if err = client.Mail(opts.EnvelopeFrom); err != nil {
|
||||||
|
return fmt.Errorf("failed to issue MAIL command: %w", err)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if err = client.Mail(from); err != nil {
|
||||||
|
return fmt.Errorf("failed to issue MAIL command: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, rec := range to {
|
||||||
|
if err = client.Rcpt(rec); err != nil {
|
||||||
|
return fmt.Errorf("failed to issue RCPT command: %w", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
w, err := client.Data()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to issue DATA command: %w", err)
|
||||||
|
} else if _, err = msg.WriteTo(w); err != nil {
|
||||||
|
return fmt.Errorf("SMTP write failed: %w", err)
|
||||||
|
} else if err = w.Close(); err != nil {
|
||||||
|
return fmt.Errorf("SMTP close failed: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return client.Quit()
|
||||||
|
}
|
69
services/mailer/sender/smtp_auth.go
Normal file
69
services/mailer/sender/smtp_auth.go
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
// Copyright 2024 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package sender
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net/smtp"
|
||||||
|
|
||||||
|
"github.com/Azure/go-ntlmssp"
|
||||||
|
)
|
||||||
|
|
||||||
|
type loginAuth struct {
|
||||||
|
username, password string
|
||||||
|
}
|
||||||
|
|
||||||
|
// LoginAuth SMTP AUTH LOGIN Auth Handler
|
||||||
|
func LoginAuth(username, password string) smtp.Auth {
|
||||||
|
return &loginAuth{username, password}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start start SMTP login auth
|
||||||
|
func (a *loginAuth) Start(server *smtp.ServerInfo) (string, []byte, error) {
|
||||||
|
return "LOGIN", []byte{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Next next step of SMTP login auth
|
||||||
|
func (a *loginAuth) Next(fromServer []byte, more bool) ([]byte, error) {
|
||||||
|
if more {
|
||||||
|
switch string(fromServer) {
|
||||||
|
case "Username:":
|
||||||
|
return []byte(a.username), nil
|
||||||
|
case "Password:":
|
||||||
|
return []byte(a.password), nil
|
||||||
|
default:
|
||||||
|
return nil, fmt.Errorf("unknown fromServer: %s", string(fromServer))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
type ntlmAuth struct {
|
||||||
|
username, password, domain string
|
||||||
|
domainNeeded bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// NtlmAuth SMTP AUTH NTLM Auth Handler
|
||||||
|
func NtlmAuth(username, password string) smtp.Auth {
|
||||||
|
user, domain, domainNeeded := ntlmssp.GetDomain(username)
|
||||||
|
return &ntlmAuth{user, password, domain, domainNeeded}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start starts SMTP NTLM Auth
|
||||||
|
func (a *ntlmAuth) Start(server *smtp.ServerInfo) (string, []byte, error) {
|
||||||
|
negotiateMessage, err := ntlmssp.NewNegotiateMessage(a.domain, "")
|
||||||
|
return "NTLM", negotiateMessage, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Next next step of SMTP ntlm auth
|
||||||
|
func (a *ntlmAuth) Next(fromServer []byte, more bool) ([]byte, error) {
|
||||||
|
if more {
|
||||||
|
if len(fromServer) == 0 {
|
||||||
|
return nil, fmt.Errorf("ntlm ChallengeMessage is empty")
|
||||||
|
}
|
||||||
|
authenticateMessage, err := ntlmssp.ProcessChallenge(fromServer, a.username, a.password, a.domainNeeded)
|
||||||
|
return authenticateMessage, err
|
||||||
|
}
|
||||||
|
return nil, nil
|
||||||
|
}
|
@ -144,12 +144,12 @@ func TestActionsArtifactDownload(t *testing.T) {
|
|||||||
var downloadResp downloadArtifactResponse
|
var downloadResp downloadArtifactResponse
|
||||||
DecodeJSON(t, resp, &downloadResp)
|
DecodeJSON(t, resp, &downloadResp)
|
||||||
assert.Len(t, downloadResp.Value, 1)
|
assert.Len(t, downloadResp.Value, 1)
|
||||||
assert.Equal(t, "artifact-download/abc.txt", downloadResp.Value[artifactIdx].Path)
|
assert.Equal(t, "artifact-download/abc.txt", downloadResp.Value[0].Path)
|
||||||
assert.Equal(t, "file", downloadResp.Value[artifactIdx].ItemType)
|
assert.Equal(t, "file", downloadResp.Value[0].ItemType)
|
||||||
assert.Contains(t, downloadResp.Value[artifactIdx].ContentLocation, "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts")
|
assert.Contains(t, downloadResp.Value[0].ContentLocation, "/api/actions_pipeline/_apis/pipelines/workflows/791/artifacts")
|
||||||
|
|
||||||
idx = strings.Index(downloadResp.Value[artifactIdx].ContentLocation, "/api/actions_pipeline/_apis/pipelines/")
|
idx = strings.Index(downloadResp.Value[0].ContentLocation, "/api/actions_pipeline/_apis/pipelines/")
|
||||||
url = downloadResp.Value[artifactIdx].ContentLocation[idx:]
|
url = downloadResp.Value[0].ContentLocation[idx:]
|
||||||
req = NewRequest(t, "GET", url).
|
req = NewRequest(t, "GET", url).
|
||||||
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a")
|
AddTokenAuth("8061e833a55f6fc0157c98b883e91fcfeeb1a71a")
|
||||||
resp = MakeRequest(t, req, http.StatusOK)
|
resp = MakeRequest(t, req, http.StatusOK)
|
||||||
|
@ -19,11 +19,11 @@ import (
|
|||||||
"code.gitea.io/gitea/modules/setting"
|
"code.gitea.io/gitea/modules/setting"
|
||||||
"code.gitea.io/gitea/services/mailer/incoming"
|
"code.gitea.io/gitea/services/mailer/incoming"
|
||||||
incoming_payload "code.gitea.io/gitea/services/mailer/incoming/payload"
|
incoming_payload "code.gitea.io/gitea/services/mailer/incoming/payload"
|
||||||
|
sender_service "code.gitea.io/gitea/services/mailer/sender"
|
||||||
token_service "code.gitea.io/gitea/services/mailer/token"
|
token_service "code.gitea.io/gitea/services/mailer/token"
|
||||||
"code.gitea.io/gitea/tests"
|
"code.gitea.io/gitea/tests"
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"gopkg.in/gomail.v2"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestIncomingEmail(t *testing.T) {
|
func TestIncomingEmail(t *testing.T) {
|
||||||
@ -189,11 +189,15 @@ func TestIncomingEmail(t *testing.T) {
|
|||||||
token, err := token_service.CreateToken(token_service.ReplyHandlerType, user, payload)
|
token, err := token_service.CreateToken(token_service.ReplyHandlerType, user, payload)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
|
|
||||||
msg := gomail.NewMessage()
|
msg := sender_service.NewMessageFrom(
|
||||||
msg.SetHeader("To", strings.Replace(setting.IncomingEmail.ReplyToAddress, setting.IncomingEmail.TokenPlaceholder, token, 1))
|
strings.Replace(setting.IncomingEmail.ReplyToAddress, setting.IncomingEmail.TokenPlaceholder, token, 1),
|
||||||
msg.SetHeader("From", user.Email)
|
"",
|
||||||
msg.SetBody("text/plain", token)
|
user.Email,
|
||||||
err = gomail.Send(&smtpTestSender{}, msg)
|
"",
|
||||||
|
token,
|
||||||
|
)
|
||||||
|
|
||||||
|
err = sender_service.Send(&smtpTestSender{}, msg)
|
||||||
assert.NoError(t, err)
|
assert.NoError(t, err)
|
||||||
|
|
||||||
assert.Eventually(t, func() bool {
|
assert.Eventually(t, func() bool {
|
||||||
|
Loading…
Reference in New Issue
Block a user