[Fix] nvm_ls_remote_index_tab, nvm_compare_checksum: also keep non-ASCII controls from the mirror off the terminal
Rejecting only ASCII control characters in the LTS codename still lets through a UTF-8 C1 control (like U+009B, a CSI) or a bidi override (like U+202E), which some terminals act on. A row is now kept only if its codename is `-`, empty, or alias-safe, which is the same shape the LTS alias step already requires, and every real codename has. BusyBox `tr` mishandles `-c` with a character class, so on Alpine the expected checksum printed as almost all `?`; an octal range in the C locale works in BusyBox, GNU, and BSD `tr`, and does not make BSD `tr` abort on invalid UTF-8.
This commit is contained in:
2 files changed
+12
-10
No files matched your search
@@ -2950,12 +2950,9 @@ nvm_ls_remote_index_tab() {
|
||||
return 3
|
||||
}
|
||||
# the mirror's index.tab is untrusted: skip the header, and any row whose version
|
||||
# is malformed or whose LTS codename carries control characters (which would reach
|
||||
# the terminal as escape sequences), before it is printed, stored as an LTS alias,
|
||||
# or matched against a pattern. The control characters are an octal range because
|
||||
# mawk 1.3.3 has no `[[:cntrl:]]`.
|
||||
# or LTS codename is malformed, before it is printed, stored as an LTS alias, or matched against a pattern
|
||||
VERSION_LIST="$(nvm_echo "${VERSION_LIST}" \
|
||||
| command awk -v prefix="${PREFIX}" 'NR > 1 && $1 ~ /^v[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z.-]+)?$/ && $10 !~ /[\001-\037\177]/ { print prefix $0 }' \
|
||||
| command awk -v prefix="${PREFIX}" 'NR > 1 && $1 ~ /^v[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z.-]+)?$/ && $10 ~ /^(-|[0-9A-Za-z][0-9A-Za-z._-]*)?$/ { print prefix $0 }' \
|
||||
)"
|
||||
local LTS_ALIAS
|
||||
local LTS_VERSION
|
||||
@@ -3136,8 +3133,8 @@ nvm_compare_checksum() {
|
||||
nvm_err 'Refusing to continue *without checksum verification*'
|
||||
return 1
|
||||
elif [ "${COMPUTED_SUM}" != "${CHECKSUM}" ] && [ "${COMPUTED_SUM}" != "\\${CHECKSUM}" ]; then
|
||||
# the expected checksum comes from the mirror, so show its control characters as `?`
|
||||
nvm_err "Checksums do not match: '${COMPUTED_SUM}' found, '$(command printf '%s' "${CHECKSUM}" | command tr -c '[:print:]' '?')' expected."
|
||||
# the expected checksum comes from the mirror, so show anything but printable ASCII as `?`
|
||||
nvm_err "Checksums do not match: '${COMPUTED_SUM}' found, '$(command printf '%s' "${CHECKSUM}" | LC_ALL=C command tr -c '\040-\176' '?')' expected."
|
||||
return 1
|
||||
fi
|
||||
nvm_err 'Checksums matched!'
|
||||
|
||||
@@ -20,10 +20,14 @@ BEL="$(printf '\007')"
|
||||
|
||||
# a malicious/compromised mirror: the LTS codename field ($10) carries terminal
|
||||
# escape sequences (an OSC window-title write and an SGR color change);
|
||||
# a valid codename (Iron) is included to prove real rows are still listed
|
||||
# a valid codename (Iron) is included to prove real rows are still listed;
|
||||
# so are a UTF-8 C1 CSI and a right-to-left override, which are not ASCII control characters
|
||||
nvm_download() {
|
||||
printf 'version\tdate\tfiles\tnpm\tv8\tuv\tzlib\topenssl\tmodules\tlts\tsecurity\n'
|
||||
printf 'v23.0.0\t2026-01-01\tlinux-x64\t-\t-\t-\t-\t-\t-\t-\t-\n'
|
||||
printf 'v22.0.0\t2026-01-01\tlinux-x64\t-\t-\t-\t-\t-\t-\tJod\033]0;PWNED\007\033[31m\t-\n'
|
||||
printf 'v21.0.0\t2026-01-01\tlinux-x64\t-\t-\t-\t-\t-\t-\tJod\302\23331m\t-\n'
|
||||
printf 'v20.1.0\t2026-01-01\tlinux-x64\t-\t-\t-\t-\t-\t-\tIron\342\200\256\t-\n'
|
||||
printf 'v20.0.0\t2026-01-01\tlinux-x64\t-\t-\t-\t-\t-\t-\tIron\t-\n'
|
||||
}
|
||||
|
||||
@@ -32,8 +36,9 @@ case "${OUTPUT}" in
|
||||
*"${ESC}"* | *"${BEL}"*) die "nvm_ls_remote printed control characters from the mirror's LTS codename: $(printf '%s' "${OUTPUT}" | od -c | head -5)" ;;
|
||||
esac
|
||||
case "${OUTPUT}" in
|
||||
*'v20.0.0'*'Iron'*) ;;
|
||||
*) die "nvm_ls_remote did not list the valid row: ${OUTPUT}" ;;
|
||||
*'v21.0.0'* | *'v20.1.0'*) die "nvm_ls_remote listed a row with a malformed LTS codename: ${OUTPUT}" ;;
|
||||
*'v20.0.0'*'Iron'*'v23.0.0'*) ;;
|
||||
*) die "nvm_ls_remote did not list the valid rows: ${OUTPUT}" ;;
|
||||
esac
|
||||
if [ -f "$NVM_DIR/.lts-status" ] && nvm_grep -q "${ESC}" "$NVM_DIR/.lts-status"; then
|
||||
die 'control characters from the mirror were recorded in .lts-status'
|
||||
|
||||
Reference in new issue
Block a user