oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

bx509: Make test work with older curl versions

Browse Source 
The --connect-to option is much nicer and better than --resolve for testing,
but for testing against localhost --resolve is good enough and available in
older versions of curl.
This commit is contained in:
Nicolas Williams
2019-12-26 16:37:28 -06:00
parent 1482309565
commit d2542d8261
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/kdc/check-bx509.in
View File

@@ -121,7 +121,7 @@ csr_revoke() {
get_cert() { get_cert() {
url="http://${server}:${bx509port}/bx509?csr=$csr${1}" url="http://${server}:${bx509port}/bx509?csr=$csr${1}"
shift shift
curl -g --connect-to ${server}:${bx509port}:localhost:${bx509port} \ curl -g --resolve ${server}:${bx509port}:127.0.0.1 \
-H "Authorization: Negotiate $token" \ -H "Authorization: Negotiate $token" \
"$@" "$url" "$@" "$url"
} }
@@ -449,7 +449,7 @@ echo "Fetching a Negotiate token"
token=$(KRB5CCNAME=$cache $gsstoken HTTP@$server) token=$(KRB5CCNAME=$cache $gsstoken HTTP@$server)
if (set -vx; if (set -vx;
curl -o negotiate-token -Lgsf \ curl -o negotiate-token -Lgsf \
--connect-to ${server}:${bx509port}:localhost:${bx509port} \ --resolve ${server}:${bx509port}:127.0.0.1 \
-H "Authorization: Negotiate $token" \ -H "Authorization: Negotiate $token" \
"http://${server}:${bx509port}/bnegotiate?target=HTTP%40${server}"); then "http://${server}:${bx509port}/bnegotiate?target=HTTP%40${server}"); then
# bx509 sends us a token w/o a newline for now; we add one because # bx509 sends us a token w/o a newline for now; we add one because
@@ -470,7 +470,7 @@ referer=https://${otherserver}/blah
redirect=$(${rkvis} -h https://${otherserver}/blah?q=whatever) redirect=$(${rkvis} -h https://${otherserver}/blah?q=whatever)
if (set -vx; if (set -vx;
curl -o negotiate-token -Lgsf \ curl -o negotiate-token -Lgsf \
--connect-to ${server}:${bx509port}:localhost:${bx509port} \ --resolve ${server}:${bx509port}:127.0.0.1 \
-H "Authorization: Negotiate $token" \ -H "Authorization: Negotiate $token" \
"http://${server}:${bx509port}/bnegotiate?target=HTTP%40${server}&redirect=${redirect}"); then "http://${server}:${bx509port}/bnegotiate?target=HTTP%40${server}&redirect=${redirect}"); then
echo "Error: /bnegotiate with target and redirect succeeded" echo "Error: /bnegotiate with target and redirect succeeded"
@@ -479,7 +479,7 @@ fi
if (set -vx; if (set -vx;
curl -o negotiate-token -Lgsf \ curl -o negotiate-token -Lgsf \
--connect-to ${server}:${bx509port}:localhost:${bx509port} \ --resolve ${server}:${bx509port}:127.0.0.1 \
-H "Authorization: Negotiate $token" \ -H "Authorization: Negotiate $token" \
"http://${server}:${bx509port}/bnegotiate?redirect=${redirect}"); then "http://${server}:${bx509port}/bnegotiate?redirect=${redirect}"); then
echo "Error: /bnegotiate with redirect but no Referer succeeded" echo "Error: /bnegotiate with redirect but no Referer succeeded"
@@ -490,7 +490,7 @@ referer=http://${otherserver}/blah
redirect=$(${rkvis} -h http://${otherserver}/blah?q=whatever) redirect=$(${rkvis} -h http://${otherserver}/blah?q=whatever)
if (set -vx; if (set -vx;
curl -gsf \ curl -gsf \
--connect-to ${server}:${bx509port}:localhost:${bx509port} \ --resolve ${server}:${bx509port}:127.0.0.1 \
-H "Authorization: Negotiate $token" \ -H "Authorization: Negotiate $token" \
-H "Referer: $referer" \ -H "Referer: $referer" \
"http://${server}:${bx509port}/bnegotiate?redirect=${redirect}"); then "http://${server}:${bx509port}/bnegotiate?redirect=${redirect}"); then
@@ -502,7 +502,7 @@ referer=https://${otherserver}/blah
redirect=$(${rkvis} -h https://${otherserver}/blah?q=whatever) redirect=$(${rkvis} -h https://${otherserver}/blah?q=whatever)
if (set -vx; if (set -vx;
curl -gfs -D curlheaders \ curl -gfs -D curlheaders \
--connect-to ${server}:${bx509port}:localhost:${bx509port} \ --resolve ${server}:${bx509port}:127.0.0.1 \
-H "Authorization: Negotiate $token" \ -H "Authorization: Negotiate $token" \
-H "Referer: $referer" \ -H "Referer: $referer" \
"http://${server}:${bx509port}/bnegotiate?redirect=${redirect}"); then "http://${server}:${bx509port}/bnegotiate?redirect=${redirect}"); then