Skip to content

fix(rest): reject blob offsets on non-Puffin delete files #1613

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

Open
fallintoplace wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −0
Open

fix(rest): reject blob offsets on non-Puffin delete files #1613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions catalog/rest/scan_task_decoder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,9 @@ func decodeRESTDeleteFile(
if len(wire.EqualityIDs) != 0 {
return nil, errors.New("position-deletes file must not carry equality-ids")
}
if format != iceberg.PuffinFile && (wire.ContentOffset != nil || wire.ContentSizeInBytes != nil) {
return nil, errors.New("content-offset and content-size-in-bytes are only valid for Puffin deletion vectors")
}
if wire.ContentOffset != nil {
if *wire.ContentOffset < 0 {
return nil, fmt.Errorf("content-offset must be non-negative: %d", *wire.ContentOffset)
Expand Down
22 changes: 22 additions & 0 deletions catalog/rest/scan_task_decoder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,28 @@ func TestDecodeScanTasksRejectsMalformedPayloads(t *testing.T) {
},
want: "must not carry equality-ids",
},
{
name: "non-Puffin position delete with content offset",
mutate: func(w *ScanTasks) {
w.DeleteFiles[0].ContentOffset = int64Ptr(10)
},
want: "only valid for Puffin deletion vectors",
},
{
name: "non-Puffin position delete with content size",
mutate: func(w *ScanTasks) {
w.DeleteFiles[0].ContentSizeInBytes = int64Ptr(20)
},
want: "only valid for Puffin deletion vectors",
},
{
name: "non-Puffin position delete with blob range",
mutate: func(w *ScanTasks) {
w.DeleteFiles[0].ContentOffset = int64Ptr(10)
w.DeleteFiles[0].ContentSizeInBytes = int64Ptr(20)
},
want: "only valid for Puffin deletion vectors",
},
{
name: "puffin missing blob range",
mutate: func(w *ScanTasks) {
Expand Down
Loading