From 8327e11b6be6c675a2eb7b453a5e7fb68d0c12c2 Mon Sep 17 00:00:00 2001 From: Fraser Tweedale Date: Thu, 7 Mar 2019 15:58:41 +1100 Subject: [PATCH] cert-request: handle missing zone SAN IP address validation, while determining the zone for a DNS name or IP address, does not handle missing zones. The resulting dns.resolver.NoNameservers exception is not caught. As a result, InternalError is returned to client. Update cert-request IP address name validation to handle this case. Part of: https://pagure.io/freeipa/issue/7451 Reviewed-By: Alexander Bokovoy --- ipaserver/plugins/cert.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ipaserver/plugins/cert.py b/ipaserver/plugins/cert.py index 6d18787c9..a9a142b85 100644 --- a/ipaserver/plugins/cert.py +++ b/ipaserver/plugins/cert.py @@ -1173,8 +1173,12 @@ def _san_ip_update_reachable(reachable, dnsname, cname_depth): """ fqdn = dnsutil.DNSName(dnsname).make_absolute() - zone = dnsutil.DNSName(resolver.zone_for_name(fqdn)) + try: + zone = dnsutil.DNSName(resolver.zone_for_name(fqdn)) + except resolver.NoNameservers: + return # if there's no zone, there are no records name = fqdn.relativize(zone) + try: result = api.Command['dnsrecord_show'](zone, name)['result'] except errors.NotFound as nf: @@ -1203,10 +1207,12 @@ def _ip_ptr_records(ip): """ rname = dnsutil.DNSName(reversename.from_address(ip)) - zone = dnsutil.DNSName(resolver.zone_for_name(rname)) - name = rname.relativize(zone) try: + zone = dnsutil.DNSName(resolver.zone_for_name(rname)) + name = rname.relativize(zone) result = api.Command['dnsrecord_show'](zone, name)['result'] + except resolver.NoNameservers: + ptrs = set() # if there's no zone, there are no records except errors.NotFound: ptrs = set() else: