TrueCloudLab
/
frostfs-node
18
1
Fork 20
Code Issues 88 Pull Requests 7 Actions Releases Activity

[#1490] node: Require SG members to be unique 

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
remotes/fyrchik/tree-errors
Pavel Karpy 2022-06-07 20:49:38 +03:00 committed by Pavel Karpy
parent 0504c3e0c6
commit 5d5d21e3d0
2 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/core/object/fmt.go
View File

@ -61,6 +61,8 @@ var errNoExpirationEpoch = errors.New("missing expiration epoch attribute")
var errTombstoneExpiration = errors.New("tombstone body and header contain different expiration values")
var errEmptySGMembers = errors.New("storage group with empty members list")
func defaultCfg() *cfg {
return new(cfg)
}
@ -227,6 +229,22 @@ func (v *FormatValidator) ValidateContent(o *object.Object) error {
if err := sg.Unmarshal(o.Payload()); err != nil {
return fmt.Errorf("(%T) could not unmarshal SG content: %w", v, err)
}
mm := sg.Members()
lenMM := len(mm)
if lenMM == 0 {
return errEmptySGMembers
}
uniqueFilter := make(map[oid.ID]struct{}, lenMM)
for i := 0; i < lenMM; i++ {
if _, alreadySeen := uniqueFilter[mm[i]]; alreadySeen {
return fmt.Errorf("storage group contains non-unique member: %s", mm[i])
}
uniqueFilter[mm[i]] = struct{}{}
}
case object.TypeLock:
if len(o.Payload()) == 0 {
return errors.New("empty payload in lock")

37
pkg/core/object/fmt_test.go
View File

@ -156,25 +156,42 @@ func TestFormatValidator_Validate(t *testing.T) {
obj := object.New()
obj.SetType(object.TypeStorageGroup)
require.Error(t, v.ValidateContent(obj))
t.Run("empty payload", func(t *testing.T) {
require.Error(t, v.ValidateContent(obj))
})
var content storagegroup.StorageGroup
content.SetExpirationEpoch(1) // some non-default value
data, err := content.Marshal()
require.NoError(t, err)
t.Run("empty members", func(t *testing.T) {
data, err := content.Marshal()
require.NoError(t, err)
obj.SetPayload(data)
obj.SetPayload(data)
require.ErrorIs(t, v.ValidateContent(obj), errEmptySGMembers)
})
require.Error(t, v.ValidateContent(obj))
t.Run("non-unique members", func(t *testing.T) {
id := oidtest.ID()
content.SetMembers([]oid.ID{oidtest.ID()})
content.SetMembers([]oid.ID{id, id})
data, err = content.Marshal()
require.NoError(t, err)
data, err := content.Marshal()
require.NoError(t, err)
obj.SetPayload(data)
obj.SetPayload(data)
require.Error(t, v.ValidateContent(obj))
})
require.NoError(t, v.ValidateContent(obj))
t.Run("correct SG", func(t *testing.T) {
content.SetMembers([]oid.ID{oidtest.ID(), oidtest.ID()})
data, err := content.Marshal()
require.NoError(t, err)
obj.SetPayload(data)
require.NoError(t, v.ValidateContent(obj))
})
})
t.Run("expiration", func(t *testing.T) {