Skip to content

Commit

Permalink
Fix an issue when Secondary NS has multiple A records (mail-in-a-box#…
Browse files Browse the repository at this point in the history
…1633)

If a custom secondary NS server has multiple A records status_checks.py will fail with a timeout and Web UI won't load.
  • Loading branch information
Snacho authored and JoshData committed Aug 31, 2019
1 parent 295d481 commit 08021ea
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions management/status_checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -486,10 +486,12 @@ def check_dns_zone(domain, env, output, dns_zonefiles):
if custom_secondary_ns and not probably_external_dns:
for ns in custom_secondary_ns:
# We must first resolve the nameserver to an IP address so we can query it.
ns_ip = query_dns(ns, "A")
if not ns_ip:
ns_ips = query_dns(ns, "A")
if not ns_ips:
output.print_error("Secondary nameserver %s is not valid (it doesn't resolve to an IP address)." % ns)
continue
# Choose the first IP if nameserver returns multiple
ns_ip = ns_ips.split('; ')[0]

# Now query it to see what it says about this domain.
ip = query_dns(domain, "A", at=ns_ip, nxdomain=None)
Expand Down

0 comments on commit 08021ea

Please sign in to comment.