mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-09-12 01:20:45 +02:00
8bff3b3213
* fix: reject overflowing needle ID deltas Problem: Parsing a file ID with a delta can wrap a valid maximum needle ID back to zero without returning an error. Root cause: Needle.ParsePath added the parsed uint64 delta without checking whether the sum exceeded the needle ID range. Fix: Compare the delta with the remaining uint64 capacity before addition and return a contextual overflow error when it does not fit. Validation: go test ./weed/storage/needle -run ^TestNeedleParsePathRejectsDeltaOverflow$ -count=1; go test ./weed/storage/needle -count=1; git diff --check 10cdaf381875492a2c752d1038797e96ff18208f..HEAD Co-authored-by: Codex <noreply@openai.com> * fix: propagate needle ID delta parse errors Co-authored-by: Codex <noreply@openai.com> * print the needle id in hex in the delta overflow error * batch delete: keep processing after a cookie mismatch * rust volume: reject overflowing needle id deltas --------- Co-authored-by: Codex <noreply@openai.com> Co-authored-by: Chris Lu <chris.lu@gmail.com>
58 lines
1.5 KiB
Go
58 lines
1.5 KiB
Go
package needle
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/storage/types"
|
|
)
|
|
|
|
func TestParseKeyHash(t *testing.T) {
|
|
testcases := []struct {
|
|
KeyHash string
|
|
ID types.NeedleId
|
|
Cookie types.Cookie
|
|
Err bool
|
|
}{
|
|
// normal
|
|
{"4ed4c8116e41", 0x4ed4, 0xc8116e41, false},
|
|
// cookie with leading zeros
|
|
{"4ed401116e41", 0x4ed4, 0x01116e41, false},
|
|
// odd length
|
|
{"ed400116e41", 0xed4, 0x00116e41, false},
|
|
// uint
|
|
{"fed4c8114ed4c811f0116e41", 0xfed4c8114ed4c811, 0xf0116e41, false},
|
|
// err: too short
|
|
{"4ed4c811", 0, 0, true},
|
|
// err: too long
|
|
{"4ed4c8114ed4c8114ed4c8111", 0, 0, true},
|
|
// err: invalid character
|
|
{"helloworld", 0, 0, true},
|
|
}
|
|
|
|
for _, tc := range testcases {
|
|
if id, cookie, err := ParseNeedleIdCookie(tc.KeyHash); err != nil && !tc.Err {
|
|
t.Fatalf("Parse %s error: %v", tc.KeyHash, err)
|
|
} else if err == nil && tc.Err {
|
|
t.Fatalf("Parse %s expected error got nil", tc.KeyHash)
|
|
} else if id != tc.ID || cookie != tc.Cookie {
|
|
t.Fatalf("Parse %s wrong result. Expected: (%d, %d) got: (%d, %d)", tc.KeyHash, tc.ID, tc.Cookie, id, cookie)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestNeedleParsePathRejectsDeltaOverflow(t *testing.T) {
|
|
var n Needle
|
|
err := n.ParsePath("ffffffffffffffff00000000_1")
|
|
if err == nil {
|
|
t.Fatalf("ParsePath accepted overflowing delta with needle id %d", n.Id)
|
|
}
|
|
}
|
|
|
|
func BenchmarkParseKeyHash(b *testing.B) {
|
|
b.ReportAllocs()
|
|
|
|
for i := 0; i < b.N; i++ {
|
|
ParseNeedleIdCookie("4ed44ed44ed44ed4c8116e41")
|
|
}
|
|
}
|