Merge pull request #8560 from vismishr/OCPBUGS-86025/fix-http-body-close

OCPBUGS-86025: Close HTTP response bodies to prevent goroutine and connection leaks

Author: openshift-merge-bot[bot]

support/konnectivityproxy/dialer.go

@@ -328,13 +328,15 @@ func (p *konnectivityProxy) DialContext(ctx context.Context, network string, req
 	}
 	if res.StatusCode != http.StatusOK {
 		log.Info("Status code was not 200", "statusCode", res.StatusCode)
+		res.Body.Close()
 		_ = konnectivityConnection.Close()
 		return nil, fmt.Errorf("proxy error from %s while dialing %s: %v", konnectivityServerAddress, requestAddress, res.Status)
 	}
 	// It's safe to discard the bufio.Reader here and return the original TCP conn directly because we only use this
 	// for TLS. In TLS, the client speaks first, so we know there's no unbuffered data, but we can double-check.
 	if br.Buffered() > 0 {
 		log.Info("The response contained buffered data, none expected")
+		res.Body.Close()
 		_ = konnectivityConnection.Close()
 		return nil, fmt.Errorf("unexpected %d bytes of buffered data from CONNECT proxy %q",
 			br.Buffered(), konnectivityServerAddress)

support/konnectivityproxy/proxy_dialer.go

@@ -61,6 +61,7 @@ func (hpd *httpProxyDialer) Dial(network string, addr string) (net.Conn, error)
 	}
 
 	if resp.StatusCode != http.StatusOK {
+		resp.Body.Close()
 		conn.Close()
 		f := strings.SplitN(resp.Status, " ", 2)
 		return nil, errors.New(f[1])