mirror of
https://github.com/curl/curl.git
synced 2026-04-12 00:11:42 +08:00
63e9721b63
- `reply/data*`, `verify/stdout`, `verify/stderr`, `verify/file*`,
`verify/proxy`:
- make `crlf="yes"` force CRLF to all lines, instead of just applying
to HTTP protocol headers.
- add support for `crlf="headers"` that only converts HTTP protocol
header lines to CRLF. (previously done via `crlf="yes"`.)
- use `crlf="headers"` where possible.
- `reply/connect*`:
- add support for `crlf="yes"` and `crlf="headers"`.
- use them where possible.
- `client/file*`, `client/stdin`:
- add support for `crlf="yes"`.
- use it where possible.
- `reply/data*`, `verify/protocol`:
- replace existing uses of `crlf="yes"` with `crlf="headers`" where it
does not change the result.
Reducing the number of `tests/data/test*`:
- CRLF newlines from 10295 to 1985. (119985 lines total)
- files with mixed newlines from 656 to 113. (1890 files total)
After this patch there remain 141 sections with mixed newlines, where
the mixing is not split between headers/non-headers. There is no obvious
pattern here. Some of the CRLF uses might be accidental, or
non-significant. They will be tackled in a future patch.
Follow-up to 6cf3d7b1b1 #19318
Follow-up to 4d2a05d3fe #19284
Closes #19313
121 lines
3.5 KiB
Plaintext
121 lines
3.5 KiB
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
HTTP
|
|
HTTP GET
|
|
HTTP proxy
|
|
HTTP proxy NTLM auth
|
|
HTTP Digest auth
|
|
NTLM
|
|
</keywords>
|
|
</info>
|
|
|
|
# Server-side
|
|
<reply>
|
|
|
|
# this is returned first since we get no proxy-auth
|
|
<data crlf="headers">
|
|
HTTP/1.1 407 Authorization Required to proxy me my dear swsclose
|
|
Proxy-Authenticate: NTLM
|
|
|
|
And you should ignore this data.
|
|
</data>
|
|
|
|
# then this is returned since we get no server-auth
|
|
<data1000 crlf="headers">
|
|
HTTP/1.1 200 Authorizated fine
|
|
Content-Length: 27
|
|
|
|
Welcome to the end station
|
|
</data1000>
|
|
|
|
<data1001 crlf="headers">
|
|
HTTP/1.1 407 NTLM type-1 received sending back type-2
|
|
Server: Microsoft-IIS/5.0
|
|
Content-Length: 34
|
|
Content-Type: text/html; charset=iso-8859-1
|
|
Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
|
|
|
|
This is not the real page either!
|
|
</data1001>
|
|
|
|
# This is supposed to be returned when the server gets the second
|
|
# Authorization: NTLM line passed-in from the client
|
|
<data1002 crlf="headers">
|
|
HTTP/1.1 401 You now need to authenticate with the host
|
|
Server: Microsoft-IIS/5.0
|
|
WWW-Authenticate: Digest realm="r e a l m", nonce="abcdef"
|
|
Content-Length: 46
|
|
Content-Type: text/html; charset=iso-8859-1
|
|
|
|
We have not authenticated with the server yet
|
|
</data1002>
|
|
|
|
<datacheck crlf="headers">
|
|
HTTP/1.1 407 NTLM type-1 received sending back type-2
|
|
Server: Microsoft-IIS/5.0
|
|
Content-Length: 34
|
|
Content-Type: text/html; charset=iso-8859-1
|
|
Proxy-Authenticate: NTLM TlRMTVNTUAACAAAAAgACADAAAACGggEAc51AYVDgyNcAAAAAAAAAAG4AbgAyAAAAQ0MCAAQAQwBDAAEAEgBFAEwASQBTAEEAQgBFAFQASAAEABgAYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAwAsAGUAbABpAHMAYQBiAGUAdABoAC4AYwBjAC4AaQBjAGUAZABlAHYALgBuAHUAAAAAAA==
|
|
|
|
HTTP/1.1 401 You now need to authenticate with the host
|
|
Server: Microsoft-IIS/5.0
|
|
WWW-Authenticate: Digest realm="r e a l m", nonce="abcdef"
|
|
Content-Length: 46
|
|
Content-Type: text/html; charset=iso-8859-1
|
|
|
|
HTTP/1.1 200 Authorizated fine
|
|
Content-Length: 27
|
|
|
|
Welcome to the end station
|
|
</datacheck>
|
|
</reply>
|
|
|
|
# Client-side
|
|
<client>
|
|
<server>
|
|
http
|
|
</server>
|
|
<features>
|
|
NTLM
|
|
SSL
|
|
!SSPI
|
|
proxy
|
|
digest
|
|
</features>
|
|
<name>
|
|
HTTP with proxy-requiring-NTLM to site-requiring-Digest
|
|
</name>
|
|
<command>
|
|
http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%HOSTIP:%HTTPPORT --proxy-user testuser:testpass --proxy-ntlm --digest --user digest:a-lot
|
|
</command>
|
|
</client>
|
|
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
<protocol crlf="headers">
|
|
GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
|
|
Host: data.from.server.requiring.digest.hohoho.com
|
|
Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
Proxy-Connection: Keep-Alive
|
|
|
|
GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
|
|
Host: data.from.server.requiring.digest.hohoho.com
|
|
Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAACAAIAHAAAAALAAsAeAAAAAAAAAAAAAAAhoIBAFpkQwKRCZFMhjj0tw47wEjKHRHlvzfxQamFcheMuv8v+xeqphEO5V41xRd7R9deOXRlc3R1c2VyV09SS1NUQVRJT04=
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
Proxy-Connection: Keep-Alive
|
|
|
|
GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1
|
|
Host: data.from.server.requiring.digest.hohoho.com
|
|
Authorization: Digest username="digest", realm="r e a l m", nonce="abcdef", uri="/%TESTNUMBER", response="89b737a4b6eefde285c093c92e9bd6ea"
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
Proxy-Connection: Keep-Alive
|
|
|
|
</protocol>
|
|
</verify>
|
|
</testcase>
|