mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Move IP address resolution from ipaserver.install.installutils to ipapython.dnsutil
This is to make it reusable from other modules and to avoid future code duplication. https://fedorahosted.org/freeipa/ticket/5710 Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
committed by
Martin Basti
parent
ec49130b94
commit
dc405005f5
@@ -55,6 +55,7 @@ from ipaserver.install import certs, service, sysupgrade
|
||||
from ipaplatform import services
|
||||
from ipaplatform.paths import paths
|
||||
from ipaplatform.tasks import tasks
|
||||
from ipapython import dnsutil
|
||||
|
||||
if six.PY3:
|
||||
unicode = str
|
||||
@@ -444,24 +445,6 @@ def create_keytab(path, principal):
|
||||
|
||||
kadmin("ktadd -k " + path + " " + principal)
|
||||
|
||||
def resolve_host(host_name):
|
||||
try:
|
||||
addrinfos = socket.getaddrinfo(host_name, None,
|
||||
socket.AF_UNSPEC, socket.SOCK_STREAM)
|
||||
|
||||
ip_list = []
|
||||
|
||||
for ai in addrinfos:
|
||||
ip = ai[4][0]
|
||||
if ip == "127.0.0.1" or ip == "::1":
|
||||
raise HostnameLocalhost("The hostname resolves to the localhost address")
|
||||
|
||||
ip_list.append(ip)
|
||||
|
||||
return ip_list
|
||||
except socket.error:
|
||||
return []
|
||||
|
||||
def get_host_name(no_host_dns):
|
||||
"""
|
||||
Get the current FQDN from the socket and verify that it is valid.
|
||||
@@ -477,9 +460,10 @@ def get_host_name(no_host_dns):
|
||||
|
||||
def get_server_ip_address(host_name, unattended, setup_dns, ip_addresses):
|
||||
# Check we have a public IP that is associated with the hostname
|
||||
try:
|
||||
hostaddr = resolve_host(host_name)
|
||||
except HostnameLocalhost:
|
||||
hostaddr = dnsutil.resolve_ip_addresses(host_name)
|
||||
if hostaddr.intersection(
|
||||
{ipautil.CheckedIPAddress(ip, allow_loopback=True)
|
||||
for ip in ['127.0.0.1', '::1']}):
|
||||
print("The hostname resolves to the localhost address (127.0.0.1/::1)", file=sys.stderr)
|
||||
print("Please change your /etc/hosts file so that the hostname", file=sys.stderr)
|
||||
print("resolves to the ip address of your network interface.", file=sys.stderr)
|
||||
|
||||
Reference in New Issue
Block a user