Skip to content

Fix verify max datasize for collections #11

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
mdogan merged 1 commit into from
Feb 13, 2026
Merged

Fix verify max datasize for collections #11

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
87 changes: 47 additions & 40 deletions verify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,28 +178,46 @@ type verifier struct {
dataSize int
}

func (v *verifier) HashWithExpEntryHandler(key string) func(field string, value string, exp time.Time) error {
func (v *verifier) HandleString(key string, value string) error {
if len(key) > v.maxKeySize {
return func(field, value string, exp time.Time) error {
return errMaxKeySizeExceeded(len(key), v.maxKeySize)
}

if len(value) > v.maxEntrySize {
return errMaxEntrySizeExceeded(len(value), v.maxEntrySize)
}

v.dataSize += len(key) + len(value)
if v.dataSize > v.maxDataSize {
return errMaxDataSizeExceeded(v.dataSize, v.maxDataSize)
}

return nil
}

func (v *verifier) HashEntryHandler(key string) func(field string, value string) error {
if len(key) > v.maxKeySize {
return func(field, value string) error {
return errMaxKeySizeExceeded(len(key), v.maxKeySize)
}
}

v.dataSize += len(key)
if v.dataSize > v.maxDataSize {
return func(field, value string, exp time.Time) error {
return func(field, value string) error {
return errMaxDataSizeExceeded(v.dataSize, v.maxDataSize)
}
}

var entrySize int
return func(field, value string, exp time.Time) error {
entrySize += len(field) + len(value) + 8
return func(field, value string) error {
elementSize := len(field) + len(value)
entrySize += elementSize
if entrySize > v.maxEntrySize {
return errMaxEntrySizeExceeded(entrySize, v.maxEntrySize)
}

v.dataSize += entrySize
v.dataSize += elementSize
if v.dataSize > v.maxDataSize {
return errMaxDataSizeExceeded(v.dataSize, v.maxDataSize)
}
Expand All @@ -208,45 +226,29 @@ func (v *verifier) HashWithExpEntryHandler(key string) func(field string, value
}
}

func (v *verifier) HandleString(key string, value string) error {
if len(key) > v.maxKeySize {
return errMaxKeySizeExceeded(len(key), v.maxKeySize)
}

if len(value) > v.maxEntrySize {
return errMaxEntrySizeExceeded(len(value), v.maxEntrySize)
}

v.dataSize += len(key) + len(value)
if v.dataSize > v.maxDataSize {
return errMaxDataSizeExceeded(v.dataSize, v.maxDataSize)
}

return nil
}

func (v *verifier) HashEntryHandler(key string) func(field string, value string) error {
func (v *verifier) HashWithExpEntryHandler(key string) func(field string, value string, exp time.Time) error {
if len(key) > v.maxKeySize {
return func(field, value string) error {
return func(field, value string, exp time.Time) error {
return errMaxKeySizeExceeded(len(key), v.maxKeySize)
}
}

v.dataSize += len(key)
if v.dataSize > v.maxDataSize {
return func(field, value string) error {
return func(field, value string, exp time.Time) error {
return errMaxDataSizeExceeded(v.dataSize, v.maxDataSize)
}
}

var entrySize int
return func(field, value string) error {
entrySize += len(field) + len(value)
return func(field, value string, exp time.Time) error {
elementSize := len(field) + len(value) + 8
entrySize += elementSize
if entrySize > v.maxEntrySize {
return errMaxEntrySizeExceeded(entrySize, v.maxEntrySize)
}

v.dataSize += entrySize
v.dataSize += elementSize
if v.dataSize > v.maxDataSize {
return errMaxDataSizeExceeded(v.dataSize, v.maxDataSize)
}
Expand All @@ -271,12 +273,13 @@ func (v *verifier) ListEntryHandler(key string) func(elem string) error {

var entrySize int
return func(elem string) error {
entrySize += len(elem)
elementSize := len(elem)
entrySize += elementSize
if entrySize > v.maxEntrySize {
return errMaxEntrySizeExceeded(entrySize, v.maxEntrySize)
}

v.dataSize += entrySize
v.dataSize += elementSize
if v.dataSize > v.maxDataSize {
return errMaxDataSizeExceeded(v.dataSize, v.maxDataSize)
}
Expand All @@ -301,12 +304,13 @@ func (v *verifier) SetEntryHandler(key string) func(elem string) error {

var entrySize int
return func(elem string) error {
entrySize += len(elem)
elementSize := len(elem)
entrySize += elementSize
if entrySize > v.maxEntrySize {
return errMaxEntrySizeExceeded(entrySize, v.maxEntrySize)
}

v.dataSize += entrySize
v.dataSize += elementSize
if v.dataSize > v.maxDataSize {
return errMaxDataSizeExceeded(v.dataSize, v.maxDataSize)
}
Expand All @@ -331,12 +335,13 @@ func (v *verifier) ZsetEntryHandler(key string) func(elem string, score float64)

var entrySize int
return func(elem string, score float64) error {
entrySize += len(elem) + 8
elementSize := len(elem) + 8
entrySize += elementSize
if entrySize > v.maxEntrySize {
return errMaxEntrySizeExceeded(entrySize, v.maxEntrySize)
}

v.dataSize += entrySize
v.dataSize += elementSize
if v.dataSize > v.maxDataSize {
return errMaxDataSizeExceeded(v.dataSize, v.maxDataSize)
}
Expand Down Expand Up @@ -402,35 +407,37 @@ func (v *verifier) StreamEntryHandler(key string) func(entry StreamEntry) error
func (v *verifier) StreamGroupHandler(key string) func(group StreamConsumerGroup) error {
var entrySize int
return func(group StreamConsumerGroup) error {
var groupSize int
if len(group.Name) > maxStreamStrSize {
return errMaxStreamStrSizeExceeded(len(group.Name), maxStreamStrSize)
}

entrySize += len(group.Name) + 24 // 8: LastID#Seq + 8: LastID#Millis + 8: EntriesRead
groupSize += len(group.Name) + 24 // 8: LastID#Seq + 8: LastID#Millis + 8: EntriesRead

for _, consumer := range group.Consumers {
if len(consumer.Name) > maxStreamStrSize {
return errMaxStreamStrSizeExceeded(len(consumer.Name), maxStreamStrSize)
}

entrySize += len(consumer.Name) + 16 // 8: SeenTime + 8: ActiveTime
groupSize += len(consumer.Name) + 16 // 8: SeenTime + 8: ActiveTime

if len(consumer.PendingEntries) > v.maxStreamPELSize {
return errMaxStreamPELSizeExceeded(len(consumer.PendingEntries), v.maxStreamPELSize)
}

for _, pe := range consumer.PendingEntries {
entrySize += 32 // 8: ID#Seq + 8: ID#Millis + 8: DeliveryCount + 8: DeliveryTime
groupSize += 32 // 8: ID#Seq + 8: ID#Millis + 8: DeliveryCount + 8: DeliveryTime

for _, val := range pe.Entry.Value {
if len(val) > maxStreamStrSize {
return errMaxStreamStrSizeExceeded(len(val), maxStreamStrSize)
}

entrySize += len(val)
groupSize += len(val)
}
}
}
entrySize += groupSize

// unlike normal stream entries, pending entries are stored both on disk
// and memory.
Expand All @@ -439,7 +446,7 @@ func (v *verifier) StreamGroupHandler(key string) func(group StreamConsumerGroup
return errMaxEntrySizeExceeded(entrySize, v.maxEntrySize)
}

v.dataSize += entrySize
v.dataSize += groupSize
if v.dataSize > v.maxDataSize {
return errMaxDataSizeExceeded(v.dataSize, v.maxDataSize)
}
Expand Down
Loading