server: reject a Range start offset equal to the file size (#10898)

This commit is contained in:
Junker der Provinz
2026-08-23 08:20:25 -07:00
committed by GitHub
parent 3b10e43d5d
commit 5ebc9c9f4b
2 changed files with 56 additions and 1 deletions
+1 -1
View File
@@ -62,7 +62,7 @@ func parseRange(s string, size int64) ([]httpRange, error) {
r.length = size - r.start
} else {
i, err := strconv.ParseInt(start, 10, 64)
if err != nil || i > size || i < 0 {
if err != nil || i >= size || i < 0 {
return nil, errors.New("invalid range")
}
r.start = i
@@ -0,0 +1,55 @@
package weed_server
import "testing"
func TestParseRange(t *testing.T) {
const size = int64(10)
tests := []struct {
name string
rangeSpec string
wantErr bool
wantStart int64
wantLen int64
}{
{name: "start within bounds", rangeSpec: "bytes=0-", wantStart: 0, wantLen: 10},
{name: "start at last valid byte", rangeSpec: "bytes=9-", wantStart: 9, wantLen: 1},
{name: "start equal to size is not satisfiable", rangeSpec: "bytes=10-", wantErr: true},
{name: "start past size is not satisfiable", rangeSpec: "bytes=11-", wantErr: true},
{name: "start with explicit end within bounds", rangeSpec: "bytes=2-5", wantStart: 2, wantLen: 4},
{name: "end clamped to the last byte", rangeSpec: "bytes=2-100", wantStart: 2, wantLen: 8},
{name: "suffix range within bounds", rangeSpec: "bytes=-3", wantStart: 7, wantLen: 3},
{name: "suffix range larger than size is clamped, not rejected", rangeSpec: "bytes=-100", wantStart: 0, wantLen: 10},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
ranges, err := parseRange(tt.rangeSpec, size)
if tt.wantErr {
if err == nil {
t.Fatalf("parseRange(%q, %d) = %+v, want an error", tt.rangeSpec, size, ranges)
}
return
}
if err != nil {
t.Fatalf("parseRange(%q, %d) returned unexpected error: %v", tt.rangeSpec, size, err)
}
if len(ranges) != 1 {
t.Fatalf("parseRange(%q, %d) = %d ranges, want 1", tt.rangeSpec, size, len(ranges))
}
if ranges[0].start != tt.wantStart || ranges[0].length != tt.wantLen {
t.Fatalf("parseRange(%q, %d) = {start:%d length:%d}, want {start:%d length:%d}",
tt.rangeSpec, size, ranges[0].start, ranges[0].length, tt.wantStart, tt.wantLen)
}
})
}
}
func TestParseRangeOnEmptyFile(t *testing.T) {
// A zero-length file has no valid byte offsets at all, not even 0, so any
// range request against it must be rejected rather than satisfied with an
// empty range.
if _, err := parseRange("bytes=0-", 0); err == nil {
t.Fatal("parseRange(\"bytes=0-\", 0) = nil error, want an error")
}
}