diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-30 16:30:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 16:30:23 +0100 |
| commit | 771f8c628bef17eb183efce8c7ee7a91cbf4087b (patch) | |
| tree | adad2324e3c5f094785a411cb537d8f922a3fafc /pkg/api/handlers/compat/images_push.go | |
| parent | 8de68b170716dd1293c5a044f3e9cfd962fdbfb1 (diff) | |
| parent | 5bdd571b1e46f26e23f030456efb009cbb765e4c (diff) | |
| download | podman-771f8c628bef17eb183efce8c7ee7a91cbf4087b.tar.gz podman-771f8c628bef17eb183efce8c7ee7a91cbf4087b.tar.bz2 podman-771f8c628bef17eb183efce8c7ee7a91cbf4087b.zip | |
Merge pull request #12435 from vrothberg/fix-12320
compat API: allow enforcing short-names resolution to Docker Hub
Diffstat (limited to 'pkg/api/handlers/compat/images_push.go')
| -rw-r--r-- | pkg/api/handlers/compat/images_push.go | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkg/api/handlers/compat/images_push.go b/pkg/api/handlers/compat/images_push.go index 8b6d3d56a..5ecb429ae 100644 --- a/pkg/api/handlers/compat/images_push.go +++ b/pkg/api/handlers/compat/images_push.go @@ -61,12 +61,24 @@ func PushImage(w http.ResponseWriter, r *http.Request) { if query.Tag != "" { imageName += ":" + query.Tag } + if _, err := utils.ParseStorageReference(imageName); err != nil { utils.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest, errors.Wrapf(err, "image source %q is not a containers-storage-transport reference", imageName)) return } + possiblyNormalizedName, err := utils.NormalizeToDockerHub(r, imageName) + if err != nil { + utils.Error(w, "Something went wrong.", http.StatusInternalServerError, errors.Wrap(err, "error normalizing image")) + return + } + imageName = possiblyNormalizedName + if _, _, err := runtime.LibimageRuntime().LookupImage(possiblyNormalizedName, nil); err != nil { + utils.ImageNotFound(w, imageName, errors.Wrapf(err, "failed to find image %s", imageName)) + return + } + authconf, authfile, key, err := auth.GetCredentials(r) if err != nil { utils.Error(w, "Something went wrong.", http.StatusBadRequest, errors.Wrapf(err, "failed to parse %q header for %s", key, r.URL.String())) |