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

[#633] object: Disallow empty attribute values 

Values of object attributes must not be empty according to NeoFS
specification.

Make `FormatValidator.Validate` method to return an error if at least one
attribute has empty value.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
remotes/fyrchik/meta-pebble
Leonard Lyubich 2021-06-23 17:20:13 +03:00 committed by Alex Vanin
parent 01dd17e30a
commit 25391111ad
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,7 +231,10 @@ func expirationEpochAttribute(obj *Object) (uint64, error) {
return 0, errNoExpirationEpoch
}
var errDuplAttr = errors.New("duplication of attributes detected")
var (
errDuplAttr = errors.New("duplication of attributes detected")
errEmptyAttrVal = errors.New("empty attribute value")
)
func (v *FormatValidator) checkAttributes(obj *Object) error {
as := obj.Attributes()
@ -245,6 +248,10 @@ func (v *FormatValidator) checkAttributes(obj *Object) error {
return errDuplAttr
}
if a.Value() == "" {
return errEmptyAttrVal
}
mUnique[key] = struct{}{}
}

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

@ -222,7 +222,7 @@ func TestFormatValidator_Validate(t *testing.T) {
t.Run("attributes", func(t *testing.T) {
t.Run("duplication", func(t *testing.T) {
obj := blankValidObject(t, ownerKey)
obj := blankValidObject(t, &ownerKey.PrivateKey)
a1 := object.NewAttribute()
a1.SetKey("key1")
@ -242,5 +242,17 @@ func TestFormatValidator_Validate(t *testing.T) {
err = v.checkAttributes(obj.Object())
require.Equal(t, errDuplAttr, err)
})
t.Run("empty value", func(t *testing.T) {
obj := blankValidObject(t, &ownerKey.PrivateKey)
a := object.NewAttribute()
a.SetKey("key")
obj.SetAttributes(a)
err := v.checkAttributes(obj.Object())
require.Equal(t, errEmptyAttrVal, err)
})
})
}