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
Optimized FormatMX() function, correct to query Hostname. Enhanced MX-Record query and validation.
Jackf19dc9ebcf3d
diff --git a/core/internal/service/domains/dns.go b/core/internal/service/domains/dns.goindex 38133714..4a86c550 100644--- a/core/internal/service/domains/dns.go+++ b/core/internal/service/domains/dns.go@@ -132,22 +132,28 @@ func ValidateMXRecord(record v1.DNSRecord, domain string, aRecordHosts ...stringdomain = strings.TrimSuffix(record.Host, ".") + "." + domain}- // Query MX records- mxRecords, err := net.LookupMX(domain)- if err != nil {- // g.Log().Error(context.Background(), "query mx record failed", err)- return false- }-- g.Log().Debug(context.Background(), "query mx record success", mxRecords)+ // Query A records for the domain+ domains := append([]string{domain}, aRecordHosts...)// Check if any MX record matches the expected valueaRecordHosts = append([]string{record.Value}, aRecordHosts...)- for _, mx := range mxRecords {- mxHost := strings.TrimSuffix(mx.Host, ".")- for _, aRecordHost := range aRecordHosts {- if aRecordHost == mxHost {- return true++ for _, d := range domains {+ // Query MX records+ mxRecords, err := net.LookupMX(d)+ if err != nil {+ // g.Log().Error(context.Background(), "query mx record failed", err)+ return false+ }++ g.Log().Debug(context.Background(), "query mx record success", mxRecords)++ for _, mx := range mxRecords {+ mxHost := strings.TrimSuffix(mx.Host, ".")+ for _, aRecordHost := range aRecordHosts {+ if aRecordHost == mxHost {+ return true+ }}}}diff --git a/core/internal/service/public/common.go b/core/internal/service/public/common.goindex 63884281..187457e2 100644--- a/core/internal/service/public/common.go+++ b/core/internal/service/public/common.go@@ -2656,7 +2656,7 @@ func AddUnsubscribeButton(content string) string {// FormatMX format the email domainfunc FormatMX(domain string) string {- val, err := g.DB().Model("domain").Where("domain", domain).Value("a_record")+ val, err := g.DB().Model("domain").Where("domain", domain).WhereOr("a_record", domain).Value("a_record")if err == nil && !val.IsEmpty() {return val.String()