2013-11-25 21:03:06 +00:00
|
|
|
# Shell library to run an HTTP server for use in tests.
|
|
|
|
# Ends the test early if httpd tests should not be run,
|
|
|
|
# for example because the user has not enabled them.
|
|
|
|
#
|
|
|
|
# Usage:
|
|
|
|
#
|
|
|
|
# . ./test-lib.sh
|
|
|
|
# . "$TEST_DIRECTORY"/lib-httpd.sh
|
|
|
|
# start_httpd
|
|
|
|
#
|
|
|
|
# test_expect_success '...' '
|
|
|
|
# ...
|
|
|
|
# '
|
|
|
|
#
|
|
|
|
# test_expect_success ...
|
|
|
|
#
|
|
|
|
# stop_httpd
|
|
|
|
# test_done
|
|
|
|
#
|
|
|
|
# Can be configured using the following variables.
|
|
|
|
#
|
|
|
|
# GIT_TEST_HTTPD enable HTTPD tests
|
|
|
|
# LIB_HTTPD_PATH web server path
|
|
|
|
# LIB_HTTPD_MODULE_PATH web server modules path
|
|
|
|
# LIB_HTTPD_PORT listening port
|
|
|
|
# LIB_HTTPD_DAV enable DAV
|
|
|
|
# LIB_HTTPD_SVN enable SVN
|
|
|
|
# LIB_HTTPD_SSL enable SSL
|
2008-02-27 19:28:45 +00:00
|
|
|
#
|
|
|
|
# Copyright (c) 2008 Clemens Buchacher <drizzd@aon.at>
|
|
|
|
#
|
|
|
|
|
|
|
|
if test -z "$GIT_TEST_HTTPD"
|
|
|
|
then
|
2010-06-24 17:44:48 +00:00
|
|
|
skip_all="Network testing disabled (define GIT_TEST_HTTPD to enable)"
|
2008-02-27 19:28:45 +00:00
|
|
|
test_done
|
|
|
|
fi
|
|
|
|
|
t/lib-httpd: require SANITY prereq
Our test httpd setup will not generally run as root, because
Apache will want to setuid, and we do not set up the "User"
config directive. On some systems, like current Debian
unstable, Apache fails to start, and we skip the tests:
$ sudo ./t5539-fetch-http-shallow.sh --debug
1..0 # SKIP web server setup failed
$ cat trash*t5539*/httpd/error.log
[...]
(22)Invalid argument: AH00024: Couldn't set permissions on
the rewrite-map mutex; check User and Group directives
AH00016: Configuration Failed
However, on other systems (reportedly Ubuntu 11.04), Apache
seems to start, and then bails during our tests with:
getpwuid: couldn't determine user name from uid 4294967295,
you probably need to modify the User directive
Child 12037 returned a Fatal error... Apache is exiting!
This may be related to the pre-fork/threading model in use
(note that the second one complains of the child dying).
However, it's not even worth investigating; in either case
we just want to skip the tests, and we already recommend
against running the test suite as root. Let's just
explicitly check this condition and skip the tests rather
than expecting Apache to do the right thing.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-05-10 14:02:59 +00:00
|
|
|
if ! test_have_prereq SANITY; then
|
|
|
|
test_skip_or_die $GIT_TEST_HTTPD \
|
|
|
|
"Cannot run httpd tests as root"
|
|
|
|
fi
|
|
|
|
|
2009-02-25 08:28:15 +00:00
|
|
|
HTTPD_PARA=""
|
|
|
|
|
2010-01-02 22:04:25 +00:00
|
|
|
for DEFAULT_HTTPD_PATH in '/usr/sbin/httpd' '/usr/sbin/apache2'
|
|
|
|
do
|
|
|
|
if test -x "$DEFAULT_HTTPD_PATH"
|
|
|
|
then
|
|
|
|
break
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
|
|
|
for DEFAULT_HTTPD_MODULE_PATH in '/usr/libexec/apache2' \
|
|
|
|
'/usr/lib/apache2/modules' \
|
|
|
|
'/usr/lib64/httpd/modules' \
|
|
|
|
'/usr/lib/httpd/modules'
|
|
|
|
do
|
|
|
|
if test -d "$DEFAULT_HTTPD_MODULE_PATH"
|
|
|
|
then
|
|
|
|
break
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
|
2009-02-25 08:28:15 +00:00
|
|
|
case $(uname) in
|
|
|
|
Darwin)
|
|
|
|
HTTPD_PARA="$HTTPD_PARA -DDarwin"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
LIB_HTTPD_PATH=${LIB_HTTPD_PATH-"$DEFAULT_HTTPD_PATH"}
|
2014-02-10 14:39:48 +00:00
|
|
|
LIB_HTTPD_PORT=${LIB_HTTPD_PORT-${this_test#t}}
|
2008-02-27 19:28:45 +00:00
|
|
|
|
2008-08-08 09:26:28 +00:00
|
|
|
TEST_PATH="$TEST_DIRECTORY"/lib-httpd
|
2008-02-27 19:28:45 +00:00
|
|
|
HTTPD_ROOT_PATH="$PWD"/httpd
|
|
|
|
HTTPD_DOCUMENT_ROOT_PATH=$HTTPD_ROOT_PATH/www
|
|
|
|
|
2012-07-24 13:43:59 +00:00
|
|
|
# hack to suppress apache PassEnv warnings
|
|
|
|
GIT_VALGRIND=$GIT_VALGRIND; export GIT_VALGRIND
|
|
|
|
GIT_VALGRIND_OPTIONS=$GIT_VALGRIND_OPTIONS; export GIT_VALGRIND_OPTIONS
|
|
|
|
|
2008-02-27 19:28:45 +00:00
|
|
|
if ! test -x "$LIB_HTTPD_PATH"
|
|
|
|
then
|
2010-07-08 01:16:06 +00:00
|
|
|
skip_all="skipping test, no web server found at '$LIB_HTTPD_PATH'"
|
2009-01-19 23:43:26 +00:00
|
|
|
test_done
|
2008-02-27 19:28:45 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
HTTPD_VERSION=`$LIB_HTTPD_PATH -v | \
|
|
|
|
sed -n 's/^Server version: Apache\/\([0-9]*\)\..*$/\1/p; q'`
|
|
|
|
|
|
|
|
if test -n "$HTTPD_VERSION"
|
|
|
|
then
|
|
|
|
if test -z "$LIB_HTTPD_MODULE_PATH"
|
|
|
|
then
|
|
|
|
if ! test $HTTPD_VERSION -ge 2
|
|
|
|
then
|
2010-07-08 01:16:06 +00:00
|
|
|
skip_all="skipping test, at least Apache version 2 is required"
|
2008-02-27 19:28:45 +00:00
|
|
|
test_done
|
|
|
|
fi
|
2010-01-02 22:04:25 +00:00
|
|
|
if ! test -d "$DEFAULT_HTTPD_MODULE_PATH"
|
|
|
|
then
|
2010-07-08 01:16:06 +00:00
|
|
|
skip_all="Apache module directory not found. Skipping tests."
|
2010-01-02 22:04:25 +00:00
|
|
|
test_done
|
|
|
|
fi
|
2008-02-27 19:28:45 +00:00
|
|
|
|
2009-02-25 08:28:15 +00:00
|
|
|
LIB_HTTPD_MODULE_PATH="$DEFAULT_HTTPD_MODULE_PATH"
|
2008-02-27 19:28:45 +00:00
|
|
|
fi
|
|
|
|
else
|
|
|
|
error "Could not identify web server at '$LIB_HTTPD_PATH'"
|
|
|
|
fi
|
|
|
|
|
|
|
|
prepare_httpd() {
|
2008-07-07 19:02:37 +00:00
|
|
|
mkdir -p "$HTTPD_DOCUMENT_ROOT_PATH"
|
2010-11-14 01:51:14 +00:00
|
|
|
cp "$TEST_PATH"/passwd "$HTTPD_ROOT_PATH"
|
2013-01-31 21:02:07 +00:00
|
|
|
cp "$TEST_PATH"/broken-smart-http.sh "$HTTPD_ROOT_PATH"
|
2008-02-27 19:28:45 +00:00
|
|
|
|
2008-07-07 19:02:37 +00:00
|
|
|
ln -s "$LIB_HTTPD_MODULE_PATH" "$HTTPD_ROOT_PATH/modules"
|
2008-02-27 19:28:45 +00:00
|
|
|
|
|
|
|
if test -n "$LIB_HTTPD_SSL"
|
|
|
|
then
|
2011-07-18 07:49:12 +00:00
|
|
|
HTTPD_PROTO=https
|
2008-02-27 19:28:45 +00:00
|
|
|
|
|
|
|
RANDFILE_PATH="$HTTPD_ROOT_PATH"/.rnd openssl req \
|
2008-07-07 19:02:37 +00:00
|
|
|
-config "$TEST_PATH/ssl.cnf" \
|
2008-02-27 19:28:45 +00:00
|
|
|
-new -x509 -nodes \
|
2008-07-07 19:02:37 +00:00
|
|
|
-out "$HTTPD_ROOT_PATH/httpd.pem" \
|
|
|
|
-keyout "$HTTPD_ROOT_PATH/httpd.pem"
|
2008-05-04 05:37:58 +00:00
|
|
|
GIT_SSL_NO_VERIFY=t
|
|
|
|
export GIT_SSL_NO_VERIFY
|
2008-02-27 19:28:45 +00:00
|
|
|
HTTPD_PARA="$HTTPD_PARA -DSSL"
|
|
|
|
else
|
2011-07-18 07:49:12 +00:00
|
|
|
HTTPD_PROTO=http
|
2008-02-27 19:28:45 +00:00
|
|
|
fi
|
2011-07-18 07:49:12 +00:00
|
|
|
HTTPD_DEST=127.0.0.1:$LIB_HTTPD_PORT
|
|
|
|
HTTPD_URL=$HTTPD_PROTO://$HTTPD_DEST
|
|
|
|
HTTPD_URL_USER=$HTTPD_PROTO://user%40host@$HTTPD_DEST
|
2014-01-02 07:38:35 +00:00
|
|
|
HTTPD_URL_USER_PASS=$HTTPD_PROTO://user%40host:pass%40host@$HTTPD_DEST
|
2008-02-27 19:28:45 +00:00
|
|
|
|
|
|
|
if test -n "$LIB_HTTPD_DAV" -o -n "$LIB_HTTPD_SVN"
|
|
|
|
then
|
|
|
|
HTTPD_PARA="$HTTPD_PARA -DDAV"
|
|
|
|
|
|
|
|
if test -n "$LIB_HTTPD_SVN"
|
|
|
|
then
|
|
|
|
HTTPD_PARA="$HTTPD_PARA -DSVN"
|
|
|
|
rawsvnrepo="$HTTPD_ROOT_PATH/svnrepo"
|
|
|
|
svnrepo="http://127.0.0.1:$LIB_HTTPD_PORT/svn"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
}
|
|
|
|
|
|
|
|
start_httpd() {
|
2009-02-25 08:32:08 +00:00
|
|
|
prepare_httpd >&3 2>&4
|
2008-02-27 19:28:45 +00:00
|
|
|
|
2009-06-01 12:28:25 +00:00
|
|
|
trap 'code=$?; stop_httpd; (exit $code); die' EXIT
|
2008-02-27 19:28:45 +00:00
|
|
|
|
2008-07-07 19:02:37 +00:00
|
|
|
"$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
|
|
|
|
-f "$TEST_PATH/apache.conf" $HTTPD_PARA \
|
2009-02-25 08:32:08 +00:00
|
|
|
-c "Listen 127.0.0.1:$LIB_HTTPD_PORT" -k start \
|
|
|
|
>&3 2>&4
|
2009-06-01 12:28:25 +00:00
|
|
|
if test $? -ne 0
|
|
|
|
then
|
2010-07-08 01:16:06 +00:00
|
|
|
skip_all="skipping test, web server setup failed"
|
2009-06-01 12:28:25 +00:00
|
|
|
trap 'die' EXIT
|
2009-02-25 08:32:08 +00:00
|
|
|
test_done
|
|
|
|
fi
|
2008-02-27 19:28:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
stop_httpd() {
|
2009-01-19 23:43:26 +00:00
|
|
|
trap 'die' EXIT
|
2008-02-27 19:28:45 +00:00
|
|
|
|
2008-07-07 19:02:37 +00:00
|
|
|
"$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
|
2009-02-25 08:28:15 +00:00
|
|
|
-f "$TEST_PATH/apache.conf" $HTTPD_PARA -k stop
|
2008-02-27 19:28:45 +00:00
|
|
|
}
|
2010-03-02 10:49:26 +00:00
|
|
|
|
2013-08-02 22:14:50 +00:00
|
|
|
test_http_push_nonff () {
|
2010-03-02 10:49:26 +00:00
|
|
|
REMOTE_REPO=$1
|
|
|
|
LOCAL_REPO=$2
|
|
|
|
BRANCH=$3
|
2013-08-02 22:14:50 +00:00
|
|
|
EXPECT_CAS_RESULT=${4-failure}
|
2010-03-02 10:49:26 +00:00
|
|
|
|
|
|
|
test_expect_success 'non-fast-forward push fails' '
|
|
|
|
cd "$REMOTE_REPO" &&
|
|
|
|
HEAD=$(git rev-parse --verify HEAD) &&
|
|
|
|
|
|
|
|
cd "$LOCAL_REPO" &&
|
|
|
|
git checkout $BRANCH &&
|
|
|
|
echo "changed" > path2 &&
|
|
|
|
git commit -a -m path2 --amend &&
|
|
|
|
|
2010-07-20 18:27:55 +00:00
|
|
|
test_must_fail git push -v origin >output 2>&1 &&
|
2010-03-02 10:49:26 +00:00
|
|
|
(cd "$REMOTE_REPO" &&
|
|
|
|
test $HEAD = $(git rev-parse --verify HEAD))
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'non-fast-forward push show ref status' '
|
|
|
|
grep "^ ! \[rejected\][ ]*$BRANCH -> $BRANCH (non-fast-forward)$" output
|
|
|
|
'
|
|
|
|
|
2011-04-12 23:12:47 +00:00
|
|
|
test_expect_success 'non-fast-forward push shows help message' '
|
2012-04-12 17:56:28 +00:00
|
|
|
test_i18ngrep "Updates were rejected because" output
|
2010-03-02 10:49:26 +00:00
|
|
|
'
|
2013-08-01 18:05:02 +00:00
|
|
|
|
2013-09-20 10:25:00 +00:00
|
|
|
test_expect_${EXPECT_CAS_RESULT} 'force with lease aka cas' '
|
2013-08-01 18:05:02 +00:00
|
|
|
HEAD=$( cd "$REMOTE_REPO" && git rev-parse --verify HEAD ) &&
|
|
|
|
test_when_finished '\''
|
|
|
|
(cd "$REMOTE_REPO" && git update-ref HEAD "$HEAD")
|
|
|
|
'\'' &&
|
|
|
|
(
|
|
|
|
cd "$LOCAL_REPO" &&
|
|
|
|
git push -v --force-with-lease=$BRANCH:$HEAD origin
|
|
|
|
) &&
|
|
|
|
git rev-parse --verify "$BRANCH" >expect &&
|
|
|
|
(
|
|
|
|
cd "$REMOTE_REPO" && git rev-parse --verify HEAD
|
|
|
|
) >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
2010-03-02 10:49:26 +00:00
|
|
|
}
|
2012-08-27 13:24:31 +00:00
|
|
|
|
|
|
|
setup_askpass_helper() {
|
|
|
|
test_expect_success 'setup askpass helper' '
|
|
|
|
write_script "$TRASH_DIRECTORY/askpass" <<-\EOF &&
|
|
|
|
echo >>"$TRASH_DIRECTORY/askpass-query" "askpass: $*" &&
|
2014-01-02 07:38:35 +00:00
|
|
|
case "$*" in
|
|
|
|
*Username*)
|
|
|
|
what=user
|
|
|
|
;;
|
|
|
|
*Password*)
|
|
|
|
what=pass
|
|
|
|
;;
|
|
|
|
esac &&
|
|
|
|
cat "$TRASH_DIRECTORY/askpass-$what"
|
2012-08-27 13:24:31 +00:00
|
|
|
EOF
|
|
|
|
GIT_ASKPASS="$TRASH_DIRECTORY/askpass" &&
|
|
|
|
export GIT_ASKPASS &&
|
|
|
|
export TRASH_DIRECTORY
|
|
|
|
'
|
|
|
|
}
|
|
|
|
|
|
|
|
set_askpass() {
|
|
|
|
>"$TRASH_DIRECTORY/askpass-query" &&
|
2014-01-02 07:38:35 +00:00
|
|
|
echo "$1" >"$TRASH_DIRECTORY/askpass-user" &&
|
|
|
|
echo "$2" >"$TRASH_DIRECTORY/askpass-pass"
|
2012-08-27 13:24:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
expect_askpass() {
|
remote-curl: rewrite base url from info/refs redirects
For efficiency and security reasons, an earlier commit in
this series taught http_get_* to re-write the base url based
on redirections we saw while making a specific request.
This commit wires that option into the info/refs request,
meaning that a redirect from
http://example.com/foo.git/info/refs
to
https://example.com/bar.git/info/refs
will behave as if "https://example.com/bar.git" had been
provided to git in the first place.
The tests bear some explanation. We introduce two new
hierearchies into the httpd test config:
1. Requests to /smart-redir-limited will work only for the
initial info/refs request, but not any subsequent
requests. As a result, we can confirm whether the
client is re-rooting its requests after the initial
contact, since otherwise it will fail (it will ask for
"repo.git/git-upload-pack", which is not redirected).
2. Requests to smart-redir-auth will redirect, and require
auth after the redirection. Since we are using the
redirected base for further requests, we also update
the credential struct, in order not to mislead the user
(or credential helpers) about which credential is
needed. We can therefore check the GIT_ASKPASS prompts
to make sure we are prompting for the new location.
Because we have neither multiple servers nor https
support in our test setup, we can only redirect between
paths, meaning we need to turn on
credential.useHttpPath to see the difference.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
2013-09-28 08:35:35 +00:00
|
|
|
dest=$HTTPD_DEST${3+/$3}
|
|
|
|
|
2012-08-27 13:24:31 +00:00
|
|
|
{
|
|
|
|
case "$1" in
|
|
|
|
none)
|
|
|
|
;;
|
|
|
|
pass)
|
|
|
|
echo "askpass: Password for 'http://$2@$dest': "
|
|
|
|
;;
|
|
|
|
both)
|
|
|
|
echo "askpass: Username for 'http://$dest': "
|
|
|
|
echo "askpass: Password for 'http://$2@$dest': "
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
false
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
} >"$TRASH_DIRECTORY/askpass-expect" &&
|
|
|
|
test_cmp "$TRASH_DIRECTORY/askpass-expect" \
|
|
|
|
"$TRASH_DIRECTORY/askpass-query"
|
|
|
|
}
|