Fix some minor resolver issues

Fix https://dutch-internet-standards-platform.sentry.io/issues/6566687418/
Fix https://dutch-internet-standards-platform.sentry.io/issues/6579040048/

Author: mxsasha

checks/caa/retrieval.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass, field, InitVar
 from typing import Optional, Iterable
 
+import dns
 from dns.rdtypes.ANY.CAA import CAA
 from dns.resolver import NoAnswer, NXDOMAIN, LifetimeTimeout, NoNameservers
 
@@ -57,7 +58,7 @@ def retrieve_parse_caa(target_domain: str) -> CAAEvaluation:
     """
     try:
         canonical_name, rrset = dns_resolve_caa(target_domain)
-    except (NoAnswer, NXDOMAIN, LifetimeTimeout, NoNameservers):
+    except (NoNameservers, NoAnswer, NXDOMAIN, LifetimeTimeout, dns.name.EmptyLabel):
         return CAAEvaluation(caa_found=False)
 
     return CAAEvaluation(caa_found=True, canonical_name=canonical_name, caa_records=rrset)

checks/tasks/dnssec.py

@@ -3,14 +3,15 @@
 import sys
 from collections import OrderedDict
 
+import dns
 import pythonwhois
 from celery import shared_task
 from celery.exceptions import SoftTimeLimitExceeded
 from django.conf import settings
 from django.core.cache import cache
 from django.db import transaction
 
-from dns.resolver import NoNameservers
+from dns.resolver import NoNameservers, LifetimeTimeout, NoAnswer
 
 from checks import categories, scoring
 from checks.models import DnssecStatus, DomainTestDnssec, MailTestDnssec, MxStatus
@@ -372,7 +373,7 @@ def dnssec_status(domain, mx_status, score_secure, score_insecure, score_bogus,
         log.info(f"requesting SOA for {domain=} with {mx_status=}")
         answer_dnssec_status = dns_resolve_soa(domain, raise_on_no_answer=False)
         status, score = status_mapping[answer_dnssec_status]
-    except NoNameservers:
+    except (NoNameservers, NoAnswer, NoNameservers, LifetimeTimeout, dns.name.EmptyLabel):
         status = DnssecStatus.dnserror.value
         score = score_error
 

checks/tasks/ipv6.py

@@ -13,7 +13,7 @@
 from django.core.cache import cache
 from django.db import transaction
 import dns
-from dns.resolver import NoAnswer, NXDOMAIN, LifetimeTimeout
+from dns.resolver import NoAnswer, NXDOMAIN, LifetimeTimeout, NoNameservers
 
 from checks import categories, scoring
 from checks.http_client import http_get_af, response_content_chunk
@@ -354,14 +354,14 @@ def get_domain_results(
     """
     try:
         v6 = dns_resolve_aaaa(domain)
-    except (NoAnswer, NXDOMAIN, LifetimeTimeout, dns.name.EmptyLabel):
+    except (NoNameservers, NoAnswer, NXDOMAIN, LifetimeTimeout, dns.name.EmptyLabel):
         v6 = []
     v6 = remove_ipv4_mapped_v6(v6)
     log.debug("V6 resolve: %s" % v6)
     v6_good, v6_bad, v6_ports = test_connectivity(v6, socket.AF_INET6, sock_type, ports, is_ns, test_domain)
     try:
         v4 = dns_resolve_a(domain)
-    except (NoAnswer, NXDOMAIN, LifetimeTimeout, dns.name.EmptyLabel):
+    except (NoNameservers, NoAnswer, NXDOMAIN, LifetimeTimeout, dns.name.EmptyLabel):
         v4 = []
     log.debug("V4 resolve: %s" % v4)
     v4_good, v4_bad, v4_ports = test_connectivity(v4, socket.AF_INET, sock_type, ports, is_ns, test_domain)

checks/tasks/shared.py

@@ -184,13 +184,13 @@ def do_resolve_single_a_aaaa(qname):
     af_ip_pairs = []
     try:
         ip4 = dns_resolve_a(qname)
-    except (NoAnswer, NXDOMAIN, LifetimeTimeout, dns.name.EmptyLabel):
+    except (NoNameservers, NoAnswer, NXDOMAIN, LifetimeTimeout, dns.name.EmptyLabel):
         ip4 = []
     if len(ip4) > 0:
         af_ip_pairs.append((socket.AF_INET, ip4[0]))
     try:
         ip6 = dns_resolve_aaaa(qname)
-    except (NoAnswer, NXDOMAIN, LifetimeTimeout, dns.name.EmptyLabel):
+    except (NoNameservers, NoAnswer, NXDOMAIN, LifetimeTimeout, dns.name.EmptyLabel):
         ip6 = []
     if len(ip6) > 0:
         af_ip_pairs.append((socket.AF_INET6, ip6[0]))
@@ -202,13 +202,13 @@ def do_resolve_all_a_aaaa(qname):
     af_ip_pairs = []
     try:
         ip4 = dns_resolve_a(qname)
-    except (NoAnswer, NXDOMAIN, LifetimeTimeout, dns.name.EmptyLabel):
+    except (NoNameservers, NoAnswer, NXDOMAIN, LifetimeTimeout, dns.name.EmptyLabel):
         ip4 = []
     for ip in ip4:
         af_ip_pairs.append((socket.AF_INET, ip))
     try:
         ip6 = dns_resolve_aaaa(qname)
-    except (NoAnswer, NXDOMAIN, LifetimeTimeout, dns.name.EmptyLabel):
+    except (NoNameservers, NoAnswer, NXDOMAIN, LifetimeTimeout, dns.name.EmptyLabel):
         ip6 = []
     for ip in ip6:
         af_ip_pairs.append((socket.AF_INET6, ip))
@@ -238,13 +238,13 @@ def do_resolve_ns(qname: str) -> tuple[list[str], str]:
     """
     try:
         ns_list = dns_resolve_ns(qname)
-    except (NoAnswer, NXDOMAIN, LifetimeTimeout, dns.name.EmptyLabel):
+    except (NoNameservers, NoAnswer, NXDOMAIN, LifetimeTimeout, dns.name.EmptyLabel):
         ns_list = []
     next_label = qname
     while not ns_list and "." in next_label:
         try:
             ns_list = dns_resolve_ns(next_label)
-        except (NoAnswer, NXDOMAIN, LifetimeTimeout, dns.name.EmptyLabel):
+        except (NoNameservers, NoAnswer, NXDOMAIN, LifetimeTimeout, dns.name.EmptyLabel):
             ns_list = []
         next_label = next_label[next_label.find(".") + 1 :]
 
@@ -276,7 +276,7 @@ def resolve_dane(port, dname, check_nxdomain=False):
             data = [(rr.usage, rr.selector, rr.mtype, binascii.hexlify(rr.cert).decode("ascii")) for rr in rrset]
     except NXDOMAIN:
         return {"nxdomain": True}
-    except (NoAnswer, NoNameservers, LifetimeTimeout, dns.name.EmptyLabel):
+    except (NoNameservers, NoAnswer, NoNameservers, LifetimeTimeout, dns.name.EmptyLabel):
         data = None
         dnssec_status = None
     return {

interface/views/shared.py

@@ -5,6 +5,7 @@
 from datetime import datetime
 from urllib.parse import urlparse
 
+import dns
 import idna
 import yaml
 from celery import shared_task
@@ -18,7 +19,7 @@
 from django.utils.http import url_has_allowed_host_and_scheme
 from django.utils.translation import gettext as _
 from dns.rdatatype import RdataType
-from dns.resolver import NXDOMAIN, NoAnswer
+from dns.resolver import NXDOMAIN, NoAnswer, LifetimeTimeout, NoNameservers
 from dns.exception import Timeout
 
 from checks.resolver import dns_resolve, dns_resolve_soa
@@ -273,7 +274,7 @@ def get_valid_domain_web(dname, timeout=5):
         try:
             dns_resolve(dname, qtype)
             return dname
-        except (NoAnswer, NXDOMAIN, Timeout):
+        except (NoNameservers, NoAnswer, NXDOMAIN, LifetimeTimeout, dns.name.EmptyLabel):
             pass
     log.debug(f"{dname}: Could not retrieve A/AAAA record")
     return None