t5563: refactor for multi-stage authentication

Some HTTP authentication schemes, such as NTLM- and Kerberos-based
options, require more than one round trip to authenticate.  Currently,
these can only be supported in libcurl, since Git does not have support
for this in the credential helper protocol.

However, in a future commit, we'll add support for this functionality
into the credential helper protocol and Git itself. Because we don't
really want to implement either NTLM or Kerberos, both of which are
complex protocols, we'll want to test this using a fake credential
authentication scheme.  In order to do so, update t5563 and its backend
to allow us to accept multiple sets of credentials and respond with
different behavior in each case.

Since we can now provide any number of possible status codes, provide a
non-specific reason phrase so we don't have to generate a more specific
one based on the response.  The reason phrase is mandatory according to
the status-line production in RFC 7230, but clients SHOULD ignore it,
and curl does (except to print it).

Each entry in the authorization and challenge fields contains an ID,
which indicates a corresponding credential and response.  If the
response is a 200 status, then we continue to execute git-http-backend.
Otherwise, we print the corresponding status and response.  If no ID is
matched, we use the default response with a status of 401.

Note that there is an implicit order to the parameters.  The ID is
always first and the creds or response value is always last, and
therefore may contain spaces, equals signs, or other arbitrary data.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/lib-httpd/nph-custom-auth.sh b/t/lib-httpd/nph-custom-auth.sh
index f5345e775e419733866570442f8effb48d1c55d2..d408d2caadb63dfe603ac8e01dc3897d2d328b50 100644 (file)
--- a/t/lib-httpd/nph-custom-auth.sh
+++ b/t/lib-httpd/nph-custom-auth.sh
@@ -19,21 +19,30 @@ CHALLENGE_FILE=custom-auth.challenge
 #
 
 if test -n "$HTTP_AUTHORIZATION" && \
-       grep -Fqsx "${HTTP_AUTHORIZATION}" "$VALID_CREDS_FILE"
+       grep -Fqs "creds=${HTTP_AUTHORIZATION}" "$VALID_CREDS_FILE"
 then
+       idno=$(grep -F "creds=${HTTP_AUTHORIZATION}" "$VALID_CREDS_FILE" | sed -e 's/^id=\([a-z0-9-][a-z0-9-]*\) .*$/\1/')
+       status=$(sed -ne "s/^id=$idno.*status=\\([0-9][0-9][0-9]\\).*\$/\\1/p" "$CHALLENGE_FILE" | head -n1)
        # Note that although git-http-backend returns a status line, it
        # does so using a CGI 'Status' header. Because this script is an
        # No Parsed Headers (NPH) script, we must return a real HTTP
        # status line.
        # This is only a test script, so we don't bother to check for
        # the actual status from git-http-backend and always return 200.
-       echo 'HTTP/1.1 200 OK'
-       exec "$GIT_EXEC_PATH"/git-http-backend
+       echo "HTTP/1.1 $status Nonspecific Reason Phrase"
+       if test "$status" -eq 200
+       then
+               exec "$GIT_EXEC_PATH"/git-http-backend
+       else
+               sed -ne "s/^id=$idno.*response=//p" "$CHALLENGE_FILE"
+               echo
+               exit
+       fi
 fi
 
 echo 'HTTP/1.1 401 Authorization Required'
 if test -f "$CHALLENGE_FILE"
 then
-       cat "$CHALLENGE_FILE"
+       sed -ne 's/^id=default.*response=//p' "$CHALLENGE_FILE"
 fi
 echo

diff --git a/t/t5563-simple-http-auth.sh b/t/t5563-simple-http-auth.sh
index b098cd0fdf489c72aafe7061945e9ed8f7ccc899..515185ae00d91baadde1df38ff6aedfeac88f070 100755 (executable)
--- a/t/t5563-simple-http-auth.sh
+++ b/t/t5563-simple-http-auth.sh
@@ -63,11 +63,12 @@ test_expect_success 'access using basic auth' '
 
        # Basic base64(alice:secret-passwd)
        cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF &&
-       Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
+       id=1 creds=Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
        EOF
 
        cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF &&
-       WWW-Authenticate: Basic realm="example.com"
+       id=1 status=200
+       id=default response=WWW-Authenticate: Basic realm="example.com"
        EOF
 
        test_config_global credential.helper test-helper &&
@@ -100,11 +101,12 @@ test_expect_success 'access using basic auth via authtype' '
 
        # Basic base64(alice:secret-passwd)
        cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF &&
-       Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
+       id=1 creds=Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
        EOF
 
        cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF &&
-       WWW-Authenticate: Basic realm="example.com"
+       id=1 status=200
+       id=default response=WWW-Authenticate: Basic realm="example.com"
        EOF
 
        test_config_global credential.helper test-helper &&
@@ -137,11 +139,12 @@ test_expect_success 'access using basic auth invalid credentials' '
 
        # Basic base64(alice:secret-passwd)
        cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF &&
-       Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
+       id=1 creds=Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
        EOF
 
        cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF &&
-       WWW-Authenticate: Basic realm="example.com"
+       id=1 status=200
+       id=default response=WWW-Authenticate: Basic realm="example.com"
        EOF
 
        test_config_global credential.helper test-helper &&
@@ -174,13 +177,14 @@ test_expect_success 'access using basic auth with extra challenges' '
 
        # Basic base64(alice:secret-passwd)
        cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF &&
-       Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
+       id=1 creds=Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
        EOF
 
        cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF &&
-       WWW-Authenticate: FooBar param1="value1" param2="value2"
-       WWW-Authenticate: Bearer authorize_uri="id.example.com" p=1 q=0
-       WWW-Authenticate: Basic realm="example.com"
+       id=1 status=200
+       id=default response=WWW-Authenticate: FooBar param1="value1" param2="value2"
+       id=default response=WWW-Authenticate: Bearer authorize_uri="id.example.com" p=1 q=0
+       id=default response=WWW-Authenticate: Basic realm="example.com"
        EOF
 
        test_config_global credential.helper test-helper &&
@@ -214,13 +218,14 @@ test_expect_success 'access using basic auth mixed-case wwwauth header name' '
 
        # Basic base64(alice:secret-passwd)
        cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF &&
-       Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
+       id=1 creds=Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
        EOF
 
        cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF &&
-       www-authenticate: foobar param1="value1" param2="value2"
-       WWW-AUTHENTICATE: BEARER authorize_uri="id.example.com" p=1 q=0
-       WwW-aUtHeNtIcAtE: baSiC realm="example.com"
+       id=1 status=200
+       id=default response=www-authenticate: foobar param1="value1" param2="value2"
+       id=default response=WWW-AUTHENTICATE: BEARER authorize_uri="id.example.com" p=1 q=0
+       id=default response=WwW-aUtHeNtIcAtE: baSiC realm="example.com"
        EOF
 
        test_config_global credential.helper test-helper &&
@@ -254,18 +259,19 @@ test_expect_success 'access using basic auth with wwwauth header continuations'
 
        # Basic base64(alice:secret-passwd)
        cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF &&
-       Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
+       id=1 creds=Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
        EOF
 
        # Note that leading and trailing whitespace is important to correctly
        # simulate a continuation/folded header.
        cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF &&
-       WWW-Authenticate: FooBar param1="value1"
-        param2="value2"
-       WWW-Authenticate: Bearer authorize_uri="id.example.com"
-        p=1
-        q=0
-       WWW-Authenticate: Basic realm="example.com"
+       id=1 status=200
+       id=default response=WWW-Authenticate: FooBar param1="value1"
+       id=default response= param2="value2"
+       id=default response=WWW-Authenticate: Bearer authorize_uri="id.example.com"
+       id=default response= p=1
+       id=default response= q=0
+       id=default response=WWW-Authenticate: Basic realm="example.com"
        EOF
 
        test_config_global credential.helper test-helper &&
@@ -299,21 +305,22 @@ test_expect_success 'access using basic auth with wwwauth header empty continuat
 
        # Basic base64(alice:secret-passwd)
        cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF &&
-       Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
+       id=1 creds=Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
        EOF
 
        CHALLENGE="$HTTPD_ROOT_PATH/custom-auth.challenge" &&
 
        # Note that leading and trailing whitespace is important to correctly
        # simulate a continuation/folded header.
-       printf "WWW-Authenticate: FooBar param1=\"value1\"\r\n" >"$CHALLENGE" &&
-       printf " \r\n" >>"$CHALLENGE" &&
-       printf " param2=\"value2\"\r\n" >>"$CHALLENGE" &&
-       printf "WWW-Authenticate: Bearer authorize_uri=\"id.example.com\"\r\n" >>"$CHALLENGE" &&
-       printf " p=1\r\n" >>"$CHALLENGE" &&
-       printf " \r\n" >>"$CHALLENGE" &&
-       printf " q=0\r\n" >>"$CHALLENGE" &&
-       printf "WWW-Authenticate: Basic realm=\"example.com\"\r\n" >>"$CHALLENGE" &&
+       printf "id=1 status=200\n" >"$CHALLENGE" &&
+       printf "id=default response=WWW-Authenticate: FooBar param1=\"value1\"\r\n" >>"$CHALLENGE" &&
+       printf "id=default response= \r\n" >>"$CHALLENGE" &&
+       printf "id=default response= param2=\"value2\"\r\n" >>"$CHALLENGE" &&
+       printf "id=default response=WWW-Authenticate: Bearer authorize_uri=\"id.example.com\"\r\n" >>"$CHALLENGE" &&
+       printf "id=default response= p=1\r\n" >>"$CHALLENGE" &&
+       printf "id=default response= \r\n" >>"$CHALLENGE" &&
+       printf "id=default response= q=0\r\n" >>"$CHALLENGE" &&
+       printf "id=default response=WWW-Authenticate: Basic realm=\"example.com\"\r\n" >>"$CHALLENGE" &&
 
        test_config_global credential.helper test-helper &&
        git ls-remote "$HTTPD_URL/custom_auth/repo.git" &&
@@ -346,17 +353,18 @@ test_expect_success 'access using basic auth with wwwauth header mixed line-endi
 
        # Basic base64(alice:secret-passwd)
        cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF &&
-       Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
+       id=1 creds=Basic YWxpY2U6c2VjcmV0LXBhc3N3ZA==
        EOF
 
        CHALLENGE="$HTTPD_ROOT_PATH/custom-auth.challenge" &&
 
        # Note that leading and trailing whitespace is important to correctly
        # simulate a continuation/folded header.
-       printf "WWW-Authenticate: FooBar param1=\"value1\"\r\n" >"$CHALLENGE" &&
-       printf " \r\n" >>"$CHALLENGE" &&
-       printf "\tparam2=\"value2\"\r\n" >>"$CHALLENGE" &&
-       printf "WWW-Authenticate: Basic realm=\"example.com\"" >>"$CHALLENGE" &&
+       printf "id=1 status=200\n" >"$CHALLENGE" &&
+       printf "id=default response=WWW-Authenticate: FooBar param1=\"value1\"\r\n" >>"$CHALLENGE" &&
+       printf "id=default response= \r\n" >>"$CHALLENGE" &&
+       printf "id=default response=\tparam2=\"value2\"\r\n" >>"$CHALLENGE" &&
+       printf "id=default response=WWW-Authenticate: Basic realm=\"example.com\"" >>"$CHALLENGE" &&
 
        test_config_global credential.helper test-helper &&
        git ls-remote "$HTTPD_URL/custom_auth/repo.git" &&
@@ -389,15 +397,16 @@ test_expect_success 'access using bearer auth' '
 
        # Basic base64(a-git-token)
        cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF &&
-       Bearer YS1naXQtdG9rZW4=
+       id=1 creds=Bearer YS1naXQtdG9rZW4=
        EOF
 
        CHALLENGE="$HTTPD_ROOT_PATH/custom-auth.challenge" &&
 
        cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF &&
-       WWW-Authenticate: FooBar param1="value1" param2="value2"
-       WWW-Authenticate: Bearer authorize_uri="id.example.com" p=1 q=0
-       WWW-Authenticate: Basic realm="example.com"
+       id=1 status=200
+       id=default response=WWW-Authenticate: FooBar param1="value1" param2="value2"
+       id=default response=WWW-Authenticate: Bearer authorize_uri="id.example.com" p=1 q=0
+       id=default response=WWW-Authenticate: Basic realm="example.com"
        EOF
 
        test_config_global credential.helper test-helper &&
@@ -433,15 +442,16 @@ test_expect_success 'access using bearer auth with invalid credentials' '
 
        # Basic base64(a-git-token)
        cat >"$HTTPD_ROOT_PATH/custom-auth.valid" <<-EOF &&
-       Bearer YS1naXQtdG9rZW4=
+       id=1 creds=Bearer YS1naXQtdG9rZW4=
        EOF
 
        CHALLENGE="$HTTPD_ROOT_PATH/custom-auth.challenge" &&
 
        cat >"$HTTPD_ROOT_PATH/custom-auth.challenge" <<-EOF &&
-       WWW-Authenticate: FooBar param1="value1" param2="value2"
-       WWW-Authenticate: Bearer authorize_uri="id.example.com" p=1 q=0
-       WWW-Authenticate: Basic realm="example.com"
+       id=1 status=200
+       id=default response=WWW-Authenticate: FooBar param1="value1" param2="value2"
+       id=default response=WWW-Authenticate: Bearer authorize_uri="id.example.com" p=1 q=0
+       id=default response=WWW-Authenticate: Basic realm="example.com"
        EOF
 
        test_config_global credential.helper test-helper &&