mirror of
https://github.com/git/git.git
synced 2024-11-01 14:57:52 +01:00
ff7a1c677a
Since fd0a8c2e (first appearing in v1.7.0), the
t/t5560-http-backend-noserver.sh test has used a backslash escape
inside a ${} expansion in order to specify a literal '?' character.
Unfortunately the FreeBSD /bin/sh does not interpret this correctly.
In a POSIX compliant shell, the following:
x='one?two?three'
echo "${x#*\?}"
Would be expected to produce this:
two?three
When using the FreeBSD /bin/sh instead you get this:
one?two?three
In fact the FreeBSD /bin/sh treats the backslash as a literal
character to match so that this:
y='one\two\three'
echo "${y#*\?}"
Produces this unexpected value:
wo\three
In this case the backslash is not only treated literally, it also
fails to defeat the special meaning of the '?' character.
Instead, we can use the [...] construct to defeat the special meaning
of the '?' character and match it exactly in a way that works for the
FreeBSD /bin/sh as well as other POSIX /bin/sh implementations.
Changing the example like so:
x='one?two?three'
echo "${x#*[?]}"
Produces the expected output using the FreeBSD /bin/sh.
Therefore, change the use of \? to [?] in order to be compatible with
the FreeBSD /bin/sh which allows t/t5560-http-backend-noserver.sh to
pass on FreeBSD again.
Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
74 lines
1.6 KiB
Bash
Executable file
74 lines
1.6 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='test git-http-backend-noserver'
|
|
. ./test-lib.sh
|
|
|
|
HTTPD_DOCUMENT_ROOT_PATH="$TRASH_DIRECTORY"
|
|
|
|
test_have_prereq GREP_STRIPS_CR && export GREP_OPTIONS=-U
|
|
|
|
run_backend() {
|
|
echo "$2" |
|
|
QUERY_STRING="${1#*[?]}" \
|
|
PATH_TRANSLATED="$HTTPD_DOCUMENT_ROOT_PATH/${1%%[?]*}" \
|
|
git http-backend >act.out 2>act.err
|
|
}
|
|
|
|
GET() {
|
|
REQUEST_METHOD="GET" && export REQUEST_METHOD &&
|
|
run_backend "/repo.git/$1" &&
|
|
sane_unset REQUEST_METHOD &&
|
|
if ! grep "Status" act.out >act
|
|
then
|
|
printf "Status: 200 OK\r\n" >act
|
|
fi
|
|
printf "Status: $2\r\n" >exp &&
|
|
test_cmp exp act
|
|
}
|
|
|
|
POST() {
|
|
REQUEST_METHOD="POST" && export REQUEST_METHOD &&
|
|
CONTENT_TYPE="application/x-$1-request" && export CONTENT_TYPE &&
|
|
run_backend "/repo.git/$1" "$2" &&
|
|
sane_unset REQUEST_METHOD &&
|
|
sane_unset CONTENT_TYPE &&
|
|
if ! grep "Status" act.out >act
|
|
then
|
|
printf "Status: 200 OK\r\n" >act
|
|
fi
|
|
printf "Status: $3\r\n" >exp &&
|
|
test_cmp exp act
|
|
}
|
|
|
|
log_div() {
|
|
return 0
|
|
}
|
|
|
|
. "$TEST_DIRECTORY"/t556x_common
|
|
|
|
expect_aliased() {
|
|
REQUEST_METHOD="GET" && export REQUEST_METHOD &&
|
|
if test $1 = 0; then
|
|
run_backend "$2"
|
|
else
|
|
run_backend "$2" &&
|
|
echo "fatal: '$2': aliased" >exp.err &&
|
|
test_cmp exp.err act.err
|
|
fi
|
|
unset REQUEST_METHOD
|
|
}
|
|
|
|
test_expect_success 'http-backend blocks bad PATH_INFO' '
|
|
config http.getanyfile true &&
|
|
|
|
expect_aliased 0 /repo.git/HEAD &&
|
|
|
|
expect_aliased 1 /repo.git/../HEAD &&
|
|
expect_aliased 1 /../etc/passwd &&
|
|
expect_aliased 1 ../etc/passwd &&
|
|
expect_aliased 1 /etc//passwd &&
|
|
expect_aliased 1 /etc/./passwd &&
|
|
expect_aliased 1 //domain/data.txt
|
|
'
|
|
|
|
test_done
|