diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-29 10:37:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-29 10:37:59 -0400 |
| commit | 0c750a9672d8078c655fb95f379600609b36dad4 (patch) | |
| tree | 8ca8f81cdf302b1905d7a56f7c5c76ba5468c6f1 /pkg/api/handlers/compat/images_push.go | |
| parent | 78c38460eb8ba9190d414f2da6a1414990cc6cfd (diff) | |
| parent | dc80267b594e41cf7e223821dc1446683f0cae36 (diff) | |
| download | podman-0c750a9672d8078c655fb95f379600609b36dad4.tar.gz podman-0c750a9672d8078c655fb95f379600609b36dad4.tar.bz2 podman-0c750a9672d8078c655fb95f379600609b36dad4.zip | |
Merge pull request #6207 from vrothberg/auth-header
add X-Registry-Auth header support
Diffstat (limited to 'pkg/api/handlers/compat/images_push.go')
| -rw-r--r-- | pkg/api/handlers/compat/images_push.go | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pkg/api/handlers/compat/images_push.go b/pkg/api/handlers/compat/images_push.go index 2260d5557..47976b7c9 100644 --- a/pkg/api/handlers/compat/images_push.go +++ b/pkg/api/handlers/compat/images_push.go @@ -9,6 +9,7 @@ import ( "github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod/image" "github.com/containers/libpod/pkg/api/handlers/utils" + "github.com/containers/libpod/pkg/auth" "github.com/gorilla/schema" "github.com/pkg/errors" ) @@ -48,13 +49,17 @@ func PushImage(w http.ResponseWriter, r *http.Request) { return } - // TODO: the X-Registry-Auth header is not checked yet here nor in any other - // endpoint. Pushing does NOT work with authentication at the moment. - dockerRegistryOptions := &image.DockerRegistryOptions{} - authfile := "" + authConf, authfile, 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", auth.XRegistryAuthHeader, r.URL.String())) + return + } + defer auth.RemoveAuthfile(authfile) + + dockerRegistryOptions := &image.DockerRegistryOptions{DockerRegistryCreds: authConf} if sys := runtime.SystemContext(); sys != nil { dockerRegistryOptions.DockerCertPath = sys.DockerCertPath - authfile = sys.AuthFilePath + dockerRegistryOptions.RegistriesConfPath = sys.SystemRegistriesConfPath } err = newImage.PushImageToHeuristicDestination( |