forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

swarm/storage: add chunk size validation to localstore

Browse source
This commit is contained in:
Anton Evangelatov 2018-08-14 11:31:24 +02:00
parent c56a21b67b
commit 92ef6db7b7
3 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
swarm/storage/localstore.go
View file

@ -24,6 +24,7 @@ import (
"sync" "sync"
"github.com/ethereum/go-ethereum/metrics" "github.com/ethereum/go-ethereum/metrics"
cp "github.com/ethereum/go-ethereum/swarm/chunk"
"github.com/ethereum/go-ethereum/swarm/log" "github.com/ethereum/go-ethereum/swarm/log"
"github.com/ethereum/go-ethereum/swarm/storage/mock" "github.com/ethereum/go-ethereum/swarm/storage/mock"
) )
@ -98,8 +99,8 @@ func NewTestLocalStoreForAddr(params *LocalStoreParams) (*LocalStore, error) {
// After the LDBStore.Put, it is ensured that the MemStore // After the LDBStore.Put, it is ensured that the MemStore
// contains the chunk with the same data, but nil ReqC channel. // contains the chunk with the same data, but nil ReqC channel.
func (ls *LocalStore) Put(ctx context.Context, chunk *Chunk) { func (ls *LocalStore) Put(ctx context.Context, chunk *Chunk) {
if l := len(chunk.SData); l < 9 { if l := len(chunk.SData); l < 9 || l > cp.DefaultSize+8 {
log.Debug("incomplete chunk data", "addr", chunk.Addr, "length", l) log.Debug("invalid chunk data", "addr", chunk.Addr, "len", l)
chunk.SetErrored(ErrChunkInvalid) chunk.SetErrored(ErrChunkInvalid)
chunk.markAsStored() chunk.markAsStored()
return return

9
swarm/storage/types.go
View file

@ -355,12 +355,3 @@ func (v *ContentAddressValidator) Validate(addr Address, data []byte) bool {
return bytes.Equal(hash, addr[:]) return bytes.Equal(hash, addr[:])
} }
// SizeValidator provides method for validation of max chunk data size
type SizeValidator struct {
}
// Validate that the chunk has valid size
func (v *SizeValidator) Validate(_ Address, data []byte) bool {
return len(data) <= 8+chunk.DefaultSize
}

1
swarm/swarm.go
View file

@ -203,7 +203,6 @@ func NewSwarm(config *api.Config, mockStore *mock.NodeStore) (self *Swarm, err e
validators := []storage.ChunkValidator{ validators := []storage.ChunkValidator{
storage.NewContentAddressValidator(storage.MakeHashFunc(storage.DefaultHash)), storage.NewContentAddressValidator(storage.MakeHashFunc(storage.DefaultHash)),
&storage.SizeValidator{},
} }
if resourceHandler != nil { if resourceHandler != nil {
validators = append(validators, resourceHandler) validators = append(validators, resourceHandler)