Skip to content

fix: read template body from local file path when configured #2592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tsushanth wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: read template body from local file path when configured #2592

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions internal/mailer/templatemailer/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"html/template"
"io"
"net/http"
"os"
"strings"
"sync"
"time"
Expand Down Expand Up @@ -452,14 +453,27 @@ func (o *Cache) loadEntryBody(
temp := template.Must(template.New("").Parse(tempStr))
return temp, nil
}
if !strings.HasPrefix(url, "http") {
url = cfg.SiteURL + url
}

tempStr, err := o.fetch(ctx, cfg, url)
if err != nil {
err = wrapError(ctx, typ, "template_body_http_error", err)
return nil, err
var tempStr string
if strings.HasPrefix(url, "file://") || strings.HasPrefix(url, "/") || strings.HasPrefix(url, "./") {
// Local file path: strip optional file:// scheme and read from disk.
filePath := strings.TrimPrefix(url, "file://")
data, rerr := os.ReadFile(filePath)
if rerr != nil {
rerr = wrapError(ctx, typ, "template_body_file_error", rerr)
return nil, rerr
}
tempStr = string(data)
} else {
if !strings.HasPrefix(url, "http") {
url = cfg.SiteURL + url
}
var ferr error
tempStr, ferr = o.fetch(ctx, cfg, url)
if ferr != nil {
ferr = wrapError(ctx, typ, "template_body_http_error", ferr)
return nil, ferr
}
}

temp, err := template.New(url).Parse(tempStr)
Expand Down