Merge pull request #5772 from thaJeztah/1.5_backport_fix_missing_body_close

dmcgowan · web-flow · commit 883750151b7c · 2021-07-21T12:04:23.000-07:00
[release/1.5 backport] add missing body.Close() in docker/fetcher and docker/pusher
diff --git a/remotes/docker/fetcher.go b/remotes/docker/fetcher.go
@@ -148,7 +148,7 @@ func (r dockerFetcher) Fetch(ctx context.Context, desc ocispec.Descriptor) (io.R
 	})
 }
 
-func (r dockerFetcher) open(ctx context.Context, req *request, mediatype string, offset int64) (io.ReadCloser, error) {
+func (r dockerFetcher) open(ctx context.Context, req *request, mediatype string, offset int64) (_ io.ReadCloser, retErr error) {
 	req.header.Set("Accept", strings.Join([]string{mediatype, `*/*`}, ", "))
 
 	if offset > 0 {
@@ -162,13 +162,17 @@ func (r dockerFetcher) open(ctx context.Context, req *request, mediatype string,
 	if err != nil {
 		return nil, err
 	}
+	defer func() {
+		if retErr != nil {
+			resp.Body.Close()
+		}
+	}()
 
 	if resp.StatusCode > 299 {
 		// TODO(stevvooe): When doing a offset specific request, we should
 		// really distinguish between a 206 and a 200. In the case of 200, we
 		// can discard the bytes, hiding the seek behavior from the
 		// implementation.
-		defer resp.Body.Close()
 
 		if resp.StatusCode == http.StatusNotFound {
 			return nil, errors.Wrapf(errdefs.ErrNotFound, "content at %v not found", req.String())
diff --git a/remotes/docker/pusher.go b/remotes/docker/pusher.go
@@ -143,13 +143,16 @@ func (p dockerPusher) push(ctx context.Context, desc ocispec.Descriptor, ref str
 						// TODO: Set updated time?
 					},
 				})
+				resp.Body.Close()
 				return nil, errors.Wrapf(errdefs.ErrAlreadyExists, "content %v on remote", desc.Digest)
 			}
 		} else if resp.StatusCode != http.StatusNotFound {
 			err := remoteserrors.NewUnexpectedStatusErr(resp)
 			log.G(ctx).WithField("resp", resp).WithField("body", string(err.(remoteserrors.ErrUnexpectedStatus).Body)).Debug("unexpected response")
+			resp.Body.Close()
 			return nil, err
 		}
+		resp.Body.Close()
 	}
 
 	if isManifest {

Original file line number	Diff line number	Diff line change
`@@ -143,13 +143,16 @@ func (p dockerPusher) push(ctx context.Context, desc ocispec.Descriptor, ref str`
`143`	`143`	`// TODO: Set updated time?`
`144`	`144`	`},`
`145`	`145`	`})`
	`146`	`+ resp.Body.Close()`
`146`	`147`	`return nil, errors.Wrapf(errdefs.ErrAlreadyExists, "content %v on remote", desc.Digest)`
`147`	`148`	`}`
`148`	`149`	`} else if resp.StatusCode != http.StatusNotFound {`
`149`	`150`	`err := remoteserrors.NewUnexpectedStatusErr(resp)`
`150`	`151`	`log.G(ctx).WithField("resp", resp).WithField("body", string(err.(remoteserrors.ErrUnexpectedStatus).Body)).Debug("unexpected response")`
	`152`	`+ resp.Body.Close()`
`151`	`153`	`return nil, err`
`152`	`154`	`}`
	`155`	`+ resp.Body.Close()`
`153`	`156`	`}`
`154`	`157`
`155`	`158`	`if isManifest {`