opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 00:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6447 from baude/v2apitarleak

Browse Source 
Fix leak of empty tarball
This commit is contained in:
OpenShift Merge Robot
2020-06-01 18:00:56 +02:00
committed by GitHub
parent 2c6016f330 8c1883721c
commit f559cec6c0
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/api/handlers/libpod/images.go
View File

@ -181,6 +181,12 @@ func ExportImage(w http.ResponseWriter, r *http.Request) {
errors.Wrapf(err, "Failed to parse parameters for %s", r.URL.String())) errors.Wrapf(err, "Failed to parse parameters for %s", r.URL.String()))
return return
} }
name := utils.GetName(r)
newImage, err := runtime.ImageRuntime().NewFromLocal(name)
if err != nil {
utils.ImageNotFound(w, name, err)
return
}
switch query.Format { switch query.Format {
case define.OCIArchive, define.V2s2Archive: case define.OCIArchive, define.V2s2Archive:
tmpfile, err := ioutil.TempFile("", "api.tar") tmpfile, err := ioutil.TempFile("", "api.tar")
@ -204,13 +210,6 @@ func ExportImage(w http.ResponseWriter, r *http.Request) {
utils.Error(w, "unknown format", http.StatusInternalServerError, errors.Errorf("unknown format %q", query.Format)) utils.Error(w, "unknown format", http.StatusInternalServerError, errors.Errorf("unknown format %q", query.Format))
return return
} }
name := utils.GetName(r)
newImage, err := runtime.ImageRuntime().NewFromLocal(name)
if err != nil {
utils.ImageNotFound(w, name, err)
return
}
if err := newImage.Save(r.Context(), name, query.Format, output, []string{}, false, query.Compress); err != nil { if err := newImage.Save(r.Context(), name, query.Format, output, []string{}, false, query.Compress); err != nil {
utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest, err) utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest, err)
return return

2
test/e2e/images_test.go
View File

@ -179,7 +179,7 @@ var _ = Describe("Podman images", func() {
It("podman images filter before image", func() { It("podman images filter before image", func() {
SkipIfRemote() SkipIfRemote()
dockerfile := `FROM docker.io/library/alpine:latest dockerfile := `FROM docker.io/library/alpine:latest
RUN apk update && apk add man RUN apk update && apk add strace
` `
podmanTest.BuildImage(dockerfile, "foobar.com/before:latest", "false") podmanTest.BuildImage(dockerfile, "foobar.com/before:latest", "false")
result := podmanTest.Podman([]string{"images", "-q", "-f", "before=foobar.com/before:latest"}) result := podmanTest.Podman([]string{"images", "-q", "-f", "before=foobar.com/before:latest"})