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

Use python when base64 is not available

Browse Source
This commit is contained in:
Kovid Goyal 2022-03-07 18:34:02 +05:30
parent f20ad7df01
commit f2cb2422f0
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
shell-integration/ssh/bootstrap.sh
View File

@ -10,6 +10,25 @@ cleanup_on_bootstrap_exit() {
die() { printf "\033[31m%s\033[m\n\r" "$*" > /dev/stderr; cleanup_on_bootstrap_exit; exit 1; } die() { printf "\033[31m%s\033[m\n\r" "$*" > /dev/stderr; cleanup_on_bootstrap_exit; exit 1; }
detect_python() {
python=$(command -v python3)
if [ -z "$python" ]; then python=$(command -v python2); fi
if [ -z "$python" ]; then python=$(command -v python); fi
if [ -z "$python" -o ! -x "$python" ]; then return 1; fi
return 0
}
if command -v base64 > /dev/null 2> /dev/null; then
base64_encode() { base64 | tr -d \\n\\r; }
base64_decode() { base64 -d; }
elif detect_python; then
pybase64() { python -c "import sys, base64; getattr(sys.stdout, 'buffer', sys.stdout).write(base64.standard_b64$1(getattr(sys.stdin, 'buffer', sys.stdin).read()))"; }
base64_encode() { pybase64 "encode"; }
base64_decode() { pybase64 "decode"; }
else
die "base64 executable not present on remote host, ssh kitten cannot function."
fi
init_tty() { init_tty() {
saved_tty_settings=$(command stty -g 2> /dev/null < /dev/tty) saved_tty_settings=$(command stty -g 2> /dev/null < /dev/tty)
tty_ok="n" tty_ok="n"
@ -33,7 +52,7 @@ fi
if [ $tty_fd -gt -1 ]; then if [ $tty_fd -gt -1 ]; then
dcs_to_kitty() { dcs_to_kitty() {
builtin local b64data builtin local b64data
b64data=$(builtin printf "%s" "$2" | builtin command base64) b64data=$(builtin printf "%s" "$2" | base64_encode)
builtin print -nu "$tty_fd" '\eP@kitty-'"${1}|${b64data//[[:space:]]}"'\e\\' builtin print -nu "$tty_fd" '\eP@kitty-'"${1}|${b64data//[[:space:]]}"'\e\\'
} }
read_one_byte_from_tty() { read_one_byte_from_tty() {
@ -48,7 +67,7 @@ if [ $tty_fd -gt -1 ]; then
done done
} }
else else
dcs_to_kitty() { printf "\033P@kitty-$1|%s\033\\" "$(printf "%s" "$2" | command base64 | command tr -d \\n)" > /dev/tty; } dcs_to_kitty() { printf "\033P@kitty-$1|%s\033\\" "$(printf "%s" "$2" | base64_encode)" > /dev/tty; }
read_one_byte_from_tty() { read_one_byte_from_tty() {
# We need a way to read a single byte at a time and to read a specified number of bytes in one invocation. # We need a way to read a single byte at a time and to read a specified number of bytes in one invocation.
@ -91,7 +110,6 @@ login_cwd=""
init_tty && trap "cleanup_on_bootstrap_exit" EXIT init_tty && trap "cleanup_on_bootstrap_exit" EXIT
if [ "$tty_ok" = "y" ]; then if [ "$tty_ok" = "y" ]; then
command -v base64 > /dev/null 2> /dev/null || die "base64 executable not present on remote host, ssh kitten cannot function. You can try using --kitten interpreter=python if python is available."
dcs_to_kitty "ssh" "id="REQUEST_ID":hostname="$hostname":pwfile="PASSWORD_FILENAME":user="$USER":pw="DATA_PASSWORD"" dcs_to_kitty "ssh" "id="REQUEST_ID":hostname="$hostname":pwfile="PASSWORD_FILENAME":user="$USER":pw="DATA_PASSWORD""
record_separator=$(printf "\036") record_separator=$(printf "\036")
fi fi
@ -129,7 +147,7 @@ untar_and_read_env() {
tdir=$(command mktemp -d "$HOME/.kitty-ssh-kitten-untar-XXXXXXXXXXXX") tdir=$(command mktemp -d "$HOME/.kitty-ssh-kitten-untar-XXXXXXXXXXXX")
[ $? = 0 ] || die "Creating temp directory failed" [ $? = 0 ] || die "Creating temp directory failed"
read_n_bytes_from_tty "$1" | command base64 -d | command tar xpjf - -C "$tdir" read_n_bytes_from_tty "$1" | base64_decode | command tar xpjf - -C "$tdir"
data_file="$tdir/data.sh" data_file="$tdir/data.sh"
[ -f "$data_file" ] && . "$data_file" [ -f "$data_file" ] && . "$data_file"
[ -z "$KITTY_SSH_KITTEN_DATA_DIR" ] && die "Failed to read SSH data from tty" [ -z "$KITTY_SSH_KITTEN_DATA_DIR" ] && die "Failed to read SSH data from tty"
@ -186,14 +204,6 @@ login_shell_is_ok() {
return 1 return 1
} }
detect_python() {
python=$(command -v python3)
if [ -z "$python" ]; then python=$(command -v python2); fi
if [ -z "$python" ]; then python=$(command -v python); fi
if [ -z "$python" -o ! -x "$python" ]; then return 1; fi
return 0
}
parse_passwd_record() { parse_passwd_record() {
printf "%s" "$(command grep -o '[^:]*$')" printf "%s" "$(command grep -o '[^:]*$')"
} }