URL: https://github.com/freeipa/freeipa/pull/836 Author: MartinBasti Title: #836: Only warn when specified server IP addresses don't match intf Action: opened
PR body: """ In containers local addresses differ from public addresses and we need a way to provide only public address to installers. https://pagure.io/freeipa/issue/2715 https://pagure.io/freeipa/issue/4317 """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/836/head:pr836 git checkout pr836
From dff7a4961a9cbc6f6625de4702e07b150b4561c4 Mon Sep 17 00:00:00 2001 From: Martin Basti <mba...@redhat.com> Date: Wed, 31 May 2017 15:50:05 +0200 Subject: [PATCH] Only warn when specified server IP addresses don't match intf In containers local addresses differ from public addresses and we need a way to provide only public address to installers. https://pagure.io/freeipa/issue/2715 https://pagure.io/freeipa/issue/4317 --- ipalib/install/hostname.py | 2 +- ipalib/util.py | 14 +++++++ ipapython/ipautil.py | 62 ++++++++++++++++-------------- ipaserver/install/dns.py | 1 + ipaserver/install/installutils.py | 2 +- ipaserver/install/server/install.py | 2 + ipaserver/install/server/replicainstall.py | 2 + 7 files changed, 55 insertions(+), 30 deletions(-) diff --git a/ipalib/install/hostname.py b/ipalib/install/hostname.py index ecc2963d15..25ac21e09c 100644 --- a/ipalib/install/hostname.py +++ b/ipalib/install/hostname.py @@ -34,7 +34,7 @@ class HostNameInstallInterface(service.ServiceInstallInterface): def ip_addresses(self, values): for value in values: try: - CheckedIPAddress(value, match_local=True) + CheckedIPAddress(value) except Exception as e: raise ValueError("invalid IP address {0}: {1}".format( value, e)) diff --git a/ipalib/util.py b/ipalib/util.py index 713fc107e9..1bd8495a49 100644 --- a/ipalib/util.py +++ b/ipalib/util.py @@ -1128,3 +1128,17 @@ def broadcast_ip_address_warning(addr_list): # print print("WARNING: IP address {} might be broadcast address".format( ip), file=sys.stderr) + + +def no_matching_interface_for_ip_address_warning(addr_list): + for ip in addr_list: + if not ip.get_matching_interface(): + root_logger.warning( + "No network interface matches the IP address %s", ip) + # fixme: once when loggers will be fixed, we can remove this + # print + print( + "WARNING: No network interface matches the IP address " + "{}".format(ip), + file=sys.stderr + ) diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py index 317fc225b7..a277ed8747 100644 --- a/ipapython/ipautil.py +++ b/ipapython/ipautil.py @@ -161,34 +161,7 @@ def __init__(self, addr, match_local=False, parse_netmask=True, raise ValueError("cannot use multicast IP address {}".format(addr)) if match_local: - if self.version == 4: - family = netifaces.AF_INET - elif self.version == 6: - family = netifaces.AF_INET6 - else: - raise ValueError( - "Unsupported address family ({})".format(self.version) - ) - - iface = None - for interface in netifaces.interfaces(): - for ifdata in netifaces.ifaddresses(interface).get(family, []): - - # link-local addresses contain '%suffix' that causes parse - # errors in IPNetwork - ifaddr = ifdata['addr'].split(u'%', 1)[0] - - ifnet = netaddr.IPNetwork('{addr}/{netmask}'.format( - addr=ifaddr, - netmask=ifdata['netmask'] - )) - if ifnet == self._net or ( - self._net is None and ifnet.ip == self): - self._net = ifnet - iface = interface - break - - if iface is None: + if not self.get_matching_interface(): raise ValueError('no network interface matches the IP address ' 'and netmask {}'.format(addr)) @@ -218,6 +191,39 @@ def is_network_addr(self): def is_broadcast_addr(self): return self.version == 4 and self == self._net.broadcast + def get_matching_interface(self): + """Find matching local interface for address + :return: Interface name or None if no interface has this address + """ + if self.version == 4: + family = netifaces.AF_INET + elif self.version == 6: + family = netifaces.AF_INET6 + else: + raise ValueError( + "Unsupported address family ({})".format(self.version) + ) + + iface = None + for interface in netifaces.interfaces(): + for ifdata in netifaces.ifaddresses(interface).get(family, []): + + # link-local addresses contain '%suffix' that causes parse + # errors in IPNetwork + ifaddr = ifdata['addr'].split(u'%', 1)[0] + + ifnet = netaddr.IPNetwork('{addr}/{netmask}'.format( + addr=ifaddr, + netmask=ifdata['netmask'] + )) + if ifnet == self._net or ( + self._net is None and ifnet.ip == self): + self._net = ifnet + iface = interface + break + + return iface + def valid_ip(addr): return netaddr.valid_ipv4(addr) or netaddr.valid_ipv6(addr) diff --git a/ipaserver/install/dns.py b/ipaserver/install/dns.py index 0dddf2a642..090b794936 100644 --- a/ipaserver/install/dns.py +++ b/ipaserver/install/dns.py @@ -266,6 +266,7 @@ def install_check(standalone, api, replica, options, hostname): util.network_ip_address_warning(ip_addresses) util.broadcast_ip_address_warning(ip_addresses) + util.no_matching_interface_for_ip_address_warning(ip_addresses) if not options.forward_policy: # user did not specify policy, derive it: default is 'first' but diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index d2283af204..eae6913750 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -585,7 +585,7 @@ def get_server_ip_address(host_name, unattended, setup_dns, ip_addresses): if len(hostaddr): for ha in hostaddr: try: - ips.append(ipautil.CheckedIPAddress(ha, match_local=True)) + ips.append(ipautil.CheckedIPAddress(ha, match_local=False)) except ValueError as e: root_logger.warning("Invalid IP address %s for %s: %s", ha, host_name, unicode(e)) diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index 9dcf903f45..7eb291e07c 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -29,6 +29,7 @@ validate_domain_name, network_ip_address_warning, broadcast_ip_address_warning, + no_matching_interface_for_ip_address_warning, ) import ipaclient.install.ntpconf from ipaserver.install import ( @@ -617,6 +618,7 @@ def install_check(installer): # check addresses here, dns module is doing own check network_ip_address_warning(ip_addresses) broadcast_ip_address_warning(ip_addresses) + no_matching_interface_for_ip_address_warning(ip_addresses) if options.setup_adtrust: adtrust.install_check(False, options, api) diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py index 20eaf98397..6620f0222f 100644 --- a/ipaserver/install/server/replicainstall.py +++ b/ipaserver/install/server/replicainstall.py @@ -35,6 +35,7 @@ from ipalib.util import ( network_ip_address_warning, broadcast_ip_address_warning, + no_matching_interface_for_ip_address_warning, ) from ipaclient.install.client import configure_krb5_conf, purge_host_keytab from ipaserver.install import ( @@ -1285,6 +1286,7 @@ def promote_check(installer): # check addresses here, dns module is doing own check network_ip_address_warning(config.ips) broadcast_ip_address_warning(config.ips) + no_matching_interface_for_ip_address_warning(config.ips) if options.setup_adtrust: adtrust.install_check(False, options, remote_api)
_______________________________________________ FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
