KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ssh kitten: Fix SSH URL hostname matching

Browse Source
This commit is contained in:
pagedown 2022-03-23 18:39:27 +08:00
parent 6ef83a09d3
commit 4309aa1ace
No known key found for this signature in database
GPG Key ID: E921CF18AC8FF6EB
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kittens/ssh/main.py
View File

@ -466,7 +466,7 @@ def wrap_bootstrap_script(sh_script: str, interpreter: str) -> List[str]:
def get_remote_command( def get_remote_command(
remote_args: List[str], ssh_opts: SSHOptions, hostname: str = 'localhost', cli_hostname: str = '', cli_uname: str = '', remote_args: List[str], ssh_opts: SSHOptions, cli_hostname: str = '', cli_uname: str = '',
echo_on: bool = True, request_data: bool = False echo_on: bool = True, request_data: bool = False
) -> Tuple[List[str], Dict[str, str], str]: ) -> Tuple[List[str], Dict[str, str], str]:
interpreter = ssh_opts.interpreter interpreter = ssh_opts.interpreter
@ -579,13 +579,13 @@ def run_ssh(ssh_args: List[str], server_args: List[str], found_extra_args: Tuple
if hostname.startswith('ssh://'): if hostname.startswith('ssh://'):
from urllib.parse import urlparse from urllib.parse import urlparse
purl = urlparse(hostname) purl = urlparse(hostname)
hostname_for_match = purl.hostname or hostname hostname_for_match = purl.hostname or hostname[6:].split('/', 1)[0]
uname = purl.username or uname uname = purl.username or uname
elif '@' in hostname and hostname[0] != '@': elif '@' in hostname and hostname[0] != '@':
uname, hostname_for_match = hostname.split('@', 1) uname, hostname_for_match = hostname.split('@', 1)
else: else:
hostname_for_match = hostname hostname_for_match = hostname
hostname_for_match = hostname.split('@', 1)[-1].split(':', 1)[0] hostname_for_match = hostname_for_match.split('@', 1)[-1].split(':', 1)[0]
overrides = [] overrides = []
pat = re.compile(r'^([a-zA-Z0-9_]+)[ \t]*=') pat = re.compile(r'^([a-zA-Z0-9_]+)[ \t]*=')
for i, a in enumerate(found_extra_args): for i, a in enumerate(found_extra_args):
@ -617,7 +617,7 @@ def run_ssh(ssh_args: List[str], server_args: List[str], found_extra_args: Tuple
need_to_request_data = False need_to_request_data = False
with restore_terminal_state() as echo_on: with restore_terminal_state() as echo_on:
rcmd, replacements, shm_name = get_remote_command( rcmd, replacements, shm_name = get_remote_command(
remote_args, host_opts, hostname, hostname_for_match, uname, echo_on, request_data=need_to_request_data) remote_args, host_opts, hostname_for_match, uname, echo_on, request_data=need_to_request_data)
cmd += rcmd cmd += rcmd
try: try:
p = subprocess.Popen(cmd) p = subprocess.Popen(cmd)