diff options
| author | Brent Baude <bbaude@redhat.com> | 2020-06-01 08:59:07 -0500 |
|---|---|---|
| committer | Brent Baude <bbaude@redhat.com> | 2020-06-01 10:07:58 -0500 |
| commit | 8c1883721c28d09c5c3629db7e0d77344f5f7bd9 (patch) | |
| tree | 1d8d325fc307b1054d35628dc8870b9e06407df9 | |
| parent | 22713d62e2860052e21e5e985fba169834709fdc (diff) | |
| download | podman-8c1883721c28d09c5c3629db7e0d77344f5f7bd9.tar.gz podman-8c1883721c28d09c5c3629db7e0d77344f5f7bd9.tar.bz2 podman-8c1883721c28d09c5c3629db7e0d77344f5f7bd9.zip | |
Fix leak of empty tarball
In cases of trying to export an image, if the image was not found, we leaked an empty tarball or directory depending on the format.
Fixes: #6409
Signed-off-by: Brent Baude <bbaude@redhat.com>
| -rw-r--r-- | pkg/api/handlers/libpod/images.go | 13 | ||||
| -rw-r--r-- | test/e2e/images_test.go | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pkg/api/handlers/libpod/images.go b/pkg/api/handlers/libpod/images.go index 4b277d39c..54e202103 100644 --- a/pkg/api/handlers/libpod/images.go +++ b/pkg/api/handlers/libpod/images.go @@ -181,6 +181,12 @@ func ExportImage(w http.ResponseWriter, r *http.Request) { errors.Wrapf(err, "Failed to parse parameters for %s", r.URL.String())) return } + name := utils.GetName(r) + newImage, err := runtime.ImageRuntime().NewFromLocal(name) + if err != nil { + utils.ImageNotFound(w, name, err) + return + } switch query.Format { case define.OCIArchive, define.V2s2Archive: 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)) 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 { utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest, err) return diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go index 1b23aba36..9a073cde6 100644 --- a/test/e2e/images_test.go +++ b/test/e2e/images_test.go @@ -179,7 +179,7 @@ var _ = Describe("Podman images", func() { It("podman images filter before image", func() { SkipIfRemote() 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") result := podmanTest.Podman([]string{"images", "-q", "-f", "before=foobar.com/before:latest"}) |