saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Rewrite dns_check to try to connect to address

Browse source
This commit is contained in:
Ivan Babrou 2017-02-09 11:58:08 -08:00
parent 55965ce505
commit 29f376676d
No known key found for this signature in database
GPG key ID: DBF6C142408CB4F0
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/minion.py
View file

@ -149,7 +149,7 @@ def resolve_dns(opts, fallback=True):
if opts['master'] == '':
raise SaltSystemExit
ret['master_ip'] = \
salt.utils.dns_check(opts['master'], True, opts['ipv6'])
salt.utils.dns_check(opts['master'], opts['master_port'], True, opts['ipv6'])
except SaltClientError:
if opts['retry_dns']:
while True:
@ -163,7 +163,7 @@ def resolve_dns(opts, fallback=True):
time.sleep(opts['retry_dns'])
try:
ret['master_ip'] = salt.utils.dns_check(
opts['master'], True, opts['ipv6']
opts['master'], opts['master_port'], True, opts['ipv6']
)
break
except SaltClientError:

33
salt/utils/__init__.py
View file

@ -716,25 +716,13 @@ def ip_bracket(addr):
return addr
def dns_check(addr, safe=False, ipv6=None):
def dns_check(addr, port, safe=False, ipv6=None):
'''
Return the ip resolved by dns, but do not exit on failure, only raise an
exception. Obeys system preference for IPv4/6 address resolution.
Tries to connect to the address before considering it useful.
'''
error = False
# Detect IPv6 support if it is not forced by trying to connect
# to the give address over IPv6.
if ipv6 is None:
s = socket.socket(socket.AF_INET6, socket.SOCK_DGRAM)
try:
s.connect((addr, 0))
s.close()
ipv6 = True
except:
ipv6 = False
try:
# issue #21397: force glibc to re-read resolv.conf
if HAS_RESINIT:
@ -747,9 +735,22 @@ def dns_check(addr, safe=False, ipv6=None):
else:
addr = False
for h in hostnames:
if h[0] == socket.AF_INET or (h[0] == socket.AF_INET6 and ipv6):
addr = ip_bracket(h[4][0])
if h[0] == socket.AF_INET and ipv6 is True:
continue
if h[0] == socket.AF_INET6 and ipv6 is False:
continue
candidate_addr = ip_bracket(h[4][0])
s = socket.socket(h[0], socket.SOCK_DGRAM)
try:
s.connect((candidate_addr.strip('[]'), port))
s.close()
addr = candidate_addr
break
except:
pass
if not addr:
error = True
except TypeError: