mirror of
https://github.com/curl/curl.git
synced 2026-04-12 12:21: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
113 lines
2.9 KiB
Plaintext
113 lines
2.9 KiB
Plaintext
<testcase>
|
|
<info>
|
|
<keywords>
|
|
HTTP
|
|
HTTP GET
|
|
HTTP Digest auth
|
|
followlocation
|
|
</keywords>
|
|
</info>
|
|
|
|
# Server-side
|
|
<reply>
|
|
<data crlf="headers">
|
|
HTTP/1.1 401 authentication please
|
|
Server: Microsoft-IIS/6.0
|
|
WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", qop="auth"
|
|
Content-Type: text/html; charset=iso-8859-1
|
|
Content-Length: 0
|
|
|
|
</data>
|
|
<data1000 crlf="headers">
|
|
HTTP/1.1 302 Thanks for this, but we want to redir you!
|
|
Server: Microsoft-IIS/5.0
|
|
Content-Type: text/html; charset=iso-8859-1
|
|
Location: /%TESTNUMBER0001
|
|
Content-Length: 0
|
|
|
|
</data1000>
|
|
<data1001 crlf="headers">
|
|
HTTP/1.1 404 Not Found
|
|
Server: Microsoft-IIS/5.0
|
|
Content-Type: text/html; charset=iso-8859-1
|
|
Content-Length: 0
|
|
|
|
</data1001>
|
|
|
|
<datacheck crlf="headers">
|
|
HTTP/1.1 401 authentication please
|
|
Server: Microsoft-IIS/6.0
|
|
WWW-Authenticate: Digest realm="testrealm", nonce="1053604144", qop="auth"
|
|
Content-Type: text/html; charset=iso-8859-1
|
|
Content-Length: 0
|
|
|
|
HTTP/1.1 302 Thanks for this, but we want to redir you!
|
|
Server: Microsoft-IIS/5.0
|
|
Content-Type: text/html; charset=iso-8859-1
|
|
Location: /%TESTNUMBER0001
|
|
Content-Length: 0
|
|
|
|
HTTP/1.1 404 Not Found
|
|
Server: Microsoft-IIS/5.0
|
|
Content-Type: text/html; charset=iso-8859-1
|
|
Content-Length: 0
|
|
|
|
</datacheck>
|
|
|
|
</reply>
|
|
|
|
# Client-side
|
|
<client>
|
|
#
|
|
<server>
|
|
http
|
|
</server>
|
|
<features>
|
|
crypto
|
|
digest
|
|
</features>
|
|
<name>
|
|
HTTP GET --digest increasing nonce-count
|
|
</name>
|
|
# This test is to ensure the nonce-count (nc) increases
|
|
# https://github.com/curl/curl/pull/1251
|
|
<command>
|
|
-u auser:apasswd --location --digest http://%HOSTIP:%HTTPPORT/%TESTNUMBER
|
|
</command>
|
|
</client>
|
|
|
|
# Verify data after the test has been "shot"
|
|
<verify>
|
|
|
|
# Reorder the fields in 'Authorization: Digest' header.
|
|
# Since regular and SSPI digest auth header fields may not have the same order
|
|
# or whitespace we homogenize so that both may be tested. Also:
|
|
# - Remove the unique value from cnonce if in RFC format
|
|
# - Remove the unique value from response if in RFC format
|
|
# - Remove quotes from qop="auth" used by SSPI
|
|
# The if statement is one line because runtests evaluates one line at a time.
|
|
<strippart>
|
|
if(s/^(Authorization: Digest )([^\r\n]+)(\r?\n)$//) { $_ = $1 . join(', ', map { s/^(cnonce=)"[a-zA-Z0-9+\/=]+"$/$1REMOVED/; s/^(response=)"[a-f0-9]{32}"$/$1REMOVED/; s/^qop="auth"$/qop=auth/; $_ } sort split(/, */, $2)) . $3; }
|
|
</strippart>
|
|
<protocol crlf="headers">
|
|
GET /%TESTNUMBER HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
|
|
GET /%TESTNUMBER HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
Authorization: Digest cnonce=REMOVED, nc=00000001, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/%TESTNUMBER", username="auser"
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
|
|
GET /%TESTNUMBER0001 HTTP/1.1
|
|
Host: %HOSTIP:%HTTPPORT
|
|
Authorization: Digest cnonce=REMOVED, nc=00000002, nonce="1053604144", qop=auth, realm="testrealm", response=REMOVED, uri="/%TESTNUMBER0001", username="auser"
|
|
User-Agent: curl/%VERSION
|
|
Accept: */*
|
|
|
|
</protocol>
|
|
</verify>
|
|
</testcase>
|