diff options
author | Jhon Honce <jhonce@redhat.com> | 2021-08-09 09:19:21 -0700 |
---|---|---|
committer | Jhon Honce <jhonce@redhat.com> | 2021-08-11 13:50:51 -0700 |
commit | 5a32946d61fd282d0801208ae414111626c79768 (patch) | |
tree | da2f86d0f9b2fd7997a02cbdb853874e47dbdeeb /pkg/api/handlers | |
parent | 7e5a9fdbc0131a2715e9a6d5612e65fb7323c50b (diff) | |
download | podman-5a32946d61fd282d0801208ae414111626c79768.tar.gz podman-5a32946d61fd282d0801208ae414111626c79768.tar.bz2 podman-5a32946d61fd282d0801208ae414111626c79768.zip |
For compatibility, ignore Content-Type
Endpoint /build logs an info entry when a client uses the wrong
Content-Type for build payload. Given Content-Type is ignored and
assumed to be "application/x-tar".
Endpoint /libpod/build will fail unless "application/x-tar" or
"application/tar" is given for Content-Type. "application/tar" will
be logged as an info entry.
Fixes #11012
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'pkg/api/handlers')
-rw-r--r-- | pkg/api/handlers/compat/images_build.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkg/api/handlers/compat/images_build.go b/pkg/api/handlers/compat/images_build.go index 08d1df4b8..0fcca1821 100644 --- a/pkg/api/handlers/compat/images_build.go +++ b/pkg/api/handlers/compat/images_build.go @@ -34,13 +34,16 @@ func BuildImage(w http.ResponseWriter, r *http.Request) { contentType := hdr[0] switch contentType { case "application/tar": - logrus.Warnf("tar file content type is %s, should use \"application/x-tar\" content type", contentType) + logrus.Infof("tar file content type is %s, should use \"application/x-tar\" content type", contentType) case "application/x-tar": break default: - utils.BadRequest(w, "Content-Type", hdr[0], - fmt.Errorf("Content-Type: %s is not supported. Should be \"application/x-tar\"", hdr[0])) - return + if utils.IsLibpodRequest(r) { + utils.BadRequest(w, "Content-Type", hdr[0], + fmt.Errorf("Content-Type: %s is not supported. Should be \"application/x-tar\"", hdr[0])) + return + } + logrus.Infof("tar file content type is %s, should use \"application/x-tar\" content type", contentType) } } |