Skip to content

BillionMail gives you open-source MailServer, NewsLetter, Email Marketing — fully self-hosted, dev-friendly, and free from monthly fees. Join the discord: https://discord.gg/asfXzBUhZr

refactor(url-generation): enhance base URL handling with domain-specific resolution

Jackbec53d2cd68f
diff --git a/core/internal/service/batch_mail/task_executor.go b/core/internal/service/batch_mail/task_executor.go
index 510b20ca..ea1bfe75 100644
--- a/core/internal/service/batch_mail/task_executor.go
+++ b/core/internal/service/batch_mail/task_executor.go
@@ -865,7 +865,7 @@ func (e *TaskExecutor) processEmailContent(ctx context.Context, content string,
content = public.AddUnsubscribeButton(content)
}
// get current domain
- domain := domains.GetBaseURL()
+ domain := domains.GetBaseURLBySender(task.Addresser)
// generate unsubscribe URL placeholder
unsubscribeURL := fmt.Sprintf("%s/api/unsubscribe", domain)
@@ -934,7 +934,7 @@ func (e *TaskExecutor) sendEmail(ctx context.Context, task *entity.EmailTask, re
messageID := sender.GenerateMessageID()
//Tracking emails
- baseURL := domains.GetBaseURL()
+ baseURL := domains.GetBaseURLBySender(task.Addresser)
mail_tracker := maillog_stat.NewMailTracker(content, task.Id, messageID, recipient.Recipient, baseURL)
mail_tracker.TrackLinks()
mail_tracker.AppendTrackingPixel()
diff --git a/core/internal/service/domains/baseurl.go b/core/internal/service/domains/baseurl.go
index 17b87186..b8078f55 100644
--- a/core/internal/service/domains/baseurl.go
+++ b/core/internal/service/domains/baseurl.go
@@ -7,10 +7,12 @@ import (
"context"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/util/gconv"
+ "sync"
)
var (
- baseurl = ""
+ baseurl = ""
+ baseurlMap = make(map[string]string)
)
// GetBaseURL get baseurl of console panel
@@ -18,12 +20,65 @@ func GetBaseURL() string {
return baseurl
}
-func UpdateBaseURL() {
+// GetBaseURLBySender get baseurl by sender email address
+func GetBaseURLBySender(sender string) string {
+ err := g.Validator().Data(sender).Rules("email").Run(context.Background())
+
+ if err != nil {
+ g.Log().Warning(context.Background(), "GetBaseURLBySender --> Invalid email address", sender, err)
+ return GetBaseURL()
+ }
+
+ if s, ok := baseurlMap[sender]; ok {
+ return s
+ }
+
+ return GetBaseURL()
+}
+
+func UpdateBaseURL(ctx context.Context, domain ...string) {
g.Log().Debug(context.Background(), "UpdateBaseURL --> Starting")
defer func() {
g.Log().Debug(context.Background(), "UpdateBaseURL --> Ending")
}()
+ var domains []string
+
+ if len(domain) > 0 {
+ domains = domain
+ } else {
+ ds, err := All(ctx)
+
+ if err != nil {
+ return
+ }
+
+ for _, d := range ds {
+ domains = append(domains, d.Domain)
+ }
+ }
+
+ wg := sync.WaitGroup{}
+
+ wg.Add(1)
+ go func() {
+ defer wg.Done()
+ baseurl = buildBaseURL("")
+ }()
+
+ for _, d := range domains {
+ wg.Add(1)
+ go func(domain string) {
+ defer wg.Done()
+ g.Log().Debug(ctx, "UpdateBaseURL --> Updating base URL for domain:", domain)
+ baseurlMap[domain] = buildBaseURL(domain)
+ }(d)
+ }
+
+ wg.Wait()
+}
+
+func buildBaseURL(hostname string) (s string) {
scheme := "https"
serverPort := g.Server(consts.DEFAULT_SERVER_NAME).GetListenedHTTPSPort()
@@ -48,32 +103,40 @@ func UpdateBaseURL() {
if appEnv, err := public.DockerEnv("APP_ENV"); err == nil && appEnv != "" {
switch appEnv {
case "development":
- baseurl = scheme + "://" + localIP
+ s = scheme + "://" + localIP
if withPort {
- baseurl += ":" + gconv.String(serverPort)
+ s += ":" + gconv.String(serverPort)
}
return
}
}
- hostname, err := public.DockerEnv("BILLIONMAIL_HOSTNAME")
-
- if err != nil || !ValidateARecord(v1.DNSRecord{
- Type: "A",
- Host: hostname,
- Value: serverIP,
- Valid: false,
- }) {
- baseurl = scheme + "://" + serverIP
- if withPort {
- baseurl += ":" + gconv.String(serverPort)
+ if hostname == "" {
+ hostname, err = public.DockerEnv("BILLIONMAIL_HOSTNAME")
+ } else {
+ hostname = public.FormatMX(hostname)
+ }
+
+ if err == nil {
+ v1DNSRecord := v1.DNSRecord{
+ Type: "A",
+ Host: hostname,
+ Value: serverIP,
+ Valid: true,
+ }
+
+ if ValidateARecord(v1DNSRecord) {
+ s = scheme + "://" + hostname
+ if withPort {
+ s += ":" + gconv.String(serverPort)
+ }
+ return
}
- return
}
- baseurl = scheme + "://" + hostname
+ s = scheme + "://" + serverIP
if withPort {
- baseurl += ":" + gconv.String(serverPort)
+ s += ":" + gconv.String(serverPort)
}
return
diff --git a/core/internal/service/domains/ssl.go b/core/internal/service/domains/ssl.go
index 86ad898e..6e83ac1c 100644
--- a/core/internal/service/domains/ssl.go
+++ b/core/internal/service/domains/ssl.go
@@ -97,7 +97,7 @@ func ApplyCertToService(domain, crtPem, keyPem string) (err error) {
return err
}
- UpdateBaseURL()
+ UpdateBaseURL(context.Background())
// Attempt apply the certificate to the console panel if domain is the console domain
rawurl := GetBaseURL()
diff --git a/core/internal/service/timers/timers.go b/core/internal/service/timers/timers.go
index 86d9bcf6..ea3596f7 100644
--- a/core/internal/service/timers/timers.go
+++ b/core/internal/service/timers/timers.go
@@ -45,8 +45,12 @@ func Start(ctx context.Context) (err error) {
})
// Start console panel baseurl update timer
- gtimer.AddOnce(5*time.Second, domains.UpdateBaseURL)
- gtimer.Add(5*time.Minute, domains.UpdateBaseURL)
+ gtimer.AddOnce(5*time.Second, func() {
+ domains.UpdateBaseURL(ctx)
+ })
+ gtimer.Add(5*time.Minute, func() {
+ domains.UpdateBaseURL(ctx)
+ })
g.Log().Debug(ctx, "Start timers complete")