diff --git a/lib/http.c b/lib/http.c index d2f85fc5bf..d61edbd0cd 100644 --- a/lib/http.c +++ b/lib/http.c @@ -705,6 +705,7 @@ static CURLcode output_auth_headers(struct Curl_easy *data, if(authstatus->picked == CURLAUTH_BEARER) { /* Bearer */ if(!proxy && data->set.str[STRING_BEARER] && + Curl_auth_allowed_to_host(data) && !Curl_checkheaders(data, STRCONST("Authorization"))) { auth = "Bearer"; result = http_output_bearer(data); diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index f39568d3b8..6c8be18b32 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -243,7 +243,7 @@ test1955 test1956 test1957 test1958 test1959 test1960 test1964 \ test1970 test1971 test1972 test1973 test1974 test1975 test1976 test1977 \ test1978 test1979 test1980 test1981 \ \ -test2000 test2001 test2002 test2003 test2004 test2005 \ +test2000 test2001 test2002 test2003 test2004 test2005 test2006 \ \ test2023 \ test2024 test2025 test2026 test2027 test2028 test2029 test2030 test2031 \ diff --git a/tests/data/test2006 b/tests/data/test2006 new file mode 100644 index 0000000000..200d30a7ce --- /dev/null +++ b/tests/data/test2006 @@ -0,0 +1,98 @@ + + + + +netrc +HTTP + + +# Server-side + + +HTTP/1.1 301 Follow this you fool +Date: Tue, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 6 +Connection: close +Location: http://b.com/%TESTNUMBER0002 + +-foo- + + + +HTTP/1.1 200 OK +Date: Tue, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 7 +Connection: close + +target + + + +HTTP/1.1 301 Follow this you fool +Date: Tue, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 6 +Connection: close +Location: http://b.com/%TESTNUMBER0002 + +HTTP/1.1 200 OK +Date: Tue, 09 Nov 2010 14:49:00 GMT +Server: test-server/fake +Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT +ETag: "21025-dc7-39462498" +Accept-Ranges: bytes +Content-Length: 7 +Connection: close + +target + + + +# Client-side + + +http + + +proxy + + +.netrc default with redirect plus oauth2-bearer + + +--netrc --netrc-file %LOGDIR/netrc%TESTNUMBER --oauth2-bearer SECRET_TOKEN -L -x http://%HOSTIP:%HTTPPORT/ http://a.com/ + + +default login testuser password testpass + + + + + +GET http://a.com/ HTTP/1.1 +Host: a.com +Authorization: Bearer SECRET_TOKEN +User-Agent: curl/%VERSION +Accept: */* +Proxy-Connection: Keep-Alive + +GET http://b.com/%TESTNUMBER0002 HTTP/1.1 +Host: b.com +User-Agent: curl/%VERSION +Accept: */* +Proxy-Connection: Keep-Alive + + + +