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

DRYer

Browse Source
This commit is contained in:
Kovid Goyal 2022-03-08 23:04:58 +05:30
parent 5b5bd77c53
commit 0661caf9da
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kittens/ssh/main.py
View File

@ -402,7 +402,7 @@ def get_remote_command(
script_type='py' if is_python else 'sh', remote_args=remote_args, ssh_opts_dict=ssh_opts_dict, script_type='py' if is_python else 'sh', remote_args=remote_args, ssh_opts_dict=ssh_opts_dict,
cli_hostname=cli_hostname, cli_uname=cli_uname) cli_hostname=cli_hostname, cli_uname=cli_uname)
# sshd will execute the command we pass it by join all command line # sshd will execute the command we pass it by join all command line
# arguments witha space and apssing it as a single argument to the users # arguments with a space and passing it as a single argument to the users
# login shell with -c. If the user has a non POSIX login shell it might # login shell with -c. If the user has a non POSIX login shell it might
# have different escaping semantics and syntax, so the command it should # have different escaping semantics and syntax, so the command it should
# execute has to be as simple as possible, basically of the form # execute has to be as simple as possible, basically of the form
@ -411,12 +411,14 @@ def get_remote_command(
# executing it. # executing it.
if is_python: if is_python:
es = standard_b64encode(sh_script.encode('utf-8')).decode('ascii') es = standard_b64encode(sh_script.encode('utf-8')).decode('ascii')
return [interpreter, '-c', '''"import base64, sys; eval(compile(base64.standard_b64decode(sys.argv[-1]), 'bootstrap.py', 'exec'))"''', es] wrapper_cmd = '''"import base64, sys; eval(compile(base64.standard_b64decode(sys.argv[-1]), 'bootstrap.py', 'exec'))"'''
# We cant rely on base64 being available on the remote system, so instead else:
# we quote the bootstrap script by replace ' and \ with \v and \f and # We cant rely on base64 being available on the remote system, so instead
# surrounding with ' # we quote the bootstrap script by replacing ' and \ with \v and \f and
es = "'" + sh_script.replace("'", '\v').replace('\\', '\f') + "'" # surrounding with '
return [interpreter, '-c', r"""'eval "$(echo "$0" | tr \\\v\\\f \\\047\\\134)"' """, es] es = "'" + sh_script.replace("'", '\v').replace('\\', '\f') + "'"
wrapper_cmd = r"""'eval "$(echo "$0" | tr \\\v\\\f \\\047\\\134)"' """
return [interpreter, '-c', wrapper_cmd, es]
def main(args: List[str]) -> NoReturn: def main(args: List[str]) -> NoReturn: