infrastructure/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2025-06-28 08:18:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

in domain/dns self-check, for unused services, check that port is 0 like how we told users to configure it and fix checking for errors during srv lookups

Browse Source
This commit is contained in:
Mechiel Lukkien 2025-02-16 17:42:24 +01:00
parent 1c4bf8909c
commit 9dff879164
No known key found for this signature in database
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
webadmin/admin.go
View File

@ -462,8 +462,8 @@ func unptr[T any](l []*T) []T {
func checkDomain(ctx context.Context, resolver dns.Resolver, dialer *net.Dialer, domainName string) (r CheckResult) { func checkDomain(ctx context.Context, resolver dns.Resolver, dialer *net.Dialer, domainName string) (r CheckResult) {
log := pkglog.WithContext(ctx) log := pkglog.WithContext(ctx)
domain, err := dns.ParseDomain(domainName) domain, xerr := dns.ParseDomain(domainName)
xcheckuserf(ctx, err, "parsing domain") xcheckuserf(ctx, xerr, "parsing domain")
domConf, ok := mox.Conf.Domain(domain) domConf, ok := mox.Conf.Domain(domain)
if !ok { if !ok {
@ -1416,6 +1416,13 @@ When enabling MTA-STS, or updating a policy, always update the policy first (thr
{name: "_pop3", port: 110, host: "."}, {name: "_pop3", port: 110, host: "."},
{name: "_pop3s", port: 995, host: "."}, {name: "_pop3s", port: 995, host: "."},
} }
// Host "." indicates the service is not available. We suggested in the DNS records
// that the port be set to 0, so check for that. ../rfc/6186:242
for i := range reqs {
if reqs[i].host == "." {
reqs[i].port = 0
}
}
var srvwg sync.WaitGroup var srvwg sync.WaitGroup
srvwg.Add(len(reqs)) srvwg.Add(len(reqs))
for i := range reqs { for i := range reqs {
@ -1436,8 +1443,8 @@ When enabling MTA-STS, or updating a policy, always update the policy first (thr
} }
instr += fmt.Sprintf("\t%s._tcp.%-*s SRV 0 %d %d %s\n", req.name, len("_submissions")-len(req.name)+len(domain.ASCII+"."), domain.ASCII+".", weight, req.port, req.host) instr += fmt.Sprintf("\t%s._tcp.%-*s SRV 0 %d %d %s\n", req.name, len("_submissions")-len(req.name)+len(domain.ASCII+"."), domain.ASCII+".", weight, req.port, req.host)
r.SRVConf.SRVs[req.name] = unptr(req.srvs) r.SRVConf.SRVs[req.name] = unptr(req.srvs)
if err != nil { if req.err != nil {
addf(&r.SRVConf.Errors, "Looking up SRV record %q: %s", name, err) addf(&r.SRVConf.Errors, "Looking up SRV record %q: %s", name, req.err)
} else if len(req.srvs) == 0 { } else if len(req.srvs) == 0 {
if req.host == "." { if req.host == "." {
addf(&r.SRVConf.Warnings, "Missing optional SRV record %q", name) addf(&r.SRVConf.Warnings, "Missing optional SRV record %q", name)