Skip to content

fix(yurttunnel): avoid reusing pooled bufio.Reader in getResponse #2787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AruneshDwivedi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(yurttunnel): avoid reusing pooled bufio.Reader in getResponse #2787

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions pkg/yurttunnel/server/interceptor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,7 @@ func (ri *RequestInterceptor) ServeHTTP(w http.ResponseWriter, r *http.Request)
func getResponse(r io.Reader) (*http.Response, []byte, error) {
rawResponse := bytes.NewBuffer(make([]byte, 0, 256))
// Save the bytes read while reading the response headers into the rawResponse buffer
br := newBufioReader(io.TeeReader(r, rawResponse))
defer putBufioReader(br)
br := bufio.NewReader(io.TeeReader(r, rawResponse))
resp, err := http.ReadResponse(br, nil)
if err != nil {
return nil, nil, err
Expand Down Expand Up @@ -272,7 +271,6 @@ func isChunked(response *http.Response) bool {
// serverRequest serves the normal requests, e.g., kubectl logs
func serveRequest(tunnelConn net.Conn, w http.ResponseWriter, r *http.Request) {
br := newBufioReader(tunnelConn)
defer putBufioReader(br)
tunnelHTTPResp, err := http.ReadResponse(br, r)
if err != nil {
klogAndHTTPError(w, http.StatusServiceUnavailable, "could not read response from the tunnel: %v", err)
Expand Down