Skip to content

fix: BaseService.Request invoked without result does not close http.Response #176

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

Merged
merged 2 commits into from
Feb 23, 2023
Merged

fix: BaseService.Request invoked without result does not close http.Response #176

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a2bb59
fix: BaseService.Request invoked without result does not close http.R…
rafalbigaj Feb 22, 2023
fa4c899
fix: additional tweaks
padamstx Feb 23, 2023
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
10 changes: 7 additions & 3 deletions v5/core/base_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ func (service *BaseService) Request(req *http.Request, result interface{}) (deta

// If debug is enabled, then dump the request.
if GetLogger().IsLogLevelEnabled(LevelDebug) {
buf, dumpErr := httputil.DumpRequestOut(req, req.Body != nil)
buf, dumpErr := httputil.DumpRequestOut(req, !IsNil(req.Body))
if dumpErr == nil {
GetLogger().Debug("Request:\n%s\n", RedactSecrets(string(buf)))
} else {
Expand All @@ -407,7 +407,7 @@ func (service *BaseService) Request(req *http.Request, result interface{}) (deta

// If debug is enabled, then dump the response.
if GetLogger().IsLogLevelEnabled(LevelDebug) {
buf, dumpErr := httputil.DumpResponse(httpResponse, httpResponse.Body != nil)
buf, dumpErr := httputil.DumpResponse(httpResponse, !IsNil(httpResponse.Body))
if err == nil {
GetLogger().Debug("Response:\n%s\n", RedactSecrets(string(buf)))
} else {
Expand All @@ -430,7 +430,7 @@ func (service *BaseService) Request(req *http.Request, result interface{}) (deta
var responseBody []byte

// First, read the response body into a byte array.
if httpResponse.Body != nil {
if !IsNil(httpResponse.Body) {
var readErr error

defer httpResponse.Body.Close() // #nosec G307
Expand Down Expand Up @@ -533,6 +533,10 @@ func (service *BaseService) Request(req *http.Request, result interface{}) (deta
return
}
}
} else if !IsNil(httpResponse.Body) {
// We weren't expecting a response, but we have a reponse body,
// so we need to close it now since we're not going to consume it.
_ = httpResponse.Body.Close()
}

return
Expand Down