Skip to content

Commit c5c9198

Browse files
committed
Modify it2ssh to send a much shorter command. This requires corresponding changes in iterm2 to work.
1 parent a209d7e commit c5c9198

File tree

4 files changed

+27
-170
lines changed

4 files changed

+27
-170
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
utilities/it2ssh: .phony
2-
./buildssh
32
cp utilities/it2ssh ../../OtherResources/
43

54
.phony:

ssh-helpers/conductor.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -448,10 +448,10 @@ drain_stdin() {
448448
}
449449

450450
main() {
451-
local token="$1"
452-
local uniqueid="$2"
453-
local booleanargs="$3"
454-
local sshargs="$4"
451+
local token=$(base64_decode <<< $1)
452+
local uniqueid=$(base64_decode <<< $2)
453+
local booleanargs=$(base64_decode <<< $3)
454+
local sshargs=$(base64_decode <<< $4)
455455

456456
log starting with token $token
457457
log $(env)

ssh-helpers/it2ssh

Lines changed: 0 additions & 158 deletions
This file was deleted.

utilities/it2ssh

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,7 @@ else
4545
die "base64 executable not present on local host"
4646
fi
4747

48-
conductor="set -euo pipefail
login_shell=""
shell_name=""
quit=0
python_detected="0"
perl_detected="0"
exec_shell=0
run_cmd=0
run_python=0
stty_settings=$(command stty -g)
cleanup() {
  command stty "$stty_settings"
}
die() {
    log die "$*"
    printf "\033[31m%s\033[m\n\r" "$*" > /dev/stderr
    cleanup
    exit 1
}
it2ssh_verbose=0
log() {
    if [[ $it2ssh_verbose == 0 ]]; then
        return
    fi
    printf "[$$] %s: %s\n" $(date +%H:%M:%S) "$*" >> /tmp/it2ssh.log
}
print_dcs() {
    local token=$1
    local uniqueid=$2
    local boolargs=$3
    local sshargs=$4
    log osc print_dcs $1 $2 $3 $4
    printf "\033P2000p"
    printf "%s %s %s - %s\n" "${token}" "${uniqueid}" "${boolargs}" "${sshargs}"
}
first_word() {
    local input="$1"
    printf "%s" ${input%% *}
}
drop_first_word() {
    local input="$1"
    log drop first word from: "$input"
    if [[ $input == *" "* ]]; then
        printf "%s" "${input#* }"
    fi
}
if command -v base64 > /dev/null 2> /dev/null; then
    log "found base64 command"
    base64_encode() { command base64 | command tr -d \\n\\r; }
    base64_decode() { command base64 -d; }
elif command -v b64encode > /dev/null 2> /dev/null; then
    log "found b64encode, b64decode commands"
    base64_encode() { command b64encode - | command sed '1d;$d' | command tr -d \\n\\r; }
    base64_decode() { command fold -w 76 | command b64decode -r; }
elif detect_python; then
    log "using python for base64"
    pybase64() { command "$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"; }
elif detect_perl; then
    log "using perl for base64"
    base64_encode() { command "$perl" -MMIME::Base64 -0777 -ne 'print encode_base64($_)'; }
    base64_decode() { command "$perl" -MMIME::Base64 -ne 'print decode_base64($_)'; }
else
    die "base64 executable not present on remote host"
fi
parse_passwd_record() {
    printf "%s" "$(command grep -o '[^:]*$')"
}
login_shell_is_ok() {
    log login_shell_is_ok
    [ -n "$1" ] && login_shell=$(echo $1 | parse_passwd_record)
    [ -n "$login_shell" -a -x "$login_shell" ] && return 0
    log "login shell of $login_shell is ok"
    return 1
}
using_getent() {
    cmd=$(command -v getent) && [ -n "$cmd" ] && output=$(command "$cmd" passwd "$USER" 2>/dev/null) \
    && login_shell_is_ok "$output"
}
using_id() {
    cmd=$(command -v id) && [ -n "$cmd" ] && output=$(command "$cmd" -P "$USER" 2>/dev/null) \
    && login_shell_is_ok "$output"
}
detect_python() {
    if [ python_detected = "1" ]; then
        [ -n "$python" ] && return 0
        return 1
    fi
    python_detected="1"
    python=$(command -v python3)
    [ -z "$python" ] && python=$(command -v python2)
    [ -z "$python" ] && python=$(command -v python)
    if [ -z "$python" -o ! -x "$python" ]; then python=""; return 1; fi
    log no python
    return 0
}
using_python() {
    detect_python && output=$(command "$python" -c "import pwd, os; print(pwd.getpwuid(os.geteuid()).pw_shell)") \
    && login_shell="$output" && login_shell_is_ok
}
detect_perl() {
    if [ perl_detected = "1" ]; then
        [ -n "$perl" ] && return 0
        return 1
    fi
    perl_detected="1"
    perl=$(command -v perl)
    if [ -z "$perl" -o ! -x "$perl" ]; then perl=""; return 1; fi
    log no perl
    return 0
}
using_perl() {
    detect_perl && output=$(command "$perl" -e 'my $shell = (getpwuid($<))[8]; print $shell') \
    && login_shell="$output" && login_shell_is_ok
}
using_shell_env() {
    [ -n "$SHELL" ] && login_shell="$SHELL" && login_shell_is_ok
}
guess_login_shell() {
    [ -n "$login_shell" ] || using_getent || using_id || using_python || using_perl || using_passwd || using_shell_env || login_shell="sh"
    printf "%s" ${login_shell}
    log login shell is ${login_shell}
}
execute_with_perl() {
    if detect_perl; then
        log execute login shell using perl
        exec "$perl" "-e" "exec {'$login_shell'} '-$shell_name'"
    fi
    return 1
}
execute_with_python() {
    if detect_python; then
        log execute login shell using python
        exec "$perl" "-e" "exec {'$login_shell'} '-$shell_name'"
        exec "$python" "-c" "import os; os.execlp('$login_shell', '-' '$shell_name')"
    fi
    return 1
}
exec_login_shell() {
    local login_shell=${1}
    log exec_login_shell "$login_shell"
    [ "$(exec -a echo echo OK 2> /dev/null)" = "OK" ] && exec -a "-$shell_name" "$login_shell"
    log failed, try python
    execute_with_python
    log failed, try perl
    execute_with_perl
    log failed, just run it with -l
    exec "$login_shell" "-l"
    log failed completely
    printf "%s\n" "Could not execute the shell $login_shell as a login shell" > /dev/stderr
    exec "$login_shell"
}
conductor_cmd_exec_login_shell() {
    log conductor_cmd_exec_login_shell
    exec_shell=1
}
really_exec_login_shell() {
    exec_login_shell $(command basename $(guess_login_shell))
}
conductor_cmd_setenv() {
    log conductor_cmd_setenv
    if [ "$#" -ne 2 ]; then
        log bad args
        (exit 1)
        return
    fi
    local name=$1
    local value=$2
    log setenv ${name}=${value}
    export ${name}=${value}
}
conductor_cmd_run() {
    log conductor_cmd_run
    run_cmd=1
}
conductor_cmd_runpython() {
    log conductor_cmd_runpython
    run_python=1
}
really_run_python() {
  log really_run_python
  rce='
import os
import sys
tty_path = os.ttyname(sys.stdout.fileno())
sys.stdin = open(tty_path, "r")
try:
  print(f"\033]135;:{os.getpid()}\033\\\033]135;:end '"$boundary"' r 0\033\\", end="", flush=True)
  program=""
  for line in sys.stdin:
    if line.rstrip() == "EOF":
      exec(program)
      print(f"\033]135;:unhook\033\\", end="", flush=True)
      break
    program += line
except Exception as e:
  print(e)
'
  exec python3 <<< "$rce"
  log "unexpected return from exec"
  exit 0
}
really_run() {
    log "really_run $@"
    if [ "$#" -lt 1 ]; then
        log bad args
        (exit 1)
        return
    fi
    log exec "$SHELL" -c "$*"
    printf "\e]135;:"
    exec "$SHELL" -c "$*"
    printf "\e\\"
}
conductor_cmd_shell() {
    log conductor_cmd_shell
    if [ "$#" -lt 2 ]; then
        log bad args
        (exit 1)
        return
    fi
    printf "\e]135;:"
    set +e
    set +o pipefail
    $*
    printf "\e\\"
}
conductor_cmd_write() {
    log conductor_cmd_write
    log have $# arguments
    if [ "$#" -ne 2 ]; then
        log bad args
        (exit 1)
        return
    fi
    log will write to "$2"
    local b64data=$1
    local destination=$(eval printf %s "$2")
    mkdir -p "$destination" || true
    log writing to $destination based on $2
    old_umask=$(umask)
    umask 000
    printf "%s" ${b64data} | base64_decode | command tar "xpzf" "-" "-C" "$destination"
    local rc=$?
    umask "$old_umask"
    (exit $rc)
}
conductor_cmd_cd() {
    log cd
    if [ "$#" -ne 1 ]; then
        log "bad args"
        (exit 1)
        return
    fi
    local dir=$1
    log cd $dir
    cd "$dir" > /dev/null 2>&1
}
conductor_cmd_quit() {
    log quit
    quit=1
}
conductor_cmd_getshell() {
    log getshell
    printf "\e]135;:"
    shell=$(guess_login_shell)
    echo "$shell"
    echo ~
    $shell --version || true
    printf "\e\\"
}
conductor_cmd_eval() {
    log "eval $@"
    local b64="$1"
    local mydir=$(mktemp -d "${TMPDIR:-/tmp/}it2ssh.XXXXXXXXXXXX")
    local file="$mydir/it2ssh-eval"
    log "mydir=$mydir tmpdir=${TMPDIR:-/tmp/} file=$file"
    base64_decode <<< "$b64" > "$file"
    source "$file"
    rm -f "$file"
    log "$file" finished executing
}
write() {
    printf "\e]135;:%s\e\\" "$*"
}
handle_command() {
    local unparsed=${1}
    log handle_command $unparsed
    local cmd_name=$(first_word "${unparsed}")
    log cmd_name is $cmd_name
    local args=$(drop_first_word "${unparsed}")
    log args is $args
    local boundary="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
    write begin $boundary
    log invoke $cmd_name with arguments $args
    set +e
    set +o pipefail
    if [[ $(type -t conductor_cmd_${cmd_name}) == function ]]; then
        conductor_cmd_${cmd_name} $args
    else
        write "bad command ${cmd_name}"
        false
    fi
    if [[ $run_python == 1 ]]; then
        really_run_python "$boundary"
    fi
    write end $boundary $? r
    if [[ $quit == 1 ]]; then
        exit 0
    fi
    if [[ $exec_shell == 1 ]]; then
        log successfully executed the login shell. Unhook.
        write unhook
        cleanup
        really_exec_login_shell
    fi
    if [[ $run_cmd == 1 ]]; then
        log successfully ran a command. Unhook.
        write unhook
        cleanup
        really_run $args
    fi
    set -e
    set -o pipefail
}
iterate() {
    log iterate
    line=""
    while true; do
        read part
        log read part "$part"
        if [ -z "$part" ]; then
            break
        fi
        line="${line}${part}"
    done
    log read line "$line"
    handle_command "$line"
}
drain_stdin() {
  log drain_stdin
  stty -echo -icanon time 0 min 0
  while :
  do
      key="$(printf x; dd bs=1 count=1 2> /dev/null; printf x)"
      if [[ "$key" == "xx" ]]; then
          log "done draining"
          break
      fi
      log "$key"
  done
  cleanup
}
main() {
    local token="$1"
    local uniqueid="$2"
    local booleanargs="$3"
    local sshargs="$4"
    log starting with token $token
    log $(env)
    log "token: $token"
    log "uniqueid: $uniqueid"
    log "booleanargs: $booleanargs"
    log "sshargs: $sshargs"
    trap "cleanup" EXIT
    drain_stdin
    stty -echo -onlcr -opost
    print_dcs "$token" "$uniqueid" "$booleanargs" "$sshargs"
    log begin mainloop
    while true; do
        iterate
    done
}
"
49-
50-
# Trying to escape this broke me.
51-
eval_cmd=$(printf %s "J2V2YWwgIiQoZWNobyAiJDAiIHwgdHIgXFxcdlxcXGZcXFxyXFxcYiBcXFwwNDdcXFwxMzRcXFxuXFxcMDQxKSInIA==" | base64_decode)
52-
53-
sanitized="$(printf %s "$conductor" | base64_decode | tr "\!'\n\\" \\b\\v\\r\\f)"
48+
eval_cmd=\''eval "$(echo "$0")"'\'
5449

5550
SSH=/usr/bin/ssh
5651
if [[ "$OSTYPE" == "darwin"* ]]; then
@@ -139,6 +134,21 @@ fi
139134
# to the login shell's history.
140135
ENCODED_BA=$(printf %s "$BOOLEAN_ARGS" | base64_encode)
141136

137+
# Send arguments to conductor.sh
138+
print_osc
139+
printf "1337;it2ssh=$TOKEN ${UNIQUEID} $ENCODED_BA $SSHARGS"
140+
print_st
141+
142+
if [[ $TERM == screen* ]]; then
143+
st='\a\033\\'
144+
else
145+
st='\a'
146+
fi
147+
send_conductor='printf "\033]1337;SendConductor'"$st"'"'
148+
149+
# Run a command on the remote host that instructs iTerm2 to send a script, then reads the script and executes it.
150+
sanitized="$send_conductor"';s="";IFS=""; stty -echo; while read -r l;do [ "$l" = EOF ]&&break; s="$s$l\n"; done; unset IFS; eval "$s"'
151+
142152
# If ssh gets a signal, let it2ssh keep running.
143153
set +e
144154

@@ -150,9 +160,15 @@ exec \
150160
sh \
151161
-c \
152162
"$eval_cmd" \
153-
\'"$sanitized main $TOKEN ${UNIQUEID} $ENCODED_BA $SSHARGS"\'
163+
\'"$sanitized"\'
154164

155165
print_osc
156166
printf "1337;EndSSH=%s" "${UNIQUEID}"
157167
print_st
158168

169+
# If ssh dies after send_conductor is sent, we don't want conductor.sh to go to
170+
# the command line. Read until EndSSH causes a blank line to be sent.
171+
while read l; do
172+
[ -z "$l" ] && break
173+
done
174+

0 commit comments

Comments
 (0)