Skip to content

Fix ListObjectsV2 pagination snapshot inconsistency #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bootjp merged 2 commits into from
Mar 22, 2026
+17 −12
Merged

Fix ListObjectsV2 pagination snapshot inconsistency #409

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05a1fd6
Initial plan
Copilot Mar 22, 2026
0d17d92
Fix ListObjectsV2 pagination: parse token first, load meta at consist…
Copilot Mar 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions adapter/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,24 @@ func (s *S3Server) deleteObject(w http.ResponseWriter, r *http.Request, bucket s

//nolint:cyclop,gocognit,gocyclo,nestif // ListObjectsV2 combines token validation, shard-stable snapshotting, and delimiter pagination rules.
func (s *S3Server) listObjectsV2(w http.ResponseWriter, r *http.Request, bucket string) {
query := r.URL.Query()
prefix := query.Get("prefix")
delimiter := query.Get("delimiter")
maxKeys := parseS3MaxKeys(query.Get("max-keys"))

// Parse the continuation token first so we can select the final readTS before loading metadata.
// This ensures meta is always loaded at the same snapshot used for the scan.
token, err := decodeS3ContinuationToken(query.Get("continuation-token"))
if err != nil {
writeS3Error(w, http.StatusBadRequest, "InvalidArgument", "invalid continuation token", bucket, "")
return
}

readTS := s.readTS()
if token != nil && token.ReadTS != 0 {
readTS = token.ReadTS
}

meta, exists, err := s.loadBucketMetaAt(r.Context(), bucket, readTS)
if err != nil {
writeS3InternalError(w, err)
Expand All @@ -757,23 +774,11 @@ func (s *S3Server) listObjectsV2(w http.ResponseWriter, r *http.Request, bucket
return
}

query := r.URL.Query()
prefix := query.Get("prefix")
delimiter := query.Get("delimiter")
maxKeys := parseS3MaxKeys(query.Get("max-keys"))
token, err := decodeS3ContinuationToken(query.Get("continuation-token"))
if err != nil {
writeS3Error(w, http.StatusBadRequest, "InvalidArgument", "invalid continuation token", bucket, "")
return
}
if token != nil {
if token.Bucket != bucket || token.Generation != meta.Generation || token.Prefix != prefix || token.Delimiter != delimiter {
writeS3Error(w, http.StatusBadRequest, "InvalidArgument", "continuation token does not match request", bucket, "")
return
}
if token.ReadTS != 0 {
readTS = token.ReadTS
}
}
readPin := s.pinReadTS(readTS)
defer readPin.Release()
Expand Down
Loading