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

consistent simpler parsing of domains in cli commands

Browse Source 
prompted by previous commit, making me look at dns.ParseDomain calls.
This commit is contained in:
Mechiel Lukkien 2025-02-23 11:34:51 +01:00
parent 151729af08
commit 3b224ea0c2
No known key found for this signature in database
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main.go
View File

@ -1952,11 +1952,8 @@ sharing most of its code.
c.Usage() c.Usage()
} }
ehloDomain, err := dns.ParseDomain(ehloHostname) ehloDomain := xparseDomain(ehloHostname, "ehlo host name")
xcheckf(err, "parsing ehlo hostname") origNextHop := xparseDomain(args[0], "domain")
origNextHop, err := dns.ParseDomain(args[0])
xcheckf(err, "parse domain")
ctxbg := context.Background() ctxbg := context.Background()
@ -1967,6 +1964,7 @@ sharing most of its code.
var hosts []dns.IPDomain var hosts []dns.IPDomain
if len(args) == 1 { if len(args) == 1 {
var permanent bool var permanent bool
var err error
haveMX, origNextHopAuthentic, expandedNextHopAuthentic, expandedNextHop, hosts, permanent, err = smtpclient.GatherDestinations(ctxbg, c.log.Logger, resolver, dns.IPDomain{Domain: origNextHop}) haveMX, origNextHopAuthentic, expandedNextHopAuthentic, expandedNextHop, hosts, permanent, err = smtpclient.GatherDestinations(ctxbg, c.log.Logger, resolver, dns.IPDomain{Domain: origNextHop})
status := "temporary" status := "temporary"
if permanent { if permanent {
@ -1996,10 +1994,7 @@ sharing most of its code.
} }
log.Printf("destinations: %s", strings.Join(l, ", ")) log.Printf("destinations: %s", strings.Join(l, ", "))
} else { } else {
d, err := dns.ParseDomain(args[1]) d := xparseDomain(args[1], "destination host")
if err != nil {
log.Fatalf("parsing destination host: %v", err)
}
log.Printf("skipping domain mx/cname lookups, assuming domain is dnssec-protected") log.Printf("skipping domain mx/cname lookups, assuming domain is dnssec-protected")
origNextHopAuthentic = true origNextHopAuthentic = true
@ -2538,8 +2533,7 @@ headers prepended.
} }
localpart, err := smtp.ParseLocalpart(p.Envelope.From[0].User) localpart, err := smtp.ParseLocalpart(p.Envelope.From[0].User)
xcheckf(err, "parsing localpart of address in from-header") xcheckf(err, "parsing localpart of address in from-header")
dom, err := dns.ParseDomain(p.Envelope.From[0].Host) dom := xparseDomain(p.Envelope.From[0].Host, "domain of address in from-header")
xcheckf(err, "parsing domain of address in from-header")
mustLoadConfig() mustLoadConfig()