IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use new API for auto-forwarders

Browse Source 
Auto-forwarders and manual configuration now use the new API to get a
list of DNS servers. Manual installer refuses loopback, too.

See: https://pagure.io/freeipa/issue/8275
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
This commit is contained in:
Christian Heimes
2020-09-22 13:32:45 +02:00
parent e64f27fdf8
commit 528c519cb5
2 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ipaserver/install/dns.py
View File

@@ -22,6 +22,7 @@ from ipalib import errors
from ipalib import util
from ipalib.install import hostname, sysrestore
from ipalib.install.service import enroll_only, prepare_only
from ipalib.install import dnsforwarders
from ipaplatform.paths import paths
from ipaplatform.constants import constants
from ipaplatform import services
@@ -290,7 +291,7 @@ def install_check(standalone, api, replica, options, hostname):
if not options.forwarders:
options.forwarders = []
if options.auto_forwarders:
options.forwarders += dnsutil.get_ipa_resolver().nameservers
options.forwarders.extend(dnsforwarders.get_nameservers())
elif standalone or not replica:
options.forwarders = read_dns_forwarders()

37
ipaserver/install/installutils.py
View File

@@ -53,8 +53,9 @@ from ipapython.certdb import EXTERNAL_CA_TRUST_FLAGS
from ipalib.constants import MAXHOSTNAMELEN
from ipalib.util import validate_hostname
from ipalib import api, errors, x509
from ipalib.install import dnsforwarders
from ipapython.dn import DN
from ipapython.dnsutil import resolve, get_ipa_resolver
from ipapython.dnsutil import resolve
from ipaserver.install import certs, service, sysupgrade
from ipaplatform import services
from ipaplatform.paths import paths
@@ -286,15 +287,28 @@ def read_ip_addresses():
def read_dns_forwarders():
addrs = []
if ipautil.user_input("Do you want to configure DNS forwarders?", True):
print(
"Following DNS servers are configured in /etc/resolv.conf: %s"
% ", ".join(get_ipa_resolver().nameservers)
)
if dnsforwarders.detect_resolve1_resolv_conf():
servers = [
str(s) for s in dnsforwarders.get_resolve1_nameservers()
]
print(
"The following DNS servers are configured in "
"systemd-resolved: %s" % ", ".join(servers)
)
else:
servers = [
str(s) for s in dnsforwarders.get_dnspython_nameservers()
]
print(
"Following DNS servers are configured in /etc/resolv.conf: "
"%s" % ", ".join(servers)
)
if ipautil.user_input("Do you want to configure these servers as DNS "
"forwarders?", True):
addrs = get_ipa_resolver().nameservers[:]
print("All DNS servers from /etc/resolv.conf were added. You can "
"enter additional addresses now:")
addrs = servers[:]
print("All detected DNS servers were added. You can enter "
"additional addresses now:")
while True:
ip = ipautil.user_input("Enter an IP address for a DNS forwarder, "
"or press Enter to skip", allow_empty=True)
@@ -307,11 +321,18 @@ def read_dns_forwarders():
print("DNS forwarder %s not added." % ip)
continue
if ip_parsed.is_loopback():
print("Error: %s is a loopback address" % ip)
print("DNS forwarder %s not added." % ip)
continue
print("DNS forwarder %s added. You may add another." % ip)
addrs.append(str(ip_parsed))
if not addrs:
print("No DNS forwarders configured")
else:
print("DNS forwarders: %s" % ", ".join(addrs))
return addrs