forked from TrueCloudLab/frostfs-node
WIP: Morph: Add unit tests #2
6 changed files with 5 additions and 8 deletions
|
@ -78,7 +78,8 @@ var listContainersCmd = &cobra.Command{
|
||||||
if flagVarListPrintAttr {
|
if flagVarListPrintAttr {
|
||||||
cnr.IterateAttributes(func(key, val string) {
|
cnr.IterateAttributes(func(key, val string) {
|
||||||
if !strings.HasPrefix(key, container.SysAttributePrefix) && !strings.HasPrefix(key, container.SysAttributePrefixNeoFS) {
|
if !strings.HasPrefix(key, container.SysAttributePrefix) && !strings.HasPrefix(key, container.SysAttributePrefixNeoFS) {
|
||||||
// FIXME(@cthulhu-rider): neofs-sdk-go#314 use dedicated method to skip system attributes
|
// FIXME(@cthulhu-rider): https://git.frostfs.info/TrueCloudLab/frostfs-sdk-go/issues/97
|
||||||
|
// Use dedicated method to skip system attributes.
|
||||||
cmd.Printf(" %s: %s\n", key, val)
|
cmd.Printf(" %s: %s\n", key, val)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
@ -71,7 +71,8 @@ var listContainerObjectsCmd = &cobra.Command{
|
||||||
for i := range attrs {
|
for i := range attrs {
|
||||||
attrKey := attrs[i].Key()
|
attrKey := attrs[i].Key()
|
||||||
if !strings.HasPrefix(attrKey, v2object.SysAttributePrefix) && !strings.HasPrefix(attrKey, v2object.SysAttributePrefixNeoFS) {
|
if !strings.HasPrefix(attrKey, v2object.SysAttributePrefix) && !strings.HasPrefix(attrKey, v2object.SysAttributePrefixNeoFS) {
|
||||||
// FIXME(@cthulhu-rider): neofs-sdk-go#226 use dedicated method to skip system attributes
|
// FIXME(@cthulhu-rider): https://git.frostfs.info/TrueCloudLab/frostfs-sdk-go/issues/97
|
||||||
|
// Use dedicated method to skip system attributes.
|
||||||
cmd.Printf(" %s: %s\n", attrKey, attrs[i].Value())
|
cmd.Printf(" %s: %s\n", attrKey, attrs[i].Value())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -133,7 +133,6 @@ func (v *FormatValidator) Validate(ctx context.Context, obj *object.Object, unpr
|
||||||
}
|
}
|
||||||
|
|
||||||
func (v *FormatValidator) validateSignatureKey(obj *object.Object) error {
|
func (v *FormatValidator) validateSignatureKey(obj *object.Object) error {
|
||||||
// FIXME(@cthulhu-rider): temp solution, see neofs-sdk-go#233
|
|
||||||
sig := obj.Signature()
|
sig := obj.Signature()
|
||||||
if sig == nil {
|
if sig == nil {
|
||||||
// TODO(@cthulhu-rider): #1387 use "const" error
|
// TODO(@cthulhu-rider): #1387 use "const" error
|
||||||
|
|
|
@ -63,7 +63,6 @@ func (cp *Processor) verifySignature(v signatureVerificationData) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
if keyProvided {
|
if keyProvided {
|
||||||
// TODO(@cthulhu-rider): #1387 use another approach after neofs-sdk-go#233
|
|
||||||
var idFromKey user.ID
|
var idFromKey user.ID
|
||||||
user.IDFromKey(&idFromKey, (ecdsa.PublicKey)(key))
|
user.IDFromKey(&idFromKey, (ecdsa.PublicKey)(key))
|
||||||
|
|
||||||
|
@ -118,8 +117,6 @@ func (cp *Processor) verifyByTokenSession(v signatureVerificationData, key *fros
|
||||||
return errors.New("invalid session token signature")
|
return errors.New("invalid session token signature")
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME(@cthulhu-rider): #1387 check token is signed by container owner, see neofs-sdk-go#233
|
|
||||||
|
|
||||||
if keyProvided && !tok.AssertAuthKey(key) {
|
if keyProvided && !tok.AssertAuthKey(key) {
|
||||||
return errors.New("signed with a non-session key")
|
return errors.New("signed with a non-session key")
|
||||||
}
|
}
|
||||||
|
|
|
@ -572,6 +572,5 @@ func blindlyProcess(fs object.SearchFilters) bool {
|
||||||
|
|
||||||
// returns true if string key is a reserved system filter key.
|
// returns true if string key is a reserved system filter key.
|
||||||
func isSystemKey(key string) bool {
|
func isSystemKey(key string) bool {
|
||||||
// FIXME: #1147 version-dependent approach
|
|
||||||
return strings.HasPrefix(key, v2object.ReservedFilterPrefix)
|
return strings.HasPrefix(key, v2object.ReservedFilterPrefix)
|
||||||
}
|
}
|
||||||
|
|
|
@ -81,7 +81,7 @@ type readPrmCommon struct {
|
||||||
//
|
//
|
||||||
// By default current epoch on the server will be used.
|
// By default current epoch on the server will be used.
|
||||||
func (x *readPrmCommon) SetNetmapEpoch(_ uint64) {
|
func (x *readPrmCommon) SetNetmapEpoch(_ uint64) {
|
||||||
// FIXME: (neofs-node#1194) not supported by client
|
// FIXME(@fyrchik): https://git.frostfs.info/TrueCloudLab/frostfs-node/issues/465
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetObjectPrm groups parameters of GetObject operation.
|
// GetObjectPrm groups parameters of GetObject operation.
|
||||||
|
|
Loading…
Reference in a new issue