395fd187ac
In recent changes argument list of set eACL call of Container contract client was extended with binary public key. In the future there will be a need to pass the table in binary format. Replace `PutEACL` method with `PutEACLBinary` one which accepts three binary parameters: eACL table, key and signature. Create `PutEACL` function similar to the removed method, but accepting `Signature` structure instead of just a signature. Use this function in Container service server in the place where `PutEACL` was used. Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
87 lines
2.3 KiB
Go
87 lines
2.3 KiB
Go
package wrapper
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/nspcc-dev/neofs-api-go/pkg"
|
|
"github.com/nspcc-dev/neofs-api-go/pkg/acl/eacl"
|
|
containerSDK "github.com/nspcc-dev/neofs-api-go/pkg/container"
|
|
"github.com/nspcc-dev/neofs-node/pkg/core/container"
|
|
client "github.com/nspcc-dev/neofs-node/pkg/morph/client/container"
|
|
)
|
|
|
|
// GetEACL reads the extended ACL table from NeoFS system
|
|
// through Container contract call.
|
|
func (w *Wrapper) GetEACL(cid *containerSDK.ID) (*eacl.Table, *pkg.Signature, error) {
|
|
if cid == nil {
|
|
return nil, nil, errNilArgument
|
|
}
|
|
|
|
args := client.EACLArgs{}
|
|
|
|
v2 := cid.ToV2()
|
|
if v2 == nil {
|
|
return nil, nil, errUnsupported // use other major version if there any
|
|
}
|
|
|
|
args.SetCID(v2.GetValue())
|
|
|
|
rpcAnswer, err := w.client.EACL(args)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
// Client may not return errors if the table is missing, so check this case additionally.
|
|
// The absence of a signature in the response can be taken as an eACL absence criterion,
|
|
// since unsigned table cannot be approved in the storage by design.
|
|
sig := rpcAnswer.Signature()
|
|
if len(sig) == 0 {
|
|
return nil, nil, container.ErrEACLNotFound
|
|
}
|
|
|
|
tableSignature := pkg.NewSignature()
|
|
tableSignature.SetKey(rpcAnswer.PublicKey())
|
|
tableSignature.SetSign(sig)
|
|
|
|
table := eacl.NewTable()
|
|
if err = table.Unmarshal(rpcAnswer.EACL()); err != nil {
|
|
// use other major version if there any
|
|
return nil, nil, err
|
|
}
|
|
|
|
return table, tableSignature, nil
|
|
}
|
|
|
|
// PutEACL marshals table, and passes it to Wrapper's PutEACLBinary method
|
|
// along with sig.Key() and sig.Sign().
|
|
//
|
|
// Returns error if table is nil.
|
|
func PutEACL(w *Wrapper, table *eacl.Table, sig *pkg.Signature) error {
|
|
if table == nil {
|
|
return errNilArgument
|
|
}
|
|
|
|
data, err := table.Marshal()
|
|
if err != nil {
|
|
return fmt.Errorf("can't marshal eacl table: %w", err)
|
|
}
|
|
|
|
return w.PutEACLBinary(data, sig.Key(), sig.Sign())
|
|
}
|
|
|
|
// PutEACLBinary save binary eACL table with its key and signature
|
|
// in NeoFS system through Container contract call.
|
|
//
|
|
// Returns any error encountered that caused the saving to interrupt.
|
|
func (w *Wrapper) PutEACLBinary(table, key, sig []byte) error {
|
|
if len(sig) == 0 || len(key) == 0 {
|
|
return errNilArgument
|
|
}
|
|
|
|
args := client.SetEACLArgs{}
|
|
args.SetSignature(table)
|
|
args.SetPublicKey(key)
|
|
args.SetEACL(sig)
|
|
|
|
return w.client.SetEACL(args)
|
|
}
|