Don't require stdbuf.

This commit is contained in:
Joshua Rogers 2024-01-12 02:06:14 +07:00
parent cc6b55d722
commit 6afd55dcea
3 changed files with 16 additions and 20 deletions

View File

@ -50,13 +50,13 @@ SSH-Snake can either be downloaded or piped into bash:
```bash ```bash
wget https://raw.githubusercontent.com/MegaManSec/SSH-Snake/main/Snake.nocomments.sh wget https://raw.githubusercontent.com/MegaManSec/SSH-Snake/main/Snake.nocomments.sh
stdbuf -o0 bash ./Snake.nocomments.sh bash ./Snake.nocomments.sh
``` ```
or or
```bash ```bash
curl https://raw.githubusercontent.com/MegaManSec/SSH-Snake/main/Snake.nocomments.sh | stdbuf -o0 bash curl https://raw.githubusercontent.com/MegaManSec/SSH-Snake/main/Snake.nocomments.sh | bash
``` ```
# About SSH-Snake # About SSH-Snake

View File

@ -257,7 +257,7 @@ root_ssh_hosts_dests["${BASH_REMATCH[1]}"]=1
fi fi
printf "[%s]" "$(date +%s)" printf "[%s]" "$(date +%s)"
printf "%s\n" "$line" printf "%s\n" "$line"
done < <(echo 'printf "%s" "$1" | base64 -d | stdbuf -o0 bash --noprofile --norc -s $1' | stdbuf -o0 bash --noprofile --norc -s "$(printf "%s" "$local_script" | base64 | tr -d '\n')" 2>&1 | grep -v -F 'INTERNAL_MSG') done < <(echo 'printf "%s" "$1" | base64 -d | bash --noprofile --norc -s $1' | bash --noprofile --norc -s "$(printf "%s" "$local_script" | base64 | tr -d '\n')" 2>&1 | grep -v -F 'INTERNAL_MSG')
[[ $use_retry_all_dests -eq 1 ]] || return [[ $use_retry_all_dests -eq 1 ]] || return
local retried_interesting_dests local retried_interesting_dests
retried_interesting_dests="$(gen_retried_interesting_dests | sort | uniq)" retried_interesting_dests="$(gen_retried_interesting_dests | sort | uniq)"
@ -281,7 +281,7 @@ root_ssh_hosts_dests["${BASH_REMATCH[1]}"]=1
fi fi
printf "[%s]" "$(date +%s)" printf "[%s]" "$(date +%s)"
printf "%s\n" "$line" printf "%s\n" "$line"
done < <(echo 'printf "%s" "$1" | base64 -d | stdbuf -o0 bash --noprofile --norc -s $1' | stdbuf -o0 bash --noprofile --norc -s "$(printf "%s" "$local_script" | base64 | tr -d '\n')" 2>&1 | grep -v -F 'INTERNAL_MSG') done < <(echo 'printf "%s" "$1" | base64 -d | bash --noprofile --norc -s $1' | bash --noprofile --norc -s "$(printf "%s" "$local_script" | base64 | tr -d '\n')" 2>&1 | grep -v -F 'INTERNAL_MSG')
} }
fin_root() { fin_root() {
local root_ssh_dest local root_ssh_dest
@ -335,7 +335,7 @@ printf "\nThanks for playing!\n"
check_commands() { check_commands() {
local required_commands local required_commands
local required_command local required_command
required_commands=("ssh-keygen" "readlink" "ssh" "basename" "base64" "awk" "sort" "uniq" "grep" "tr" "find" "cat" "stdbuf") required_commands=("ssh-keygen" "readlink" "ssh" "basename" "base64" "awk" "sort" "uniq" "grep" "tr" "find" "cat")
for required_command in "${required_commands[@]}"; do for required_command in "${required_commands[@]}"; do
if ! command -v "$required_command" >/dev/null 2>&1; then if ! command -v "$required_command" >/dev/null 2>&1; then
echo "$required_command" echo "$required_command"
@ -369,7 +369,7 @@ printf "INTERNAL_MSG: command not found: %s\n" "$required_command"
exit 1 exit 1
fi fi
if ! printf "%s" "$script" | base64 -d >/dev/null 2>&1; then if ! printf "%s" "$script" | base64 -d >/dev/null 2>&1; then
printf "Usage: stdbuf -o0 bash %s >output.log\n" "$0" printf "Usage: bash %s >output.log\n" "$0"
exit 1 exit 1
fi fi
} }
@ -1001,9 +1001,7 @@ declare -A resolved_hosts
local res local res
local use_mac local use_mac
local to local to
if command -v timeout >/dev/null 2>&1; then command -v timeout >/dev/null 2>&1 && to="timeout $ssh_timeout"
to="timeout $ssh_timeout"
fi
if getent ahostsv4 -- 1.1.1.1 >/dev/null 2>&1; then if getent ahostsv4 -- 1.1.1.1 >/dev/null 2>&1; then
res="$to getent ahostsv4 --" res="$to getent ahostsv4 --"
elif dscacheutil -q host -a name 1.1.1.1 >/dev/null 2>&1; then elif dscacheutil -q host -a name 1.1.1.1 >/dev/null 2>&1; then
@ -1280,7 +1278,7 @@ printf "%s\n" "$line"
else else
rs_chained_print "$t_hosts_chain" "$ssh_dest [line]: $line" rs_chained_print "$t_hosts_chain" "$ssh_dest [line]: $line"
fi fi
done < <(stdbuf -o0 ${s} ssh "${ssh_options[@]}" -i "$key_file" -- "$ssh_dest" "echo 'printf \"%s\" \$1 | base64 -d | stdbuf -o0 bash --noprofile --norc -s \$1 \$2 \$3 \$4 \$5' | stdbuf -o0 bash --noprofile --norc -s -- '$script' '$(printf "%s" "$t_hosts_chain" | base64 | tr -d '\n')' '$ignore_list' '$ssh_dest' '$(printf "%s" "$t_hostnames_chain" | base64 | tr -d '\n')'" </dev/null 2>&1 | tr -d '\r') done < <(${s} ssh "${ssh_options[@]}" -i "$key_file" -- "$ssh_dest" "echo 'printf \"%s\" \$1 | base64 -d | bash --noprofile --norc -s \$1 \$2 \$3 \$4 \$5' | bash --noprofile --norc -s -- '$script' '$(printf "%s" "$t_hosts_chain" | base64 | tr -d '\n')' '$ignore_list' '$ssh_dest' '$(printf "%s" "$t_hostnames_chain" | base64 | tr -d '\n')'" </dev/null 2>&1 | tr -d '\r')
[[ $skip_this_dest -eq 1 ]] && break [[ $skip_this_dest -eq 1 ]] && break
done done
done done
@ -1328,4 +1326,4 @@ recursive_scan
fin fin
MAIN_SCRIPT MAIN_SCRIPT
) )
printf "%s" "$THIS_SCRIPT" | stdbuf -o0 bash --noprofile --norc printf "%s" "$THIS_SCRIPT" | bash --noprofile --norc

View File

@ -478,7 +478,7 @@ shape_script() {
fi fi
printf "[%s]" "$(date +%s)" printf "[%s]" "$(date +%s)"
printf "%s\n" "$line" printf "%s\n" "$line"
done < <(echo 'printf "%s" "$1" | base64 -d | stdbuf -o0 bash --noprofile --norc -s $1' | stdbuf -o0 bash --noprofile --norc -s "$(printf "%s" "$local_script" | base64 | tr -d '\n')" 2>&1 | grep -v -F 'INTERNAL_MSG') done < <(echo 'printf "%s" "$1" | base64 -d | bash --noprofile --norc -s $1' | bash --noprofile --norc -s "$(printf "%s" "$local_script" | base64 | tr -d '\n')" 2>&1 | grep -v -F 'INTERNAL_MSG')
[[ $use_retry_all_dests -eq 1 ]] || return [[ $use_retry_all_dests -eq 1 ]] || return
@ -514,7 +514,7 @@ shape_script() {
fi fi
printf "[%s]" "$(date +%s)" printf "[%s]" "$(date +%s)"
printf "%s\n" "$line" printf "%s\n" "$line"
done < <(echo 'printf "%s" "$1" | base64 -d | stdbuf -o0 bash --noprofile --norc -s $1' | stdbuf -o0 bash --noprofile --norc -s "$(printf "%s" "$local_script" | base64 | tr -d '\n')" 2>&1 | grep -v -F 'INTERNAL_MSG') done < <(echo 'printf "%s" "$1" | base64 -d | bash --noprofile --norc -s $1' | bash --noprofile --norc -s "$(printf "%s" "$local_script" | base64 | tr -d '\n')" 2>&1 | grep -v -F 'INTERNAL_MSG')
} }
# If this is the first IP in the chain, prepare some data from the chain, which will be printed by the root script. # If this is the first IP in the chain, prepare some data from the chain, which will be printed by the root script.
@ -581,7 +581,7 @@ check_commands() {
local required_commands local required_commands
local required_command local required_command
required_commands=("ssh-keygen" "readlink" "ssh" "basename" "base64" "awk" "sort" "uniq" "grep" "tr" "find" "cat" "stdbuf") # "sudo" "hostname" "xargs" "getent" "ifconfig" "ipconfig" "ip" "timeout" "dscacheutil" are all semi-optional. "sed" is necessary only by the first system. required_commands=("ssh-keygen" "readlink" "ssh" "basename" "base64" "awk" "sort" "uniq" "grep" "tr" "find" "cat") # "sudo" "hostname" "xargs" "getent" "ifconfig" "ipconfig" "ip" "timeout" "dscacheutil" are all semi-optional. "sed" is necessary only by the first system.
for required_command in "${required_commands[@]}"; do for required_command in "${required_commands[@]}"; do
if ! command -v "$required_command" >/dev/null 2>&1; then if ! command -v "$required_command" >/dev/null 2>&1; then
@ -626,7 +626,7 @@ check_startup() {
fi fi
if ! printf "%s" "$script" | base64 -d >/dev/null 2>&1; then if ! printf "%s" "$script" | base64 -d >/dev/null 2>&1; then
printf "Usage: stdbuf -o0 bash %s >output.log\n" "$0" printf "Usage: bash %s >output.log\n" "$0"
exit 1 exit 1
fi fi
} }
@ -1690,9 +1690,7 @@ deduplicate_resolved_hosts_keys() {
local to local to
# DNS timeout of 5 seconds per address (bleh, hack). # DNS timeout of 5 seconds per address (bleh, hack).
if command -v timeout >/dev/null 2>&1; then command -v timeout >/dev/null 2>&1 && to="timeout $ssh_timeout"
to="timeout $ssh_timeout"
fi
# Use getent if it's available. # Use getent if it's available.
if getent ahostsv4 -- 1.1.1.1 >/dev/null 2>&1; then if getent ahostsv4 -- 1.1.1.1 >/dev/null 2>&1; then
@ -2193,7 +2191,7 @@ recursive_scan() {
# If the line doesn't contain the chain, then it's an unexpected output. So, print the chain including the destination, and the line. # If the line doesn't contain the chain, then it's an unexpected output. So, print the chain including the destination, and the line.
rs_chained_print "$t_hosts_chain" "$ssh_dest [line]: $line" # Doesn't include a chain, so the message is coming from something we didn't expect, so print it with [line]. rs_chained_print "$t_hosts_chain" "$ssh_dest [line]: $line" # Doesn't include a chain, so the message is coming from something we didn't expect, so print it with [line].
fi fi
done < <(stdbuf -o0 ${s} ssh "${ssh_options[@]}" -i "$key_file" -- "$ssh_dest" "echo 'printf \"%s\" \$1 | base64 -d | stdbuf -o0 bash --noprofile --norc -s \$1 \$2 \$3 \$4 \$5' | stdbuf -o0 bash --noprofile --norc -s -- '$script' '$(printf "%s" "$t_hosts_chain" | base64 | tr -d '\n')' '$ignore_list' '$ssh_dest' '$(printf "%s" "$t_hostnames_chain" | base64 | tr -d '\n')'" </dev/null 2>&1 | tr -d '\r') done < <(${s} ssh "${ssh_options[@]}" -i "$key_file" -- "$ssh_dest" "echo 'printf \"%s\" \$1 | base64 -d | bash --noprofile --norc -s \$1 \$2 \$3 \$4 \$5' | bash --noprofile --norc -s -- '$script' '$(printf "%s" "$t_hosts_chain" | base64 | tr -d '\n')' '$ignore_list' '$ssh_dest' '$(printf "%s" "$t_hostnames_chain" | base64 | tr -d '\n')'" </dev/null 2>&1 | tr -d '\r')
[[ $skip_this_dest -eq 1 ]] && break [[ $skip_this_dest -eq 1 ]] && break
done done
@ -2267,4 +2265,4 @@ recursive_scan
fin fin
MAIN_SCRIPT MAIN_SCRIPT
) )
printf "%s" "$THIS_SCRIPT" | stdbuf -o0 bash --noprofile --norc printf "%s" "$THIS_SCRIPT" | bash --noprofile --norc