serv/mox
1
0
Fork 0
mirror of https://github.com/mjl-/mox.git synced 2024-12-25 16:03:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

do not try to get a tls cert for autoconfig.<domain> at startup if there is no listener with autoconfig enabled

Browse source 
reduces needless logging in setups that don't use autoconfig.
This commit is contained in:
Mechiel Lukkien 2024-12-07 20:28:52 +01:00
parent cbe418ec59
commit 35af7e30a6
No known key found for this signature in database
1 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
http/web.go
View file

@ -821,32 +821,38 @@ func portServes(l config.Listener) map[int]*serve {
} }
if l.TLS != nil && l.TLS.ACME != "" { if l.TLS != nil && l.TLS.ACME != "" {
hosts := map[dns.Domain]struct{}{ m := mox.Conf.Static.ACME[l.TLS.ACME].Manager
mox.Conf.Static.HostnameDomain: {}, if ensureManagerHosts[m] == nil {
ensureManagerHosts[m] = map[dns.Domain]struct{}{}
} }
hosts := ensureManagerHosts[m]
hosts[mox.Conf.Static.HostnameDomain] = struct{}{}
if l.HostnameDomain.ASCII != "" { if l.HostnameDomain.ASCII != "" {
hosts[l.HostnameDomain] = struct{}{} hosts[l.HostnameDomain] = struct{}{}
} }
// All domains are served on all listeners. Gather autoconfig hostnames to ensure
// presence of TLS certificates for.
for _, name := range mox.Conf.Domains() {
if dom, err := dns.ParseDomain(name); err != nil {
pkglog.Errorx("parsing domain from config", err)
} else if d, _ := mox.Conf.Domain(dom); d.ReportsOnly {
// Do not gather autoconfig name if we aren't accepting email for this domain.
continue
}
autoconfdom, err := dns.ParseDomain("autoconfig." + name) // All domains are served on all listeners. Gather autoconfig hostnames to ensure
if err != nil { // presence of TLS certificates. Fetching a certificate on-demand may be too slow
pkglog.Errorx("parsing domain from config for autoconfig", err) // for the timeouts of clients doing autoconfig.
} else {
hosts[autoconfdom] = struct{}{} if l.AutoconfigHTTPS.Enabled && !l.AutoconfigHTTPS.NonTLS {
for _, name := range mox.Conf.Domains() {
if dom, err := dns.ParseDomain(name); err != nil {
pkglog.Errorx("parsing domain from config", err)
} else if d, _ := mox.Conf.Domain(dom); d.ReportsOnly {
// Do not gather autoconfig name if we aren't accepting email for this domain.
continue
}
autoconfdom, err := dns.ParseDomain("autoconfig." + name)
if err != nil {
pkglog.Errorx("parsing domain from config for autoconfig", err)
} else {
hosts[autoconfdom] = struct{}{}
}
} }
} }
m := mox.Conf.Static.ACME[l.TLS.ACME].Manager
ensureManagerHosts[m] = hosts
} }
for _, srv := range portServe { for _, srv := range portServe {