extern/sshuttle
1
1
Fork 0
mirror of https://github.com/sshuttle/sshuttle.git synced 2025-01-17 03:18:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

# Fix 410 Issue Correcte syntax write for connect server (#411)

Browse Source
This commit is contained in:
vBlackOut 2020-03-28 07:44:28 +01:00 committed by GitHub
parent 9e78abd2c2
commit 580462156e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sshuttle/ssh.py
View File

@ -64,6 +64,11 @@ def parse_hostport(rhostport):
# default define variable # default define variable
port = "" port = ""
username = re.split(r'\s*:', rhostport)[0] username = re.split(r'\s*:', rhostport)[0]
# Fix #410 bad username error detect
if "@" in username:
username = re.split(r'\s*@', rhostport)[0]
password = None password = None
host = None host = None
@ -82,9 +87,12 @@ def parse_hostport(rhostport):
if host is None: if host is None:
# split for ipv4 or ipv6 # split for ipv4 or ipv6
host = "{}".format(re.split(r'\s*@', rhostport)[1]) host = "{}".format(re.split(r'\s*@', rhostport)[1])
# try if port define # try if port define
try: try:
port = re.split(r'\s*:', rhostport)[2].split('@')[0] # Fix #410 detect host:port
port = re.split(r'\s*:', host)[1]
host = re.split(r'\s*:', host)[0]
except IndexError: except IndexError:
pass pass