From c8a07b5e105343a106df1fa1174bb40164c9b2ed Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 12 Apr 2023 22:53:17 +0800 Subject: [PATCH 1/2] fix --- modules/templates/mailer.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/templates/mailer.go b/modules/templates/mailer.go index a257e7c1da3ea..f3d96c3573d8a 100644 --- a/modules/templates/mailer.go +++ b/modules/templates/mailer.go @@ -8,6 +8,7 @@ import ( "html/template" "io/fs" "os" + "path/filepath" "strings" texttmpl "text/template" @@ -65,6 +66,7 @@ func Mailer(ctx context.Context) (*texttmpl.Template, *template.Template) { } assetName := strings.TrimSuffix(name, ".tmpl") + assetName = filepath.ToSlash(assetName) log.Trace("Adding mailer template for %s from %q", assetName, path) buildSubjectBodyTemplate(subjectTemplates, bodyTemplates, From d8ec6047630acd47d756a45f075f0340cb3fddce Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 12 Apr 2023 23:01:10 +0800 Subject: [PATCH 2/2] use util.PathJoinRelX instead, more safe --- modules/templates/mailer.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/templates/mailer.go b/modules/templates/mailer.go index f3d96c3573d8a..355a9d6daff16 100644 --- a/modules/templates/mailer.go +++ b/modules/templates/mailer.go @@ -8,12 +8,12 @@ import ( "html/template" "io/fs" "os" - "path/filepath" "strings" texttmpl "text/template" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/watcher" ) @@ -66,7 +66,7 @@ func Mailer(ctx context.Context) (*texttmpl.Template, *template.Template) { } assetName := strings.TrimSuffix(name, ".tmpl") - assetName = filepath.ToSlash(assetName) + assetName = util.PathJoinRelX(assetName) log.Trace("Adding mailer template for %s from %q", assetName, path) buildSubjectBodyTemplate(subjectTemplates, bodyTemplates,