aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Neil <dneil@google.com>2022-06-01 11:17:07 -0700
committerDamien Neil <dneil@google.com>2022-06-29 20:22:10 +0000
commite5017a93fcde94f09836200bca55324af037ee5f (patch)
treef36e7984dfafff98613209e96bbe56d5009a98d6
parent20760cff001e9acc05627dfeab42ea50b57920e6 (diff)
downloadgo-e5017a93fcde94f09836200bca55324af037ee5f.tar.gz
go-e5017a93fcde94f09836200bca55324af037ee5f.zip
net/http: don't strip whitespace from Transfer-Encoding headers
Do not accept "Transfer-Encoding: \rchunked" as a valid TE header setting chunked encoding. Thanks to Zeyu Zhang (https://www.zeyu2001.com/) for identifying the issue. Fixes #53188 Fixes CVE-2022-1705 Change-Id: I1a16631425159267f2eca68056b057192a7edf6c Reviewed-on: https://go-review.googlesource.com/c/go/+/409874 Reviewed-by: Roland Shoemaker <roland@golang.org> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
-rw-r--r--src/net/http/serve_test.go1
-rw-r--r--src/net/http/transfer.go2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go
index 464e0f734d..cb6312d641 100644
--- a/src/net/http/serve_test.go
+++ b/src/net/http/serve_test.go
@@ -6245,6 +6245,7 @@ func TestUnsupportedTransferEncodingsReturn501(t *testing.T) {
"fugazi",
"foo-bar",
"unknown",
+ "\rchunked",
}
for _, badTE := range unsupportedTEs {
diff --git a/src/net/http/transfer.go b/src/net/http/transfer.go
index 6957b246f3..4583c6b453 100644
--- a/src/net/http/transfer.go
+++ b/src/net/http/transfer.go
@@ -642,7 +642,7 @@ func (t *transferReader) parseTransferEncoding() error {
if len(raw) != 1 {
return &unsupportedTEError{fmt.Sprintf("too many transfer encodings: %q", raw)}
}
- if !ascii.EqualFold(textproto.TrimString(raw[0]), "chunked") {
+ if !ascii.EqualFold(raw[0], "chunked") {
return &unsupportedTEError{fmt.Sprintf("unsupported transfer encoding: %q", raw[0])}
}