go: fix CVE-2025-4673

Proxy-Authorization and Proxy-Authenticate headers persisted on
cross-origin redirects potentially leaking sensitive information.

Reference:
https://nvd.nist.gov/vuln/detail/CVE-2025-4673

Upstream-patch:
https://github.com/golang/go/commit/b897e97c36cb62629a458bc681723ca733404e32

(From OE-Core rev: c07547c19e5372ed5eaac8530b2dd651302542a8)

Signed-off-by: Praveen Kumar <praveen.kumar@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>

2 files changed, 71 insertions, 0 deletions

diff --git a/meta/recipes-devtools/go/go-1.17.13.inc b/meta/recipes-devtools/go/go-1.17.13.inc
index e54205d48c..033f770f64 100644
--- a/meta/recipes-devtools/go/go-1.17.13.inc
+++ b/meta/recipes-devtools/go/go-1.17.13.inc
@@ -63,6 +63,7 @@ SRC_URI += "\
     file://CVE-2024-34158.patch \
     file://CVE-2024-45336.patch \
     file://CVE-2025-22871.patch \
+    file://CVE-2025-4673.patch \
 "
 SRC_URI[main.sha256sum] = "a1a48b23afb206f95e7bbaa9b898d965f90826f6f1d1fc0c1d784ada0cd300fd"
 
diff --git a/meta/recipes-devtools/go/go-1.21/CVE-2025-4673.patch b/meta/recipes-devtools/go/go-1.21/CVE-2025-4673.patch
new file mode 100644
index 0000000000..62864f44ee
--- /dev/null
+++ b/meta/recipes-devtools/go/go-1.21/CVE-2025-4673.patch
@@ -0,0 +1,70 @@
+From b897e97c36cb62629a458bc681723ca733404e32 Mon Sep 17 00:00:00 2001
+From: Neal Patel <nealpatel@google.com>
+Date: Wed, 21 May 2025 14:11:44 -0400
+Subject: [PATCH] net/http: strip sensitive proxy headers from redirect
+ requests
+
+Similarly to Authentication entries, Proxy-Authentication entries should be stripped to ensure sensitive information is not leaked on redirects outside of the original domain.
+
+https://fetch.spec.whatwg.org/#authentication-entries
+
+Thanks to Takeshi Kaneko (GMO Cybersecurity by Ierae, Inc.) for reporting this issue.
+
+Updates golang/go#73816
+Fixes golang/go#73905
+Fixes CVE-2025-4673
+
+Change-Id: I1615f31977a2fd014fbc12aae43f82692315a6d0
+Reviewed-on: https://go-review.googlesource.com/c/go/+/679255
+LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
+Reviewed-by: Michael Knyszek <mknyszek@google.com>
+
+CVE: CVE-2025-4673
+
+Upstream-Status: Backport [https://github.com/golang/go/commit/b897e97c36cb62629a458bc681723ca733404e32]
+
+Signed-off-by: Praveen Kumar <praveen.kumar@windriver.com>
+---
+ src/net/http/client.go      | 3 ++-
+ src/net/http/client_test.go | 5 ++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/net/http/client.go b/src/net/http/client.go
+index 13b6152..d1c9407 100644
+--- a/src/net/http/client.go
++++ b/src/net/http/client.go
+@@ -806,7 +806,8 @@ func (c *Client) makeHeadersCopier(ireq *Request) func(req *Request, stripSensit
+                for k, vv := range ireqhdr {
+                        sensitive := false
+                        switch CanonicalHeaderKey(k) {
+-                       case "Authorization", "Www-Authenticate", "Cookie", "Cookie2":
++                       case "Authorization", "Www-Authenticate", "Cookie", "Cookie2",
++                               "Proxy-Authorization", "Proxy-Authenticate":
+                                sensitive = true
+                        }
+                        if !(sensitive && stripSensitiveHeaders) {
+diff --git a/src/net/http/client_test.go b/src/net/http/client_test.go
+index 8bf1808..66ad370 100644
+--- a/src/net/http/client_test.go
++++ b/src/net/http/client_test.go
+@@ -1562,7 +1562,9 @@ func testClientStripHeadersOnRepeatedRedirect(t *testing.T, mode testMode) {
+                if r.Host+r.URL.Path != "a.example.com/" {
+                        if h := r.Header.Get("Authorization"); h != "" {
+                                t.Errorf("on request to %v%v, Authorization=%q, want no header", r.Host, r.URL.Path, h)
+-                       }
++                      } else if h := r.Header.Get("Proxy-Authorization"); h != "" {
++                              t.Errorf("on request to %v%v, Proxy-Authorization=%q, want no header", r.Host, r.URL.Path, h)
++                      }
+                }
+                // Follow a chain of redirects from a to b and back to a.
+                // The Authorization header is stripped on the first redirect to b,
+@@ -1590,6 +1592,7 @@ func testClientStripHeadersOnRepeatedRedirect(t *testing.T, mode testMode) {
+        req, _ := NewRequest("GET", proto+"://a.example.com/", nil)
+        req.Header.Add("Cookie", "foo=bar")
+        req.Header.Add("Authorization", "secretpassword")
++       req.Header.Add("Proxy-Authorization", "secretpassword")
+        res, err := c.Do(req)
+        if err != nil {
+                t.Fatal(err)
+--
+2.40.0