Commit 480f062c authored by Chris Packham's avatar Chris Packham Committed by Junio C Hamano

git-web--browse: avoid the use of eval

Using eval causes problems when the URL contains an appropriately
escaped ampersand (\&). Dropping eval from the built-in browser
invocation avoids the problem.

Helped-by: Jeff King <peff@peff.net> (test case)
Signed-off-by: Chris Packham's avatarChris Packham <judge.packham@gmail.com>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent f696543d
......@@ -156,7 +156,7 @@ firefox|iceweasel|seamonkey|iceape)
;;
google-chrome|chrome|chromium|chromium-browser)
# No need to specify newTab. It's default in chromium
eval "$browser_path" "$@" &
"$browser_path" "$@" &
;;
konqueror)
case "$(basename "$browser_path")" in
......@@ -164,10 +164,10 @@ konqueror)
# It's simpler to use kfmclient to open a new tab in konqueror.
browser_path="$(echo "$browser_path" | sed -e 's/konqueror$/kfmclient/')"
type "$browser_path" > /dev/null 2>&1 || die "No '$browser_path' found."
eval "$browser_path" newTab "$@"
"$browser_path" newTab "$@" &
;;
kfmclient)
eval "$browser_path" newTab "$@"
"$browser_path" newTab "$@" &
;;
*)
"$browser_path" "$@" &
......@@ -175,7 +175,7 @@ konqueror)
esac
;;
w3m|elinks|links|lynx|open)
eval "$browser_path" "$@"
"$browser_path" "$@"
;;
start)
exec "$browser_path" '"web-browse"' "$@"
......@@ -185,7 +185,7 @@ opera|dillo)
;;
*)
if test -n "$browser_cmd"; then
( eval $browser_cmd "$@" )
( eval "$browser_cmd \"\$@\"" )
fi
;;
esac
#!/bin/sh
#
test_description='git web--browse basic tests
This test checks that git web--browse can handle various valid URLs.'
. ./test-lib.sh
test_expect_success \
'URL with an ampersand in it' '
echo http://example.com/foo\&bar >expect &&
git config browser.custom.cmd echo &&
git web--browse --browser=custom \
http://example.com/foo\&bar >actual &&
test_cmp expect actual
'
test_expect_success \
'URL with a semi-colon in it' '
echo http://example.com/foo\;bar >expect &&
git config browser.custom.cmd echo &&
git web--browse --browser=custom \
http://example.com/foo\;bar >actual &&
test_cmp expect actual
'
test_expect_success \
'URL with a hash in it' '
echo http://example.com/foo#bar >expect &&
git config browser.custom.cmd echo &&
git web--browse --browser=custom \
http://example.com/foo#bar >actual &&
test_cmp expect actual
'
test_expect_success \
'browser paths are properly quoted' '
echo fake: http://example.com/foo >expect &&
cat >"fake browser" <<-\EOF &&
#!/bin/sh
echo fake: "$@"
EOF
chmod +x "fake browser" &&
git config browser.w3m.path "`pwd`/fake browser" &&
git web--browse --browser=w3m \
http://example.com/foo >actual &&
test_cmp expect actual
'
test_expect_success \
'browser command allows arbitrary shell code' '
echo "arg: http://example.com/foo" >expect &&
git config browser.custom.cmd "
f() {
for i in \"\$@\"; do
echo arg: \$i
done
}
f" &&
git web--browse --browser=custom \
http://example.com/foo >actual &&
test_cmp expect actual
'
test_done
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment