extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-06-30 23:01:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #506 from sshuttle/test_parse_hostport

Browse Source 
Fix parse_hostport to always return string for host
This commit is contained in:
Brian May
2020-08-13 07:59:12 +10:00
committed by GitHub
parent 33d09ffcaf 9c5f1f5bbf
commit be4b081a0d
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sshuttle/ssh.py
View File

@ -65,12 +65,12 @@ def parse_hostport(rhostport):
try:
# try to parse host as an IP adress,
# if that works it is an IPv6 address
host = ipaddress.ip_address(host)
host = str(ipaddress.ip_address(host))
except ValueError:
# if that fails parse as URL to get the port
parsed = urlparse('//{}'.format(host))
try:
host = ipaddress.ip_address(parsed.hostname)
host = str(ipaddress.ip_address(parsed.hostname))
except ValueError:
# else if both fails, we have a hostname with port
host = parsed.hostname