s3api: return x-amz-version-id from object tagging on versioned buckets (#12745)

* s3api: return x-amz-version-id from object tagging on versioned buckets

PutObjectTagging, GetObjectTagging and DeleteObjectTagging now report
the version they acted on, "null" for an object written before
versioning was enabled.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_011UpvafvK8JpagF94MHWqwK

* s3api: set the tagging x-amz-version-id only on success

The header was set before the tag-conditioned policy recheck, so a
denied request carried the version id on its AccessDenied response.
Also test the "null" version and require distinct version ids.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_011UpvafvK8JpagF94MHWqwK

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Chris LuandClaude Opus 5.5 authored and GitHub committed 2026-11-18 14:30:55 -08:00
1 parent b1c315b837
commit 1f5cfc7552
2 files changed
+113

No files matched your search

@@ -107,6 +107,9 @@ func (s3a *S3ApiServer) GetObjectTaggingHandler(w http.ResponseWriter, r *http.R
}
}
if versioningConfigured {
setTaggingVersionIdHeader(w, versionId, entry)
}
writeSuccessResponseXML(w, r, FromTags(tags))
}
@@ -273,6 +276,7 @@ func (s3a *S3ApiServer) PutObjectTaggingHandler(w http.ResponseWriter, r *http.R
}
glog.V(3).Infof("PutObjectTaggingHandler: Successfully updated tags for %s/%s", bucket, object)
setTaggingVersionIdHeader(w, versionId, entry)
w.WriteHeader(http.StatusOK)
s3err.PostLog(r, http.StatusOK, s3err.ErrNone)
}
@@ -391,6 +395,7 @@ func (s3a *S3ApiServer) DeleteObjectTaggingHandler(w http.ResponseWriter, r *htt
if !hasDeletion {
// No tags to delete - success
setTaggingVersionIdHeader(w, versionId, entry)
w.WriteHeader(http.StatusNoContent)
s3err.PostLog(r, http.StatusNoContent, s3err.ErrNone)
return
@@ -416,6 +421,17 @@ func (s3a *S3ApiServer) DeleteObjectTaggingHandler(w http.ResponseWriter, r *htt
}
glog.V(3).Infof("DeleteObjectTaggingHandler: Successfully deleted tags for %s/%s", bucket, object)
setTaggingVersionIdHeader(w, versionId, entry)
w.WriteHeader(http.StatusNoContent)
s3err.PostLog(r, http.StatusNoContent, s3err.ErrNone)
}
// setTaggingVersionIdHeader reports the version the tagging request acted on,
// "null" for an object written before versioning was enabled.
func setTaggingVersionIdHeader(w http.ResponseWriter, versionId string, entry *filer_pb.Entry) {
versionId = resolvedSourceVersionId(versionId, entry)
if versionId == "" {
versionId = "null"
}
w.Header().Set("x-amz-version-id", versionId)
}