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

during dnscheck, if srv accountconfig record with just a dot, for a non-existent service, is missing, show as warning instead of error

Browse source 
the suggested dns records mention that these records are optional, but the
dnscheck makes it look serious. not helpful.

also remove unneeded whitespace in list of errors/warnings.

for issue #184 by morki, thanks for reporting!
This commit is contained in:
Mechiel Lukkien 2024-06-27 15:06:41 +02:00
parent beee03574a
commit e350af7eed
No known key found for this signature in database
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
webadmin/admin.go
View file

@ -1404,7 +1404,11 @@ When enabling MTA-STS, or updating a policy, always update the policy first (thr
if err != nil { if 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, err)
} else if len(req.srvs) == 0 { } else if len(req.srvs) == 0 {
addf(&r.SRVConf.Errors, "Missing SRV record %q", name) if req.host == "." {
addf(&r.SRVConf.Warnings, "Missing optional SRV record %q", name)
} else {
addf(&r.SRVConf.Errors, "Missing SRV record %q", name)
}
} else if len(req.srvs) != 1 || req.srvs[0].Target != req.host || req.srvs[0].Port != req.port { } else if len(req.srvs) != 1 || req.srvs[0].Target != req.host || req.srvs[0].Port != req.port {
addf(&r.SRVConf.Errors, "Unexpected SRV record(s) for %q", name) addf(&r.SRVConf.Errors, "Unexpected SRV record(s) for %q", name)
} }

4
webadmin/admin.js
View file

@ -2592,8 +2592,8 @@ const domainDNSCheck = async (d) => {
if ((r.Errors || []).length === 0 && (r.Warnings || []).length === 0) { if ((r.Errors || []).length === 0 && (r.Warnings || []).length === 0) {
success = box(green, 'OK'); success = box(green, 'OK');
} }
const errors = (r.Errors || []).length === 0 ? [] : box(red, dom.ul(style({ marginLeft: '1em' }), (r.Errors || []).map(s => dom.li(s)))); const errors = (r.Errors || []).length === 0 ? [] : box(red, dom.ul((r.Errors || []).map(s => dom.li(s))));
const warnings = (r.Warnings || []).length === 0 ? [] : box(yellow, dom.ul(style({ marginLeft: '1em' }), (r.Warnings || []).map(s => dom.li(s)))); const warnings = (r.Warnings || []).length === 0 ? [] : box(yellow, dom.ul((r.Warnings || []).map(s => dom.li(s))));
let instructions = null; let instructions = null;
if (r.Instructions && r.Instructions.length > 0) { if (r.Instructions && r.Instructions.length > 0) {
instructions = dom.div(style({ margin: '.5ex 0' })); instructions = dom.div(style({ margin: '.5ex 0' }));

4
webadmin/admin.ts
View file

@ -1928,8 +1928,8 @@ const domainDNSCheck = async (d: string) => {
if ((r.Errors || []).length === 0 && (r.Warnings || []).length === 0) { if ((r.Errors || []).length === 0 && (r.Warnings || []).length === 0) {
success = box(green, 'OK') success = box(green, 'OK')
} }
const errors = (r.Errors || []).length === 0 ? [] : box(red, dom.ul(style({marginLeft: '1em'}), (r.Errors || []).map(s => dom.li(s)))) const errors = (r.Errors || []).length === 0 ? [] : box(red, dom.ul((r.Errors || []).map(s => dom.li(s))))
const warnings = (r.Warnings || []).length === 0 ? [] : box(yellow, dom.ul(style({marginLeft: '1em'}), (r.Warnings || []).map(s => dom.li(s)))) const warnings = (r.Warnings || []).length === 0 ? [] : box(yellow, dom.ul((r.Warnings || []).map(s => dom.li(s))))
let instructions: HTMLElement | null = null let instructions: HTMLElement | null = null
if (r.Instructions && r.Instructions.length > 0) { if (r.Instructions && r.Instructions.length > 0) {