Skip to content

Commit 906fb60

Browse files
Saadanjum0ljharb
authored andcommitted
[Fix] nvm use: handle regex-special characters in $NVM_DIR
nvm_change_path interpolated `$NVM_DIR` and the new version dir unescaped into grep and sed expressions, so a path containing `&`, `#`, `[`, `*`, etc. corrupted `$PATH` (or made sed fail) when switching versions. Escape them before use.
1 parent e45c2df commit 906fb60

3 files changed

Lines changed: 100 additions & 10 deletions

File tree

‎nvm.sh‎

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,24 +1254,33 @@ nvm_change_path() {
12541254
# if there’s no initial path, just return the supplementary path
12551255
if [ -z "${1-}" ]; then
12561256
nvm_echo "${3-}${2-}"
1257+
return
1258+
fi
1259+
# `${NVM_DIR}` is matched literally, so escape characters that are special in regexes
1260+
local NVM_DIR_RE
1261+
NVM_DIR_RE="$(nvm_echo "${NVM_DIR}" | command sed 's/[][\.*^$+?(){}|]/\\&/g')"
12571262
# if the initial path doesn’t contain an nvm path, prepend the supplementary
12581263
# path
1259-
elif ! nvm_echo "${1-}" | nvm_grep -q "${NVM_DIR}/[^/]*${2-}" \
1260-
&& ! nvm_echo "${1-}" | nvm_grep -q "${NVM_DIR}/versions/[^/]*/[^/]*${2-}"; then
1264+
if ! nvm_echo "${1-}" | nvm_grep -Eq "${NVM_DIR_RE}/[^/]*${2-}" \
1265+
&& ! nvm_echo "${1-}" | nvm_grep -Eq "${NVM_DIR_RE}/versions/[^/]*/[^/]*${2-}"; then
12611266
nvm_echo "${3-}${2-}:${1-}"
12621267
# if the initial path contains BOTH an nvm path (checked for above) and
12631268
# that nvm path is preceded by a system binary path, just prepend the
12641269
# supplementary path instead of replacing it.
12651270
# https://github.com/nvm-sh/nvm/issues/1652#issuecomment-342571223
1266-
elif nvm_echo "${1-}" | nvm_grep -Eq "(^|:)(/usr(/local)?)?${2-}:.*${NVM_DIR}/[^/]*${2-}" \
1267-
|| nvm_echo "${1-}" | nvm_grep -Eq "(^|:)(/usr(/local)?)?${2-}:.*${NVM_DIR}/versions/[^/]*/[^/]*${2-}"; then
1271+
elif nvm_echo "${1-}" | nvm_grep -Eq "(^|:)(/usr(/local)?)?${2-}:.*${NVM_DIR_RE}/[^/]*${2-}" \
1272+
|| nvm_echo "${1-}" | nvm_grep -Eq "(^|:)(/usr(/local)?)?${2-}:.*${NVM_DIR_RE}/versions/[^/]*/[^/]*${2-}"; then
12681273
nvm_echo "${3-}${2-}:${1-}"
12691274
# use sed to replace the existing nvm path with the supplementary path. This
12701275
# preserves the order of the path.
12711276
else
1272-
nvm_echo "${1-}" | command sed \
1273-
-e "s#${NVM_DIR}/[^/]*${2-}[^:]*#${3-}${2-}#" \
1274-
-e "s#${NVM_DIR}/versions/[^/]*/[^/]*${2-}[^:]*#${3-}${2-}#"
1277+
local NVM_DIR_SED
1278+
NVM_DIR_SED="$(nvm_echo "${NVM_DIR_RE}" | command sed 's/#/\\#/g')"
1279+
local NEW_DIR_SED
1280+
NEW_DIR_SED="$(nvm_echo "${3-}" | command sed 's/[\&#]/\\&/g')"
1281+
nvm_echo "${1-}" | command sed -E \
1282+
-e "s#${NVM_DIR_SED}/[^/]*${2-}[^:]*#${NEW_DIR_SED}${2-}#" \
1283+
-e "s#${NVM_DIR_SED}/versions/[^/]*/[^/]*${2-}[^:]*#${NEW_DIR_SED}${2-}#"
12751284
fi
12761285
}
12771286

@@ -3638,14 +3647,29 @@ nvm_has_solaris_binary() {
36383647
fi
36393648
}
36403649

3650+
# replaces every literal occurrence of $2 in $1 with $3; values go through the
3651+
# environment so awk does not interpret backslash escapes or regex characters
3652+
nvm_replace_literal() {
3653+
nvm_echo "${1-}" | NVM_FROM="${2-}" NVM_TO="${3-}" command awk '
3654+
BEGIN { from = ENVIRON["NVM_FROM"]; to = ENVIRON["NVM_TO"]; n = length(from) }
3655+
{
3656+
out = ""; s = $0
3657+
while (n > 0 && (i = index(s, from)) > 0) {
3658+
out = out substr(s, 1, i - 1) to
3659+
s = substr(s, i + n)
3660+
}
3661+
print out s
3662+
}'
3663+
}
3664+
36413665
nvm_sanitize_path() {
36423666
local SANITIZED_PATH
36433667
SANITIZED_PATH="${1-}"
36443668
if [ "_${SANITIZED_PATH}" != "_${NVM_DIR}" ]; then
3645-
SANITIZED_PATH="$(nvm_echo "${SANITIZED_PATH}" | command sed -e "s#${NVM_DIR}#\${NVM_DIR}#g")"
3669+
SANITIZED_PATH="$(nvm_replace_literal "${SANITIZED_PATH}" "${NVM_DIR}" '${NVM_DIR}')"
36463670
fi
36473671
if [ "_${SANITIZED_PATH}" != "_${HOME}" ]; then
3648-
SANITIZED_PATH="$(nvm_echo "${SANITIZED_PATH}" | command sed -e "s#${HOME}#\${HOME}#g")"
3672+
SANITIZED_PATH="$(nvm_replace_literal "${SANITIZED_PATH}" "${HOME}" '${HOME}')"
36493673
fi
36503674
nvm_echo "${SANITIZED_PATH}"
36513675
}
@@ -5426,7 +5450,7 @@ nvm() {
54265450
nvm_install_lock_name nvm_acquire_install_lock nvm_release_install_lock \
54275451
nvm_list_aliases nvm_make_alias nvm_print_alias_file nvm_print_alias_path \
54285452
nvm_print_default_alias nvm_print_formatted_alias nvm_resolve_local_alias \
5429-
nvm_sanitize_path nvm_has_colors nvm_has_italics nvm_process_parameters \
5453+
nvm_replace_literal nvm_sanitize_path nvm_has_colors nvm_has_italics nvm_process_parameters \
54305454
nvm_node_version_has_solaris_binary nvm_iojs_version_has_solaris_binary \
54315455
nvm_curl_libz_support nvm_command_info nvm_is_zsh nvm_stdout_is_terminal \
54325456
nvm_npmrc_bad_news_bears nvm_sanitize_auth_header \
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/sh
2+
3+
die () { echo "$@" ; exit 1; }
4+
5+
: nvm.sh
6+
\. ../../../nvm.sh
7+
8+
for DIR in '/tmp/a&b/.nvm' '/tmp/a#b/.nvm' '/tmp/a[1]/.nvm' '/tmp/a*b/.nvm' '/tmp/a+(b)/.nvm' '/tmp/a.b/.nvm' '/tmp/a\b/.nvm' '/tmp/a$b/.nvm' '/tmp/a|b/.nvm'; do
9+
NVM_DIR="${DIR}"
10+
TEST_PATH="/opt/bin:${NVM_DIR}/versions/node/v4.5.0/bin:/usr/bin"
11+
12+
# replace branch
13+
NEW_PATH="$(nvm_change_path "${TEST_PATH}" "/bin" "${NVM_DIR}/versions/node/v7.1.0")"
14+
EXPECTED="/opt/bin:${NVM_DIR}/versions/node/v7.1.0/bin:/usr/bin"
15+
[ "${NEW_PATH}" = "${EXPECTED}" ] || die "NVM_DIR=${DIR}: expected >${EXPECTED}<, got >${NEW_PATH}<"
16+
17+
# system path precedes the nvm path: prepend instead of replacing
18+
SYSTEM_FIRST_PATH="/usr/bin:${NVM_DIR}/versions/node/v4.5.0/bin"
19+
NEW_PATH="$(nvm_change_path "${SYSTEM_FIRST_PATH}" "/bin" "${NVM_DIR}/versions/node/v7.1.0")"
20+
EXPECTED="${NVM_DIR}/versions/node/v7.1.0/bin:${SYSTEM_FIRST_PATH}"
21+
[ "${NEW_PATH}" = "${EXPECTED}" ] || die "NVM_DIR=${DIR} (system path first): expected >${EXPECTED}<, got >${NEW_PATH}<"
22+
23+
# MANPATH call
24+
TEST_MANPATH="/opt/share/man:${NVM_DIR}/versions/node/v4.5.0/share/man:/usr/share/man"
25+
NEW_PATH="$(nvm_change_path "${TEST_MANPATH}" "/share/man" "${NVM_DIR}/versions/node/v7.1.0")"
26+
EXPECTED="/opt/share/man:${NVM_DIR}/versions/node/v7.1.0/share/man:/usr/share/man"
27+
[ "${NEW_PATH}" = "${EXPECTED}" ] || die "NVM_DIR=${DIR} (MANPATH): expected >${EXPECTED}<, got >${NEW_PATH}<"
28+
done
29+
30+
# `.` in NVM_DIR must be escaped so it matches itself only, not "any character":
31+
# an unrelated path entry that merely looks similar (some other char where the
32+
# `.` is) must be left alone, not mistaken for an nvm path and rewritten.
33+
NVM_DIR="/tmp/a.b/.nvm"
34+
UNRELATED_PATH="/opt/bin:/tmp/aXb/.nvm/versions/node/v4.5.0/bin:/usr/bin"
35+
NEW_PATH="$(nvm_change_path "${UNRELATED_PATH}" "/bin" "${NVM_DIR}/versions/node/v7.1.0")"
36+
EXPECTED="${NVM_DIR}/versions/node/v7.1.0/bin:${UNRELATED_PATH}"
37+
[ "${NEW_PATH}" = "${EXPECTED}" ] || die "unrelated PATH entry /tmp/aXb/.nvm/... should not be touched by NVM_DIR=${NVM_DIR}: expected >${EXPECTED}<, got >${NEW_PATH}<"
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#!/bin/sh
2+
3+
die () { echo "$@" ; exit 1; }
4+
5+
: nvm.sh
6+
\. ../../../nvm.sh
7+
8+
HOME='/home/user'
9+
10+
for DIR in '/tmp/a&b/.nvm' '/tmp/a#b/.nvm' '/tmp/a[1]/.nvm' '/tmp/a*b/.nvm' '/tmp/a+(b)/.nvm' '/tmp/a.b/.nvm' '/tmp/a\b/.nvm' '/tmp/a$b/.nvm' '/tmp/a|b/.nvm'; do
11+
NVM_DIR="${DIR}"
12+
13+
OUTPUT="$(nvm_sanitize_path "${NVM_DIR}/versions/node/v4.5.0")"
14+
EXPECTED='${NVM_DIR}/versions/node/v4.5.0'
15+
[ "${OUTPUT}" = "${EXPECTED}" ] || die "NVM_DIR=${DIR}: expected >${EXPECTED}<, got >${OUTPUT}<"
16+
17+
OUTPUT="$(nvm_sanitize_path "${NVM_DIR}")"
18+
[ "${OUTPUT}" = "${NVM_DIR}" ] || die "NVM_DIR=${DIR}: path equal to NVM_DIR should be left alone, got >${OUTPUT}<"
19+
done
20+
21+
# `.` in NVM_DIR must match itself only, not any character
22+
NVM_DIR='/tmp/a.b/.nvm'
23+
OUTPUT="$(nvm_sanitize_path '/tmp/aXb/.nvm/foo')"
24+
[ "${OUTPUT}" = '/tmp/aXb/.nvm/foo' ] || die "unrelated path was rewritten: >${OUTPUT}<"
25+
26+
# HOME is replaced too
27+
NVM_DIR='/tmp/a#b/.nvm'
28+
OUTPUT="$(nvm_sanitize_path "${HOME}/.npmrc")"
29+
[ "${OUTPUT}" = '${HOME}/.npmrc' ] || die "expected >\${HOME}/.npmrc<, got >${OUTPUT}<"

0 commit comments

Comments
 (0)