From d61879cdee072f5901f225d450397fe0f2788280 Mon Sep 17 00:00:00 2001 From: Ashish Jain Date: Sun, 10 Dec 2023 21:36:33 +0530 Subject: [PATCH] go: Fix for net http permit requests invalid Host headers issue Faced issue while connecting to docker-container as got http: invalid host header so providing patch to fix this issue. Issue occurs due to CVE-2023-29406.patch in oe-core layer. Ref: https://go-review.googlesource.com/c/go/+/511155/5/src/net/http/request.go Signed-off-by: Ashish Jain --- meta/recipes-devtools/go/go-1.14.inc | 1 + ...it-request-with-invalid-Host-headers.patch | 108 ++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 meta/recipes-devtools/go/go-1.14/0001-net-http-permit-request-with-invalid-Host-headers.patch diff --git a/meta/recipes-devtools/go/go-1.14.inc b/meta/recipes-devtools/go/go-1.14.inc index 091b778de8e..ed54a801970 100644 --- a/meta/recipes-devtools/go/go-1.14.inc +++ b/meta/recipes-devtools/go/go-1.14.inc @@ -82,6 +82,7 @@ SRC_URI += "\ file://CVE-2023-24536_3.patch \ file://CVE-2023-39318.patch \ file://CVE-2023-39319.patch \ + file://0001-net-http-permit-request-with-invalid-Host-headers.patch \ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" diff --git a/meta/recipes-devtools/go/go-1.14/0001-net-http-permit-request-with-invalid-Host-headers.patch b/meta/recipes-devtools/go/go-1.14/0001-net-http-permit-request-with-invalid-Host-headers.patch new file mode 100644 index 00000000000..331094ad477 --- /dev/null +++ b/meta/recipes-devtools/go/go-1.14/0001-net-http-permit-request-with-invalid-Host-headers.patch @@ -0,0 +1,108 @@ +From 04562b610b07d8bce4f036f345dc5ca71ab3b5b3 Mon Sep 17 00:00:00 2001 +From: Ashish Jain +Date: Tue, 5 Dec 2023 02:16:21 -0600 +Subject: [PATCH] net/http: permit request with invalid Host headers + +Historically, the Transport has silently truncated invalid +Host headers at the first '/' or ' ' character. CL 506996 changed +this behavior to reject invalid Host headers entirely. +Unfortunately, Docker appears to rely on the previous behavior. + +When sending a HTTP/1 request with an invalid Host, send an empty +Host header. This is safer than truncation: If you care about the +Host, then you should get the one you set; if you don't care, +then an empty Host should be fine. + +Continue to fully validate Host headers sent to a proxy, +since proxies generally can't productively forward requests +without a Host. + +For #60374 +Fixes #61431 + +Change-Id: If170c7dd860aa20eb58fe32990fc93af832742b6 +Reviewed-on: https://go-review.googlesource.com/c/go/+/511155 +TryBot-Result: Gopher Robot +Reviewed-by: Roland Shoemaker +Run-TryBot: Damien Neil + +Upstream-Status: Backport from +https://go-review.googlesource.com/c/go/+/511155/5/src/net/http/request.go + +Signed-off-by: Ashish Jain +--- + src/net/http/request.go | 23 ++++++++++++++++++++++- + src/net/http/request_test.go | 17 ++++++++++++----- + 2 files changed, 34 insertions(+), 6 deletions(-) + +diff --git a/src/net/http/request.go b/src/net/http/request.go +index 93f4bf0..4906ca9 100644 +--- a/src/net/http/request.go ++++ b/src/net/http/request.go +@@ -568,8 +568,29 @@ func (r *Request) write(w io.Writer, usingProxy bool, extraHeaders Header, waitF + if err != nil { + return err + } ++ // Validate that the Host header is a valid header in general, ++ // but don't validate the host itself. This is sufficient to avoid ++ // header or request smuggling via the Host field. ++ // The server can (and will, if it's a net/http server) reject ++ // the request if it doesn't consider the host valid. + if !httpguts.ValidHostHeader(host) { +- return errors.New("http: invalid Host header") ++ // Historically, we would truncate the Host header after '/' or ' '. ++ // Some users have relied on this truncation to convert a network ++ // address such as Unix domain socket path into a valid, ignored ++ // Host header (see https://go.dev/issue/61431). ++ // ++ // We don't preserve the truncation, because sending an altered ++ // header field opens a smuggling vector. Instead, zero out the ++ // Host header entirely if it isn't valid. (An empty Host is valid; ++ // see RFC 9112 Section 3.2.) ++ // ++ // Return an error if we're sending to a proxy, since the proxy ++ // probably can't do anything useful with an empty Host header. ++ if !usingProxy { ++ host = "" ++ } else { ++ return errors.New("http: invalid Host header") ++ } + } + + // According to RFC 6874, an HTTP client, proxy, or other +diff --git a/src/net/http/request_test.go b/src/net/http/request_test.go +index 0d417ff..a52da84 100644 +--- a/src/net/http/request_test.go ++++ b/src/net/http/request_test.go +@@ -668,16 +668,23 @@ func TestRequestWriteBufferedWriter(t *testing.T) { + } + } + +-func TestRequestBadHost(t *testing.T) { ++func TestRequestBadHostHeader(t *testing.T) { + got := []string{} + req, err := NewRequest("GET", "http://foo/after", nil) + if err != nil { + t.Fatal(err) + } +- req.Host = "foo.com with spaces" +- req.URL.Host = "foo.com with spaces" +- if err := req.Write(logWrites{t, &got}); err == nil { +- t.Errorf("Writing request with invalid Host: succeded, want error") ++ req.Host = "foo.com\nnewline" ++ req.URL.Host = "foo.com\nnewline" ++ req.Write(logWrites{t, &got}) ++ want := []string{ ++ "GET /after HTTP/1.1\r\n", ++ "Host: \r\n", ++ "User-Agent: " + DefaultUserAgent + "\r\n", ++ "\r\n", ++ } ++ if !reflect.DeepEqual(got, want) { ++ t.Errorf("Writes = %q\n Want = %q", got, want) + } + } + +-- +2.25.1 +