services/object: Allow zero payload ranges

CHANGELOG.md

@@ -37,6 +37,7 @@ Changelog for NeoFS Node
 - New network map support solving the limit of ~320 nodes per network
 - Calculation of VUB for zero hash (#3134)
 - More efficient block header subscription is used now instead of block-based one (#3163)
+- `ObjectService.GetRange(Hash)` ops now handle zero ranges as full payload (#3071)
 
 ### Removed
 - Drop creating new eacl tables with public keys (#3096)

cmd/neofs-cli/modules/object/range.go

@@ -202,10 +202,10 @@
 		}
 
 		if length == 0 {
-			return nil, fmt.Errorf("invalid '%s' range: zero length", vs[i])
-		}
-
-		if offset+length <= offset {
+			if offset != 0 {
+				return nil, fmt.Errorf("invalid '%s' range: zero length with non-zero offset", vs[i])
+			}
+		} else if offset+length <= offset {
 			return nil, fmt.Errorf("invalid '%s' range: uint64 overflow", vs[i])
 		}
 

go.mod

@@ -19,7 +19,7 @@ require (
 	github.com/nspcc-dev/neo-go v0.108.0
 	github.com/nspcc-dev/neofs-api-go/v2 v2.14.1-0.20240827150555-5ce597aa14ea
 	github.com/nspcc-dev/neofs-contract v0.21.0
-	github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.12.0.20250213175709-2dc274a1721b
+	github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.12.0.20250224145523-bf4a81ef7d79
 	github.com/nspcc-dev/tzhash v1.8.2
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/panjf2000/ants/v2 v2.9.0

go.sum

@@ -190,8 +190,8 @@ github.com/nspcc-dev/neofs-api-go/v2 v2.14.1-0.20240827150555-5ce597aa14ea h1:mK
 github.com/nspcc-dev/neofs-api-go/v2 v2.14.1-0.20240827150555-5ce597aa14ea/go.mod h1:YzhD4EZmC9Z/PNyd7ysC7WXgIgURc9uCG1UWDeV027Y=
 github.com/nspcc-dev/neofs-contract v0.21.0 h1:dJkrZr7C8ngMiShwdUl27nbLCGez1KD7W1l7RRXFoN8=
 github.com/nspcc-dev/neofs-contract v0.21.0/go.mod h1:TKR2DJiZCdzq9CPljI101c9S3uK5CsVK5WQrX4C+Y7A=
-github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.12.0.20250213175709-2dc274a1721b h1:xW6QTdAZRnED/2gwlD493c5ILdCtuQvXeeuICSlLt1E=
-github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.12.0.20250213175709-2dc274a1721b/go.mod h1:Hd0zRo7mfGDf/S+yGPnRi9eWipxJNhec2Oik1w7lwQo=
+github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.12.0.20250224145523-bf4a81ef7d79 h1:iJYbi1e7rx1Ga6fjcwH4bQMjuR/cD0VGeTM8wmqmjuM=
+github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.12.0.20250224145523-bf4a81ef7d79/go.mod h1:Hd0zRo7mfGDf/S+yGPnRi9eWipxJNhec2Oik1w7lwQo=
 github.com/nspcc-dev/rfc6979 v0.2.3 h1:QNVykGZ3XjFwM/88rGfV3oj4rKNBy+nYI6jM7q19hDI=
 github.com/nspcc-dev/rfc6979 v0.2.3/go.mod h1:q3sCL1Ed7homjqYK8KmFSzEmm+7Ngyo7PePbZanhaDE=
 github.com/nspcc-dev/tzhash v1.8.2 h1:ebRCbPoEuoqrhC6sSZmrT/jI3h1SzCWakxxV6gp5QAg=

pkg/local_object_storage/blobstor/fstree/fstree.go

@@ -473,9 +473,15 @@ func (t *FSTree) GetRange(addr oid.Address, from uint64, length uint64) ([]byte,
 	}
 
 	payload := obj.Payload()
-	to := from + length
+	pLen := uint64(len(payload))
+	var to uint64
+	if length != 0 {
+		to = from + length
+	} else {
+		to = pLen
+	}
 
-	if pLen := uint64(len(payload)); to < from || pLen < from || pLen < to {
+	if to < from || pLen < from || pLen < to {
 		return nil, logicerr.Wrap(apistatus.ObjectOutOfRange{})
 	}
 

pkg/local_object_storage/blobstor/get_range.go

@@ -11,6 +11,9 @@ import (
 // GetRange reads object payload data from b.
 // If the descriptor is present, only one sub-storage is tried,
 // Otherwise, each sub-storage is tried in order.
+//
+// Zero length is interpreted as requiring full object length independent of the
+// offset.
 func (b *BlobStor) GetRange(addr oid.Address, offset uint64, length uint64, storageID []byte) ([]byte, error) {
 	b.modeMtx.RLock()
 	defer b.modeMtx.RUnlock()

pkg/local_object_storage/blobstor/internal/blobstortest/get_range.go

@@ -54,4 +54,18 @@ func TestGetRange(t *testing.T, cons Constructor, minSize, maxSize uint64) {
 		_, err := s.GetRange(objects[0].addr, 10, math.MaxUint64-2)
 		require.ErrorAs(t, err, new(apistatus.ObjectOutOfRange))
 	})
+
+	t.Run("zero range", func(t *testing.T) {
+		for i := range objects {
+			res, err := s.GetRange(objects[i].addr, 0, 0)
+			require.NoError(t, err)
+			pld := objects[i].obj.Payload()
+			require.Equal(t, pld, res)
+			if off := len(pld) / 2; off > 0 {
+				res, err = s.GetRange(objects[i].addr, uint64(off), 0)
+				require.NoError(t, err)
+				require.Equal(t, pld[off:], res)
+			}
+		}
+	})
 }

pkg/local_object_storage/blobstor/peapod/peapod.go

@@ -372,9 +372,15 @@ func (x *Peapod) GetRange(addr oid.Address, from uint64, length uint64) ([]byte,
 	}
 
 	payload := obj.Payload()
-	to := from + length
+	pLen := uint64(len(payload))
+	var to uint64
+	if length != 0 {
+		to = from + length
+	} else {
+		to = pLen
+	}
 
-	if pLen := uint64(len(payload)); to < from || pLen < from || pLen < to {
+	if to < from || pLen < from || pLen < to {
 		return nil, logicerr.Wrap(apistatus.ObjectOutOfRange{})
 	}
 

pkg/local_object_storage/shard/range.go

@@ -14,6 +14,9 @@
 // GetRange reads part of an object from shard. If skipMeta is specified
 // data will be fetched directly from the blobstor, bypassing metabase.
 //
+// Zero length is interpreted as requiring full object length independent of the
+// offset.
+//
 // Returns any error encountered that
 // did not allow to completely read the object part.
 //
@@ -46,9 +49,15 @@
 		}
 
 		payload := o.Payload()
+		pLen := uint64(len(payload))
 		from := offset
-		to := from + length
-		if pLen := uint64(len(payload)); to < from || pLen < from || pLen < to {
+		var to uint64
+		if length != 0 {
+			to = from + length
+		} else {
+			to = pLen
+		}
+		if to < from || pLen < from || pLen < to {
 			return logicerr.Wrap(apistatus.ObjectOutOfRange{})
 		}
 

pkg/local_object_storage/shard/range_test.go

@@ -95,8 +95,15 @@ func testShardGetRange(t *testing.T, hasWriteCache bool) {
 			if tc.hasErr {
 				require.ErrorAs(t, err, &apistatus.ObjectOutOfRange{})
 			} else {
+				ln := tc.rng.GetLength()
+				var to uint64
+				if ln != 0 {
+					to = tc.rng.GetOffset() + ln
+				} else {
+					to = uint64(len(obj.Payload()))
+				}
 				require.Equal(t,
-					payload[tc.rng.GetOffset():tc.rng.GetOffset()+tc.rng.GetLength()],
+					payload[tc.rng.GetOffset():to],
 					res.Payload())
 			}
 		})

pkg/services/object/get/assemble.go

@@ -111,8 +111,11 @@
 	if rng := exec.ctxRange(); rng != nil {
 		seekOff := rng.GetOffset()
 		seekLen := rng.GetLength()
-		seekTo := seekOff + seekLen
 		parSize := par.PayloadSize()
+		if seekLen == 0 {
+			seekLen = parSize
+		}
+		seekTo := seekOff + seekLen
 
 		if seekTo < seekOff || parSize < seekOff || parSize < seekTo {
 			var errOutOfRange apistatus.ObjectOutOfRange
@@ -138,7 +141,7 @@
 		}
 
 		payload = child.Payload()[from:to]
-		rng.SetLength(rng.GetLength() - to + from)
+		rng.SetLength(seekLen - to + from)
 	} else {
 		payload = child.Payload()
 	}

pkg/services/object/get/assembly_v2.go

@@ -40,6 +40,9 @@
 	}
 
 	exec.collectedObject = lastObj.Parent()
+	if r := exec.ctxRange(); r != nil && r.GetLength() == 0 {
+		r.SetLength(exec.collectedObject.PayloadSize())
+	}
 
 	// copied from V1, and it has the same problems as V1;
 	// see it for comments and optimization suggestions
@@ -58,6 +61,10 @@
 	}
 
 	exec.collectedObject = linkObj.Parent()
+	rng := exec.ctxRange()
+	if rng != nil && rng.GetLength() == 0 {
+		rng.SetLength(exec.collectedObject.PayloadSize())
+	}
 
 	var link objectSDK.Link
 	err := linkObj.ReadLink(&link)
@@ -66,7 +73,7 @@
 		return false
 	}
 
-	if exec.ctxRange() == nil {
+	if rng == nil {
 		// GET case
 
 		if exec.writeCollectedHeader() {
@@ -81,12 +88,13 @@
 	}
 
 	// RANGE case
-
-	rng := exec.ctxRange()
 	seekOff := rng.GetOffset()
 	seekLen := rng.GetLength()
-	seekTo := seekOff + seekLen
 	parSize := linkObj.Parent().PayloadSize()
+	if seekLen == 0 {
+		seekLen = parSize
+	}
+	seekTo := seekOff + seekLen
 
 	if seekTo < seekOff || parSize < seekOff || parSize < seekTo {
 		var errOutOfRange apistatus.ObjectOutOfRange

pkg/services/object/get/prm.go

@@ -3,7 +3,6 @@ package getsvc
 import (
 	"context"
 	"crypto/ecdsa"
-	"errors"
 	"hash"
 
 	coreclient "github.com/nspcc-dev/neofs-node/pkg/core/client"
@@ -25,30 +24,6 @@ type RangePrm struct {
 	rng *object.Range
 }
 
-var (
-	errRangeZeroLength = errors.New("zero range length")
-	errRangeOverflow   = errors.New("range overflow")
-)
-
-// Validate pre-validates `OBJECTRANGE` request's parameters content
-// without access to the requested object's payload.
-func (p RangePrm) Validate() error {
-	if p.rng != nil {
-		off := p.rng.GetOffset()
-		l := p.rng.GetLength()
-
-		if l == 0 {
-			return errRangeZeroLength
-		}
-
-		if off+l <= off {
-			return errRangeOverflow
-		}
-	}
-
-	return nil
-}
-
 // RangeHashPrm groups parameters of GetRange service call.
 type RangeHashPrm struct {
 	commonPrm

pkg/services/object/get/util.go

@@ -152,7 +152,11 @@
 
 				payload := obj.Payload()
 				from := rng.GetOffset()
-				to := from + rng.GetLength()
+				ln := rng.GetLength()
+				if ln == 0 {
+					ln = obj.PayloadSize()
+				}
+				to := from + ln
 
 				if pLen := uint64(len(payload)); to < from || pLen < from || pLen < to {
 					return nil, new(apistatus.ObjectOutOfRange)

pkg/services/object/server.go

@@ -1378,9 +1378,10 @@
 
 	rln := body.Range.GetLength()
 	if rln == 0 { // includes nil range
-		return getsvc.RangePrm{}, errors.New("zero range length")
-	}
-	if body.Range.Offset+rln <= body.Range.Offset {
+		if body.Range.Offset != 0 {
+			return getsvc.RangePrm{}, errors.New("zero range length")
+		} // else whole payload
+	} else if body.Range.Offset+rln <= body.Range.Offset {
 		return getsvc.RangePrm{}, errors.New("range overflow")
 	}