2008-02-27 20:28:45 +01:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2008 Clemens Buchacher <drizzd@aon.at>
|
|
|
|
#
|
|
|
|
|
|
|
|
if test -z "$GIT_TEST_HTTPD"
|
|
|
|
then
|
2010-06-24 19:44:48 +02:00
|
|
|
skip_all="Network testing disabled (define GIT_TEST_HTTPD to enable)"
|
2008-02-27 20:28:45 +01:00
|
|
|
test_done
|
|
|
|
fi
|
|
|
|
|
2009-02-25 09:28:15 +01:00
|
|
|
HTTPD_PARA=""
|
|
|
|
|
2010-01-02 23:04:25 +01: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 09:28:15 +01:00
|
|
|
case $(uname) in
|
|
|
|
Darwin)
|
|
|
|
HTTPD_PARA="$HTTPD_PARA -DDarwin"
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
LIB_HTTPD_PATH=${LIB_HTTPD_PATH-"$DEFAULT_HTTPD_PATH"}
|
2008-02-27 20:28:45 +01:00
|
|
|
LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'8111'}
|
|
|
|
|
2008-08-08 11:26:28 +02:00
|
|
|
TEST_PATH="$TEST_DIRECTORY"/lib-httpd
|
2008-02-27 20:28:45 +01:00
|
|
|
HTTPD_ROOT_PATH="$PWD"/httpd
|
|
|
|
HTTPD_DOCUMENT_ROOT_PATH=$HTTPD_ROOT_PATH/www
|
|
|
|
|
2012-07-24 15:43:59 +02: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 20:28:45 +01:00
|
|
|
if ! test -x "$LIB_HTTPD_PATH"
|
|
|
|
then
|
2010-07-08 03:16:06 +02:00
|
|
|
skip_all="skipping test, no web server found at '$LIB_HTTPD_PATH'"
|
2009-01-20 00:43:26 +01:00
|
|
|
test_done
|
2008-02-27 20:28:45 +01: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 03:16:06 +02:00
|
|
|
skip_all="skipping test, at least Apache version 2 is required"
|
2008-02-27 20:28:45 +01:00
|
|
|
test_done
|
|
|
|
fi
|
2010-01-02 23:04:25 +01:00
|
|
|
if ! test -d "$DEFAULT_HTTPD_MODULE_PATH"
|
|
|
|
then
|
2010-07-08 03:16:06 +02:00
|
|
|
skip_all="Apache module directory not found. Skipping tests."
|
2010-01-02 23:04:25 +01:00
|
|
|
test_done
|
|
|
|
fi
|
2008-02-27 20:28:45 +01:00
|
|
|
|
2009-02-25 09:28:15 +01:00
|
|
|
LIB_HTTPD_MODULE_PATH="$DEFAULT_HTTPD_MODULE_PATH"
|
2008-02-27 20:28:45 +01:00
|
|
|
fi
|
|
|
|
else
|
|
|
|
error "Could not identify web server at '$LIB_HTTPD_PATH'"
|
|
|
|
fi
|
|
|
|
|
|
|
|
prepare_httpd() {
|
2008-07-07 21:02:37 +02:00
|
|
|
mkdir -p "$HTTPD_DOCUMENT_ROOT_PATH"
|
2010-11-14 02:51:14 +01:00
|
|
|
cp "$TEST_PATH"/passwd "$HTTPD_ROOT_PATH"
|
2013-01-31 22:02:07 +01:00
|
|
|
cp "$TEST_PATH"/broken-smart-http.sh "$HTTPD_ROOT_PATH"
|
2008-02-27 20:28:45 +01:00
|
|
|
|
2008-07-07 21:02:37 +02:00
|
|
|
ln -s "$LIB_HTTPD_MODULE_PATH" "$HTTPD_ROOT_PATH/modules"
|
2008-02-27 20:28:45 +01:00
|
|
|
|
|
|
|
if test -n "$LIB_HTTPD_SSL"
|
|
|
|
then
|
2011-07-18 09:49:12 +02:00
|
|
|
HTTPD_PROTO=https
|
2008-02-27 20:28:45 +01:00
|
|
|
|
|
|
|
RANDFILE_PATH="$HTTPD_ROOT_PATH"/.rnd openssl req \
|
2008-07-07 21:02:37 +02:00
|
|
|
-config "$TEST_PATH/ssl.cnf" \
|
2008-02-27 20:28:45 +01:00
|
|
|
-new -x509 -nodes \
|
2008-07-07 21:02:37 +02:00
|
|
|
-out "$HTTPD_ROOT_PATH/httpd.pem" \
|
|
|
|
-keyout "$HTTPD_ROOT_PATH/httpd.pem"
|
2008-05-04 07:37:58 +02:00
|
|
|
GIT_SSL_NO_VERIFY=t
|
|
|
|
export GIT_SSL_NO_VERIFY
|
2008-02-27 20:28:45 +01:00
|
|
|
HTTPD_PARA="$HTTPD_PARA -DSSL"
|
|
|
|
else
|
2011-07-18 09:49:12 +02:00
|
|
|
HTTPD_PROTO=http
|
2008-02-27 20:28:45 +01:00
|
|
|
fi
|
2011-07-18 09:49:12 +02: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
|
|
|
|
HTTPD_URL_USER_PASS=$HTTPD_PROTO://user%40host:user%40host@$HTTPD_DEST
|
2008-02-27 20:28:45 +01: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 09:32:08 +01:00
|
|
|
prepare_httpd >&3 2>&4
|
2008-02-27 20:28:45 +01:00
|
|
|
|
2009-06-01 14:28:25 +02:00
|
|
|
trap 'code=$?; stop_httpd; (exit $code); die' EXIT
|
2008-02-27 20:28:45 +01:00
|
|
|
|
2008-07-07 21:02:37 +02:00
|
|
|
"$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
|
|
|
|
-f "$TEST_PATH/apache.conf" $HTTPD_PARA \
|
2009-02-25 09:32:08 +01:00
|
|
|
-c "Listen 127.0.0.1:$LIB_HTTPD_PORT" -k start \
|
|
|
|
>&3 2>&4
|
2009-06-01 14:28:25 +02:00
|
|
|
if test $? -ne 0
|
|
|
|
then
|
2010-07-08 03:16:06 +02:00
|
|
|
skip_all="skipping test, web server setup failed"
|
2009-06-01 14:28:25 +02:00
|
|
|
trap 'die' EXIT
|
2009-02-25 09:32:08 +01:00
|
|
|
test_done
|
|
|
|
fi
|
2008-02-27 20:28:45 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
stop_httpd() {
|
2009-01-20 00:43:26 +01:00
|
|
|
trap 'die' EXIT
|
2008-02-27 20:28:45 +01:00
|
|
|
|
2008-07-07 21:02:37 +02:00
|
|
|
"$LIB_HTTPD_PATH" -d "$HTTPD_ROOT_PATH" \
|
2009-02-25 09:28:15 +01:00
|
|
|
-f "$TEST_PATH/apache.conf" $HTTPD_PARA -k stop
|
2008-02-27 20:28:45 +01:00
|
|
|
}
|
2010-03-02 11:49:26 +01:00
|
|
|
|
2013-08-03 00:14:50 +02:00
|
|
|
test_http_push_nonff () {
|
2010-03-02 11:49:26 +01:00
|
|
|
REMOTE_REPO=$1
|
|
|
|
LOCAL_REPO=$2
|
|
|
|
BRANCH=$3
|
2013-08-03 00:14:50 +02:00
|
|
|
EXPECT_CAS_RESULT=${4-failure}
|
2010-03-02 11:49:26 +01: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 20:27:55 +02:00
|
|
|
test_must_fail git push -v origin >output 2>&1 &&
|
2010-03-02 11:49:26 +01: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-13 01:12:47 +02:00
|
|
|
test_expect_success 'non-fast-forward push shows help message' '
|
2012-04-12 19:56:28 +02:00
|
|
|
test_i18ngrep "Updates were rejected because" output
|
2010-03-02 11:49:26 +01:00
|
|
|
'
|
2013-08-01 20:05:02 +02:00
|
|
|
|
2013-09-20 12:25:00 +02:00
|
|
|
test_expect_${EXPECT_CAS_RESULT} 'force with lease aka cas' '
|
2013-08-01 20:05:02 +02: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 11:49:26 +01:00
|
|
|
}
|
2012-08-27 15:24:31 +02:00
|
|
|
|
|
|
|
setup_askpass_helper() {
|
|
|
|
test_expect_success 'setup askpass helper' '
|
|
|
|
write_script "$TRASH_DIRECTORY/askpass" <<-\EOF &&
|
|
|
|
echo >>"$TRASH_DIRECTORY/askpass-query" "askpass: $*" &&
|
|
|
|
cat "$TRASH_DIRECTORY/askpass-response"
|
|
|
|
EOF
|
|
|
|
GIT_ASKPASS="$TRASH_DIRECTORY/askpass" &&
|
|
|
|
export GIT_ASKPASS &&
|
|
|
|
export TRASH_DIRECTORY
|
|
|
|
'
|
|
|
|
}
|
|
|
|
|
|
|
|
set_askpass() {
|
|
|
|
>"$TRASH_DIRECTORY/askpass-query" &&
|
|
|
|
echo "$*" >"$TRASH_DIRECTORY/askpass-response"
|
|
|
|
}
|
|
|
|
|
|
|
|
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 10:35:35 +02:00
|
|
|
dest=$HTTPD_DEST${3+/$3}
|
|
|
|
|
2012-08-27 15:24:31 +02: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"
|
|
|
|
}
|