From d19edabc66231b6cf3605d3df51e1582fcbbec7a Mon Sep 17 00:00:00 2001 From: Adam Wolfe Gordon Date: Tue, 2 Jun 2020 15:25:22 -0600 Subject: [PATCH] manifests: Return UNSUPPORTED when deleting manifests by tag The OCI distribution spec allows implementations to support deleting manifests by tag, but also permits returning the `UNSUPPORTED` error code for such requests. docker/distribution has never supported deleting manifests by tag, but previously returned `DIGEST_INVALID`. The `Tag` and `Digest` fields of the `manifestHandler` are already correctly populated based on which kind of reference was given in the request URL. Return `UNSUPPORTED` if the `Tag` field is populated. Signed-off-by: Adam Wolfe Gordon --- registry/handlers/manifests.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/registry/handlers/manifests.go b/registry/handlers/manifests.go index e71fe2c3d3f..1fb17813c3a 100644 --- a/registry/handlers/manifests.go +++ b/registry/handlers/manifests.go @@ -485,6 +485,11 @@ func (imh *manifestHandler) applyResourcePolicy(manifest distribution.Manifest) func (imh *manifestHandler) DeleteManifest(w http.ResponseWriter, r *http.Request) { dcontext.GetLogger(imh).Debug("DeleteImageManifest") + if imh.Tag != "" { + imh.Errors = append(imh.Errors, errcode.ErrorCodeUnsupported) + return + } + manifests, err := imh.Repository.Manifests(imh) if err != nil { imh.Errors = append(imh.Errors, err)