diff options
author | Petr Spacek <pspacek@redhat.com> | 2016-06-30 20:41:48 +0200 |
---|---|---|
committer | Martin Basti <mbasti@redhat.com> | 2016-07-01 10:35:39 +0200 |
commit | 5e78b54d7c532bec0ee5a4ce3f1b6d6c94d17c51 (patch) | |
tree | 13fd82fb19f99817eb20495e605c1dbfaa0c8196 /ipapython/dnsutil.py | |
parent | ce1f9ca51bd91ed66233c1bac7eb05fac9c855c7 (diff) | |
download | freeipa-5e78b54d7c532bec0ee5a4ce3f1b6d6c94d17c51.tar.gz freeipa-5e78b54d7c532bec0ee5a4ce3f1b6d6c94d17c51.tar.xz freeipa-5e78b54d7c532bec0ee5a4ce3f1b6d6c94d17c51.zip |
Fix internal errors in host-add and other commands caused by DNS resolution
Previously resolver was returning CheckedIPAddress objects. This
internal server error in cases where DNS actually returned reserved IP
addresses.
Now the resolver is returning UnsafeIPAddress objects which do syntactic
checks but do not filter IP addresses.
From now on we can decide if some IP address should be accepted as-is or
if it needs to be contrained to some subset of IP addresses using
CheckedIPAddress class.
This regression was caused by changes for
https://fedorahosted.org/freeipa/ticket/5710
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipapython/dnsutil.py')
-rw-r--r-- | ipapython/dnsutil.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/ipapython/dnsutil.py b/ipapython/dnsutil.py index aca506120..16549c8f6 100644 --- a/ipapython/dnsutil.py +++ b/ipapython/dnsutil.py @@ -24,7 +24,7 @@ import copy import six -from ipapython.ipautil import CheckedIPAddress +from ipapython.ipautil import UnsafeIPAddress from ipapython.ipa_log_manager import root_logger if six.PY3: @@ -323,18 +323,12 @@ def resolve_rrsets(fqdn, rdtypes): def resolve_ip_addresses(fqdn): """Get IP addresses from DNS A/AAAA records for given host (using DNS). :returns: - list of IP addresses as CheckedIPAddress objects + list of IP addresses as UnsafeIPAddress objects """ rrsets = resolve_rrsets(fqdn, ['A', 'AAAA']) ip_addresses = set() for rrset in rrsets: - ip_addresses.update({CheckedIPAddress(ip, # accept whatever is in DNS - parse_netmask=False, - allow_network=True, - allow_loopback=True, - allow_broadcast=True, - allow_multicast=True) - for ip in rrset}) + ip_addresses.update({UnsafeIPAddress(ip) for ip in rrset}) return ip_addresses |