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

fix parse_host_port() bad exception on hostname only arg

Browse source
This commit is contained in:
Jeremy McMillan 2018-12-31 16:10:32 -06:00 • committed by Pedro Algarvio
parent 194a024ed0
commit 1417528f57
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/utils/network.py
View file

@ -1941,6 +1941,8 @@ def parse_host_port(host_port):
- 10.11.12.13:4567
- 10.11.12.13
'''
host, port = None, None # default
_s_ = host_port[:]
if _s_[0] == '[':
if ']' in host_port[0]:
@ -1953,9 +1955,10 @@ def parse_host_port(host_port):
host = ipaddress.ipv6IPv6Address(host)
else:
if _s_.count(':') == 1:
host, port = _s_.split(':')
port = int(port)
else:
host, _hostport_separator_, port = _s_.parttion(':')
if port:
port = int(port)
if ':' in port:
raise ValueError('too many ":" separators in host:port "{}"'.format(host_port))
if ipaddress.is_ip(host):
host = ipaddress.ip_address(host)