external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-12-24 07:37:04 +00:00
Code Issues Releases Wiki Activity

make dns resolver retrying explicit

Browse Source
This commit is contained in:
github@kiekerjan.isdronken.nl 2022-04-18 21:40:20 +02:00
parent 1b0f7991db
commit aaa7702d9d
2 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
management/dns_update.py
View File

@ -1087,7 +1087,7 @@ def get_secondary_dns(custom_dns, mode=None):
response = resolver.resolve(hostname+'.', "A", raise_on_no_answer=False) response = resolver.resolve(hostname+'.', "A", raise_on_no_answer=False)
values.extend(map(str, response)) values.extend(map(str, response))
except dns.exception.DNSException: except dns.exception.DNSException:
logging.debug("Secondary dns Alookup exception %s", hostname) logging.debug("Secondary dns A lookup exception %s", hostname)
try: try:
response = resolver.resolve(hostname+'.', "AAAA", raise_on_no_answer=False) response = resolver.resolve(hostname+'.', "AAAA", raise_on_no_answer=False)
@ -1110,35 +1110,33 @@ def set_secondary_dns(hostnames, env):
if len(hostnames) > 0: if len(hostnames) > 0:
# Validate that all hostnames are valid and that all zone-xfer IP addresses are valid. # Validate that all hostnames are valid and that all zone-xfer IP addresses are valid.
resolver = dns.resolver.get_default_resolver() resolver = dns.resolver.get_default_resolver()
resolver.timeout = 3 resolver.timeout = 5
resolver.lifetime = 3 resolver.lifetime = 5
for item in hostnames: for item in hostnames:
if not item.startswith("xfr:"): if not item.startswith("xfr:"):
# Resolve hostname. # Resolve hostname.
tries = 2
while tries > 0:
tries = tries - 1
try: try:
response = resolver.resolve(item, "A") response = resolver.resolve(item, "A")
tries = 0
except (dns.resolver.NoNameservers, dns.resolver.NXDOMAIN, dns.resolver.NoAnswer): except (dns.resolver.NoNameservers, dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
logging.debug('Error on resolving ipv4 address, trying ipv6') logging.debug('Error on resolving ipv4 address, trying ipv6')
try: try:
response = resolver.resolve(item, "AAAA") response = resolver.resolve(item, "AAAA")
tries = 0
except (dns.resolver.NoNameservers, dns.resolver.NXDOMAIN, dns.resolver.NoAnswer): except (dns.resolver.NoNameservers, dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
raise ValueError("Could not resolve the IP address of %s." % item) raise ValueError("Could not resolve the IP address of %s." % item)
except (dns.resolver.Timeout): except (dns.resolver.Timeout):
resolver.timeout = 5 logging.debug('Timeout on resolving ipv6 address')
resolver.lifetime = 5 if tries < 1:
logging.debug('Timeout on resolving ipv4 address re-trying') raise ValueError("Could not resolve the IP address of %s due to timeout." % item)
try: except (dns.resolver.Timeout):
response = resolver.resolve(item, "A") logging.debug('Timeout on resolving ipv4 address')
except (dns.resolver.NoNameservers, dns.resolver.NXDOMAIN, dns.resolver.NoAnswer): if tries < 1:
logging.debug('Error on resolving ipv4 address, trying ipv6 (2)')
try:
response = resolver.resolve(item, "AAAA")
except (dns.resolver.NoNameservers, dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
raise ValueError("Could not resolve the IP address of %s." % item)
except (dns.resolver.Timeout):
raise ValueError("Could not resolve the IP address of %s due to timeout." % item) raise ValueError("Could not resolve the IP address of %s due to timeout." % item)
resolver.timeout = 3
resolver.lifetime = 3
else: else:
# Validate IP address. # Validate IP address.
try: try:

25
management/status_checks.py
View File

@ -801,30 +801,25 @@ def query_dns(qname, rtype, nxdomain='[Not Set]', at=None, as_list=False):
resolver.nameservers = [at] resolver.nameservers = [at]
# Set a timeout so that a non-responsive server doesn't hold us back. # Set a timeout so that a non-responsive server doesn't hold us back.
resolver.timeout = 3
resolver.lifetime = 3
# Do the query.
try:
response = resolver.resolve(qname, rtype, search=True)
except (dns.resolver.NoNameservers, dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
# Host did not have an answer for this query; not sure what the
# difference is between the two exceptions.
logging.debug("No result for dns lookup %s, %s", qname, rtype)
return nxdomain
except dns.exception.Timeout:
logging.debug("Timeout on dns lookup %s, %s. Retrying", qname, rtype)
resolver.timeout = 5 resolver.timeout = 5
resolver.lifetime = 5 resolver.lifetime = 5
tries = 2
# Do the query.
while tries > 0:
tries = tries - 1
try: try:
response = resolver.resolve(qname, rtype, search=True) response = resolver.resolve(qname, rtype, search=True)
tries = 0
except (dns.resolver.NoNameservers, dns.resolver.NXDOMAIN, dns.resolver.NoAnswer): except (dns.resolver.NoNameservers, dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
# Host did not have an answer for this query; not sure what the # Host did not have an answer for this query; not sure what the
# difference is between the two exceptions. # difference is between the two exceptions.
logging.debug("No result for dns lookup %s, %s (2)", qname, rtype) logging.debug("No result for dns lookup %s, %s (%d)", qname, rtype, tries)
if tries < 1:
return nxdomain return nxdomain
except dns.exception.Timeout: except dns.exception.Timeout:
logging.debug("Timeout on dns lookup %s, %s.", qname, rtype) logging.debug("Timeout on dns lookup %s, %s (%d)", qname, rtype, tries)
if tries < 1:
return "[timeout]" return "[timeout]"
# Normalize IP addresses. IP address --- especially IPv6 addresses --- can # Normalize IP addresses. IP address --- especially IPv6 addresses --- can