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
Enhance the local IP retrieval function to make it work fine in the intranet.
Jackcab3a4e552c8
diff --git a/core/internal/service/domains/baseurl.go b/core/internal/service/domains/baseurl.goindex e053c505..64d84a48 100644--- a/core/internal/service/domains/baseurl.go+++ b/core/internal/service/domains/baseurl.go@@ -69,17 +69,18 @@ func UpdateBaseURL(ctx context.Context, domain ...string) {go func() {defer wg.Done()baseurl = buildBaseURL("")+ g.Log().Debug(ctx, "UpdateBaseURL --> Base URL updated:", baseurl)}()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)url := buildBaseURL(domain)baseurlMapMu.Lock()baseurlMap[domain] = urlbaseurlMapMu.Unlock()+ g.Log().Debug(ctx, "UpdateBaseURL --> Updating base URL for domain:", domain, " URL:", url)}(d)}diff --git a/core/internal/service/public/common.go b/core/internal/service/public/common.goindex 0f379a2a..c341f5a9 100644--- a/core/internal/service/public/common.go+++ b/core/internal/service/public/common.go@@ -2149,11 +2149,37 @@ func GetLocalIP() (string, error) {return "", err}+ localIp := ""+for _, addr := range addrs {if ipNet, ok := addr.(*net.IPNet); ok && !ipNet.IP.IsLoopback() && ipNet.IP.To4() != nil {- return ipNet.IP.String(), nil+ localIp = ipNet.IP.String()+ break+ }+ }++ if strings.HasPrefix(localIp, "172.") {+ dk, err := docker.NewDockerAPI()++ if err == nil {+ defer dk.Close()+ // If the local IP starts with 172., it may be a Docker container, so we try to get the host's IP+ res, err := dk.ExecHostShellCommand(context.Background(), "ip addr | grep -E -o '[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}' | grep -E -v \"^127\\.|^255\\.|^0\\.\" | head -n 1")++ if err == nil && res != nil {+ res.Output = SanitizeIPChars(res.Output)++ if IsIpAddr(res.Output) {+ localIp = res.Output+ }+ }}}++ if localIp != "" {+ return localIp, nil+ }+return "", errors.New("local IP not found")}@@ -2586,6 +2612,19 @@ func SanitizeUTF8(s string) string {return string(result)}+// SanitizeIPChars clean up invalid IPv4 characters in a string+func SanitizeIPChars(s string) string {+ // substitute invalid UTF-8 characters with a replacement character+ result := make([]rune, 0, len(s))+ for _, r := range s {+ if (r >= '0' && r <= '9') || (r >= 'a' && r <= 'z') || r == '.' || r == ':' {+ result = append(result, r)+ }+ }++ return string(result)+}+func AddUnsubscribeButton(content string) string {// Unsubscribe button HTMLunsubscribeButton := `<div style="padding: 16px 0; text-align: center"><a href="{{ UnsubscribeURL . }}" style="color: #ccc; font-size: 12px">Unsubscribe</a></div>`