From f001df540b3fc66a475985c1b7c810e7df063c8f Mon Sep 17 00:00:00 2001 From: Damien Neil Date: Thu, 19 May 2022 12:33:05 -0700 Subject: net/http/httputil: don't insert default User-Agent header in proxied requests When ReverseProxy forwards a request with no User-Agent header, leave the header in the forwarded request blank rather than inserting the default Go HTTP clent User-Agent. We already did this for NewSingleHostReverseProxy; generalize it to every ReverseProxy. Change-Id: Id81a230cb8d384acdfae190b78a4265d80720388 Reviewed-on: https://go-review.googlesource.com/c/go/+/407375 Reviewed-by: Brad Fitzpatrick Run-TryBot: Damien Neil TryBot-Result: Gopher Robot Reviewed-by: Michael Knyszek --- src/net/http/httputil/reverseproxy_test.go | 46 ++++++++++++------------------ 1 file changed, 19 insertions(+), 27 deletions(-) (limited to 'src/net/http/httputil/reverseproxy_test.go') diff --git a/src/net/http/httputil/reverseproxy_test.go b/src/net/http/httputil/reverseproxy_test.go index 23453c8bdc..3090e37582 100644 --- a/src/net/http/httputil/reverseproxy_test.go +++ b/src/net/http/httputil/reverseproxy_test.go @@ -614,46 +614,38 @@ func TestNilBody(t *testing.T) { // Issue 15524 func TestUserAgentHeader(t *testing.T) { - const explicitUA = "explicit UA" + var gotUA string backend := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if r.URL.Path == "/noua" { - if c := r.Header.Get("User-Agent"); c != "" { - t.Errorf("handler got non-empty User-Agent header %q", c) - } - return - } - if c := r.Header.Get("User-Agent"); c != explicitUA { - t.Errorf("handler got unexpected User-Agent header %q", c) - } + gotUA = r.Header.Get("User-Agent") })) defer backend.Close() backendURL, err := url.Parse(backend.URL) if err != nil { t.Fatal(err) } - proxyHandler := NewSingleHostReverseProxy(backendURL) + + proxyHandler := new(ReverseProxy) proxyHandler.ErrorLog = log.New(io.Discard, "", 0) // quiet for tests + proxyHandler.Director = func(req *http.Request) { + req.URL = backendURL + } frontend := httptest.NewServer(proxyHandler) defer frontend.Close() frontendClient := frontend.Client() - getReq, _ := http.NewRequest("GET", frontend.URL, nil) - getReq.Header.Set("User-Agent", explicitUA) - getReq.Close = true - res, err := frontendClient.Do(getReq) - if err != nil { - t.Fatalf("Get: %v", err) - } - res.Body.Close() - - getReq, _ = http.NewRequest("GET", frontend.URL+"/noua", nil) - getReq.Header.Set("User-Agent", "") - getReq.Close = true - res, err = frontendClient.Do(getReq) - if err != nil { - t.Fatalf("Get: %v", err) + for _, sentUA := range []string{"explicit UA", ""} { + getReq, _ := http.NewRequest("GET", frontend.URL, nil) + getReq.Header.Set("User-Agent", sentUA) + getReq.Close = true + res, err := frontendClient.Do(getReq) + if err != nil { + t.Fatalf("Get: %v", err) + } + res.Body.Close() + if got, want := gotUA, sentUA; got != want { + t.Errorf("got forwarded User-Agent %q, want %q", got, want) + } } - res.Body.Close() } type bufferPool struct { -- cgit v1.3-5-g45d5