*: fix deprecated code

Use: - `eacl.Target.RawSubjects` instead of `eacl.Target.BinaryKeys`. - `eacl.NewTargetByRole` with `eacl.Target.SetRawSubjects` for targets with public keys. - `eacl.ConstructTable` instead of `eacl.NewTable`. - `eacl.ConstructRecord` instead of `eacl.NewRecord`. - `*.Get*ID` instead of `*.*ID`. - comparing with == instead of `ID.Equals`. - `cid.NewFromMarshalledContainer(cnr.Marshal())` instead of. `cid.ID.CalculateID`. - `user.NewFromECDSAPublicKey` instead of `user.ResolveFromECDSAPublicKey`. - direct copy instead of `ID.Encode`. - direct assign instead of `ID.SetSHA256`. - use `rand.Read` from `crypto/rand`. - use expiration epoch of storage group from attribute in header of the object carrying this storage group. Signed-off-by: Andrey Butusov <[email protected]>
nspcc-dev · Oct 1, 2024 · 9751852 · 9751852
1 parent b3d4f8f
commit 9751852
Show file tree

Hide file tree

Showing 129 changed files with 484 additions and 475 deletions.
diff --git a/cmd/neofs-adm/internal/modules/morph/container.go b/cmd/neofs-adm/internal/modules/morph/container.go
@@ -189,7 +189,7 @@ func restoreContainers(cmd *cobra.Command, _ []string) error {
 	var id cid.ID
 	b := smartcontract.NewBuilder()
 	for _, cnt := range containers {
-		id.FromBinary(cnt.Value)
+		id = cid.NewFromMarshalledContainer(cnt.Value)
 		if _, ok := requested[id]; !ok {
 			continue
 		}

diff --git a/cmd/neofs-adm/internal/modules/morph/estimation.go b/cmd/neofs-adm/internal/modules/morph/estimation.go
@@ -76,7 +76,7 @@ func estimationsFunc(cmd *cobra.Command, _ []string) error {
 	}
 
 	cIDBytes := make([]byte, sha256.Size)
-	cID.Encode(cIDBytes)
+	copy(cIDBytes, cID[:])
 
 	sID, iter, err := unwrap.SessionIterator(inv.Call(cnrHash, "iterateContainerSizes", epoch, cIDBytes))
 	if err != nil {

diff --git a/cmd/neofs-cli/modules/accounting/balance.go b/cmd/neofs-cli/modules/accounting/balance.go
@@ -37,7 +37,7 @@ var accountingBalanceCmd = &cobra.Command{
 
 		balanceOwner, _ := cmd.Flags().GetString(ownerFlag)
 		if balanceOwner == "" {
-			idUser = user.ResolveFromECDSAPublicKey(pk.PublicKey)
+			idUser = user.NewFromECDSAPublicKey(pk.PublicKey)
 		} else {
 			return fmt.Errorf("can't decode owner ID wallet address: %w", idUser.DecodeString(balanceOwner))
 		}

diff --git a/cmd/neofs-cli/modules/acl/extended/create_test.go b/cmd/neofs-cli/modules/acl/extended/create_test.go
@@ -68,21 +68,21 @@ func TestParseTable(t *testing.T) {
 		},
 	}
 
-	eaclTable := eacl.NewTable()
+	eaclTable := eacl.ConstructTable(nil)
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			err := util.ParseEACLRule(eaclTable, test.rule)
+			err := util.ParseEACLRule(&eaclTable, test.rule)
 			ok := len(test.jsonRecord) > 0
 			require.Equal(t, ok, err == nil, err)
 			if ok {
-				expectedRecord := eacl.NewRecord()
+				expectedRecord := eacl.ConstructRecord(eacl.ActionUnspecified, eacl.OperationUnspecified, nil, eacl.Filter{})
 				err = expectedRecord.UnmarshalJSON([]byte(test.jsonRecord))
 				require.NoError(t, err)
 
 				actualRecord := eaclTable.Records()[len(eaclTable.Records())-1]
 
-				equalRecords(t, expectedRecord, &actualRecord)
+				equalRecords(t, &expectedRecord, &actualRecord)
 			}
 		})
 	}

diff --git a/cmd/neofs-cli/modules/container/create.go b/cmd/neofs-cli/modules/container/create.go
@@ -103,7 +103,7 @@ It will be stored in sidechain when inner ring will accepts it.`,
 			issuer := tok.Issuer()
 			cnr.SetOwner(issuer)
 		} else {
-			cnr.SetOwner(user.ResolveFromECDSAPublicKey(key.PublicKey))
+			cnr.SetOwner(user.NewFromECDSAPublicKey(key.PublicKey))
 		}
 
 		cnr.SetPlacementPolicy(*placementPolicy)

diff --git a/cmd/neofs-cli/modules/container/delete.go b/cmd/neofs-cli/modules/container/delete.go
@@ -59,15 +59,15 @@ Only owner of the container has a permission to remove container.`,
 			if tok != nil {
 				common.PrintVerbose(cmd, "Checking session issuer...")
 
-				if !tok.Issuer().Equals(owner) {
+				if tok.Issuer() != owner {
 					return fmt.Errorf("session issuer differs with the container owner: expected %s, has %s", owner, tok.Issuer())
 				}
 			} else {
 				common.PrintVerbose(cmd, "Checking provided account...")
 
-				acc := user.ResolveFromECDSAPublicKey(pk.PublicKey)
+				acc := user.NewFromECDSAPublicKey(pk.PublicKey)
 
-				if !acc.Equals(owner) {
+				if acc != owner {
 					return fmt.Errorf("provided account differs with the container owner: expected %s, has %s", owner, acc)
 				}
 			}

diff --git a/cmd/neofs-cli/modules/container/get.go b/cmd/neofs-cli/modules/container/get.go
@@ -94,8 +94,7 @@ func prettyPrintContainer(cmd *cobra.Command, cnr container.Container, jsonEncod
 		return nil
 	}
 
-	var id cid.ID
-	cnr.CalculateID(&id)
+	id := cid.NewFromMarshalledContainer(cnr.Marshal())
 	cmd.Println("container ID:", id)
 
 	cmd.Println("owner ID:", cnr.Owner())

diff --git a/cmd/neofs-cli/modules/container/list.go b/cmd/neofs-cli/modules/container/list.go
@@ -39,7 +39,7 @@ var listContainersCmd = &cobra.Command{
 		}
 
 		if flagVarListContainerOwner == "" {
-			idUser = user.ResolveFromECDSAPublicKey(key.PublicKey)
+			idUser = user.NewFromECDSAPublicKey(key.PublicKey)
 		} else {
 			err := idUser.DecodeString(flagVarListContainerOwner)
 			if err != nil {

diff --git a/cmd/neofs-cli/modules/container/nodes.go b/cmd/neofs-cli/modules/container/nodes.go
@@ -40,8 +40,7 @@ var containerNodesCmd = &cobra.Command{
 			return fmt.Errorf("unable to get netmap snapshot: %w", err)
 		}
 
-		var id cid.ID
-		cnr.CalculateID(&id)
+		id := cid.NewFromMarshalledContainer(cnr.Marshal())
 
 		policy := cnr.PlacementPolicy()
 

diff --git a/cmd/neofs-cli/modules/container/set_eacl.go b/cmd/neofs-cli/modules/container/set_eacl.go
@@ -79,15 +79,15 @@ Container ID in EACL table will be substituted with ID from the CLI.`,
 			if tok != nil {
 				common.PrintVerbose(cmd, "Checking session issuer...")
 
-				if !tok.Issuer().Equals(owner) {
+				if tok.Issuer() != owner {
 					return fmt.Errorf("session issuer differs with the container owner: expected %s, has %s", owner, tok.Issuer())
 				}
 			} else {
 				common.PrintVerbose(cmd, "Checking provided account...")
 
-				acc := user.ResolveFromECDSAPublicKey(pk.PublicKey)
+				acc := user.NewFromECDSAPublicKey(pk.PublicKey)
 
-				if !acc.Equals(owner) {
+				if acc != owner {
 					return fmt.Errorf("provided account differs with the container owner: expected %s, has %s", owner, acc)
 				}
 			}

diff --git a/cmd/neofs-cli/modules/control/synchronize_tree.go b/cmd/neofs-cli/modules/control/synchronize_tree.go
@@ -56,7 +56,7 @@ func synchronizeTree(cmd *cobra.Command, _ []string) error {
 	height, _ := cmd.Flags().GetUint64("height")
 
 	rawCID := make([]byte, sha256.Size)
-	cnr.Encode(rawCID)
+	copy(rawCID, cnr[:])
 
 	req := &control.SynchronizeTreeRequest{
 		Body: &control.SynchronizeTreeRequest_Body{

diff --git a/cmd/neofs-cli/modules/object/head.go b/cmd/neofs-cli/modules/object/head.go
@@ -135,11 +135,11 @@ func marshalHeader(cmd *cobra.Command, hdr *object.Object) ([]byte, error) {
 	}
 }
 
-func printObjectID(cmd *cobra.Command, recv func() (oid.ID, bool)) {
+func printObjectID(cmd *cobra.Command, recv func() oid.ID) {
 	var strID string
 
-	id, ok := recv()
-	if ok {
+	id := recv()
+	if !id.IsZero() {
 		strID = id.String()
 	} else {
 		strID = "<empty>"
@@ -148,11 +148,11 @@ func printObjectID(cmd *cobra.Command, recv func() (oid.ID, bool)) {
 	cmd.Printf("ID: %s\n", strID)
 }
 
-func printContainerID(cmd *cobra.Command, recv func() (cid.ID, bool)) {
+func printContainerID(cmd *cobra.Command, recv func() cid.ID) {
 	var strID string
 
-	id, ok := recv()
-	if ok {
+	id := recv()
+	if !id.IsZero() {
 		strID = id.String()
 	} else {
 		strID = "<empty>"
@@ -162,8 +162,8 @@ func printContainerID(cmd *cobra.Command, recv func() (cid.ID, bool)) {
 }
 
 func printHeader(cmd *cobra.Command, obj *object.Object) error {
-	printObjectID(cmd, obj.ID)
-	printContainerID(cmd, obj.ContainerID)
+	printObjectID(cmd, obj.GetID)
+	printContainerID(cmd, obj.GetContainerID)
 	cmd.Printf("Owner: %s\n", obj.OwnerID())
 	cmd.Printf("CreatedAt: %d\n", obj.CreationEpoch())
 	cmd.Printf("Size: %d\n", obj.PayloadSize())
@@ -197,11 +197,11 @@ func printSplitHeader(cmd *cobra.Command, obj *object.Object) error {
 		cmd.Printf("Split ID: %s\n", splitID)
 	}
 
-	if oid, ok := obj.ParentID(); ok {
-		cmd.Printf("Split ParentID: %s\n", oid)
+	if oID := obj.GetParentID(); !oID.IsZero() {
+		cmd.Printf("Split ParentID: %s\n", oID)
 	}
 
-	if prev, ok := obj.PreviousID(); ok {
+	if prev := obj.GetPreviousID(); !prev.IsZero() {
 		cmd.Printf("Split PreviousID: %s\n", prev)
 	}
 

diff --git a/cmd/neofs-cli/modules/object/lock.go b/cmd/neofs-cli/modules/object/lock.go
@@ -51,7 +51,7 @@ var objectLockCmd = &cobra.Command{
 			return err
 		}
 
-		idOwner := user.ResolveFromECDSAPublicKey(key.PublicKey)
+		idOwner := user.NewFromECDSAPublicKey(key.PublicKey)
 
 		var lock objectSDK.Lock
 		lock.WriteMembers(lockList)

diff --git a/cmd/neofs-cli/modules/object/put.go b/cmd/neofs-cli/modules/object/put.go
@@ -94,7 +94,7 @@ func putObject(cmd *cobra.Command, _ []string) error {
 			return fmt.Errorf("can't unmarshal object from given file: %w", err)
 		}
 		payloadReader = bytes.NewReader(objTemp.Payload())
-		cnr, _ = objTemp.ContainerID()
+		cnr = objTemp.GetContainerID()
 		ownerID = *objTemp.OwnerID()
 	} else {
 		fi, err := f.Stat()
@@ -108,7 +108,7 @@ func putObject(cmd *cobra.Command, _ []string) error {
 		if err != nil {
 			return err
 		}
-		ownerID = user.ResolveFromECDSAPublicKey(pk.PublicKey)
+		ownerID = user.NewFromECDSAPublicKey(pk.PublicKey)
 	}
 
 	attrs, err := parseObjectAttrs(cmd)

diff --git a/cmd/neofs-cli/modules/object/range.go b/cmd/neofs-cli/modules/object/range.go
@@ -166,10 +166,10 @@ func marshalSplitInfo(cmd *cobra.Command, info *object.SplitInfo) ([]byte, error
 		if splitID := info.SplitID(); splitID != nil {
 			b.WriteString("Split ID: " + splitID.String() + "\n")
 		}
-		if link, ok := info.Link(); ok {
+		if link := info.GetLink(); !link.IsZero() {
 			b.WriteString("Linking object: " + link.String() + "\n")
 		}
-		if last, ok := info.LastPart(); ok {
+		if last := info.GetLastPart(); !last.IsZero() {
 			b.WriteString("Last object: " + last.String() + "\n")
 		}
 		return b.Bytes(), nil

diff --git a/cmd/neofs-cli/modules/object/util.go b/cmd/neofs-cli/modules/object/util.go
@@ -106,8 +106,8 @@ func readObjectAddressBin(cnr *cid.ID, obj *oid.ID, filename string) (oid.Addres
 	}
 
 	var addr oid.Address
-	*cnr, _ = objTemp.ContainerID()
-	*obj, _ = objTemp.ID()
+	*cnr = objTemp.GetContainerID()
+	*obj = objTemp.GetID()
 	addr.SetContainer(*cnr)
 	addr.SetObject(*obj)
 	return addr, nil

diff --git a/cmd/neofs-cli/modules/storagegroup/get.go b/cmd/neofs-cli/modules/storagegroup/get.go
@@ -2,13 +2,15 @@ package storagegroup
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 
 	internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/common"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/key"
 	objectCli "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/modules/object"
+	"github.com/nspcc-dev/neofs-node/pkg/core/object"
 	cid "github.com/nspcc-dev/neofs-sdk-go/container/id"
 	oid "github.com/nspcc-dev/neofs-sdk-go/object/id"
 	storagegroupSDK "github.com/nspcc-dev/neofs-sdk-go/storagegroup"
@@ -89,7 +91,12 @@ func getSG(cmd *cobra.Command, _ []string) error {
 		return fmt.Errorf("could not read storage group from the obj: %w", err)
 	}
 
-	cmd.Printf("The last active epoch: %d\n", sg.ExpirationEpoch())
+	expiration, err := object.Expiration(*rawObj)
+	if err != nil && !errors.Is(err, object.ErrNoExpiration) {
+		return fmt.Errorf("storage group's expiration: %w", err)
+	}
+
+	cmd.Printf("The last active epoch: %d\n", expiration)
 	cmd.Printf("Group size: %d\n", sg.ValidationDataSize())
 	common.PrintChecksum(cmd, "Group hash", sg.ValidationDataHash)
 

diff --git a/cmd/neofs-cli/modules/storagegroup/put.go b/cmd/neofs-cli/modules/storagegroup/put.go
@@ -5,6 +5,7 @@ import (
 	"crypto/ecdsa"
 	"errors"
 	"fmt"
+	"strconv"
 
 	internalclient "github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/client"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-cli/internal/commonflags"
@@ -60,7 +61,7 @@ func putSG(cmd *cobra.Command, _ []string) error {
 		return err
 	}
 
-	ownerID := user.ResolveFromECDSAPublicKey(pk.PublicKey)
+	ownerID := user.NewFromECDSAPublicKey(pk.PublicKey)
 
 	var cnr cid.ID
 	err = readCID(cmd, &cnr)
@@ -149,14 +150,35 @@ func putSG(cmd *cobra.Command, _ []string) error {
 		exp = currEpoch + lifetime
 	}
 
-	sg.SetExpirationEpoch(exp)
-
 	obj := object.New()
 	obj.SetContainerID(cnr)
 	obj.SetOwnerID(&ownerID)
 
 	storagegroupSDK.WriteToObject(*sg, obj)
 
+	if exp > 0 {
+		attrs := obj.Attributes()
+		var expAttrFound bool
+		expAttrValue := strconv.FormatUint(exp, 10)
+
+		for i := range attrs {
+			if attrs[i].Key() == object.AttributeExpirationEpoch {
+				attrs[i].SetValue(expAttrValue)
+				expAttrFound = true
+				break
+			}
+		}
+
+		if !expAttrFound {
+			index := len(attrs)
+			attrs = append(attrs, object.Attribute{})
+			attrs[index].SetKey(object.AttributeExpirationEpoch)
+			attrs[index].SetValue(expAttrValue)
+		}
+
+		obj.SetAttributes(attrs...)
+	}
+
 	putPrm.SetPrivateKey(*pk)
 	putPrm.SetHeader(obj)
 

diff --git a/cmd/neofs-cli/modules/tree/add.go b/cmd/neofs-cli/modules/tree/add.go
@@ -62,7 +62,7 @@ func add(cmd *cobra.Command, _ []string) error {
 	}
 
 	rawCID := make([]byte, sha256.Size)
-	cnr.Encode(rawCID)
+	copy(rawCID, cnr[:])
 
 	req := new(tree.AddRequest)
 	req.Body = &tree.AddRequest_Body{

diff --git a/cmd/neofs-cli/modules/tree/add_by_path.go b/cmd/neofs-cli/modules/tree/add_by_path.go
@@ -66,7 +66,7 @@ func addByPath(cmd *cobra.Command, _ []string) error {
 	}
 
 	rawCID := make([]byte, sha256.Size)
-	cnr.Encode(rawCID)
+	copy(rawCID, cnr[:])
 
 	meta, err := parseMeta(cmd)
 	if err != nil {

diff --git a/cmd/neofs-cli/modules/tree/get_by_path.go b/cmd/neofs-cli/modules/tree/get_by_path.go
@@ -66,7 +66,7 @@ func getByPath(cmd *cobra.Command, _ []string) error {
 	}
 
 	rawCID := make([]byte, sha256.Size)
-	cnr.Encode(rawCID)
+	copy(rawCID, cnr[:])
 
 	latestOnly, _ := cmd.Flags().GetBool(latestOnlyFlagKey)
 	path, _ := cmd.Flags().GetString(pathFlagKey)

diff --git a/cmd/neofs-cli/modules/tree/list.go b/cmd/neofs-cli/modules/tree/list.go
@@ -53,7 +53,7 @@ func list(cmd *cobra.Command, _ []string) error {
 	}
 
 	rawCID := make([]byte, sha256.Size)
-	cnr.Encode(rawCID)
+	copy(rawCID, cnr[:])
 
 	req := &tree.TreeListRequest{
 		Body: &tree.TreeListRequest_Body{

diff --git a/cmd/neofs-cli/modules/util/acl.go b/cmd/neofs-cli/modules/util/acl.go
@@ -83,7 +83,7 @@ func PrettyPrintTableEACL(cmd *cobra.Command, table *eacl.Table) {
 func eaclTargetsToString(ts []eacl.Target) string {
 	b := bytes.NewBuffer(nil)
 	for _, t := range ts {
-		keysExists := len(t.BinaryKeys()) > 0
+		keysExists := len(t.RawSubjects()) > 0
 		switch t.Role() {
 		case eacl.RoleUser:
 			b.WriteString("User")
@@ -107,7 +107,7 @@ func eaclTargetsToString(ts []eacl.Target) string {
 			}
 		}
 
-		for i, pub := range t.BinaryKeys() {
+		for i, pub := range t.RawSubjects() {
 			if i != 0 {
 				b.WriteString("         ")
 			}
@@ -286,8 +286,10 @@ func parseEACLRecord(args []string) (eacl.Record, error) {
 				continue
 			}
 
-			var target eacl.Target
-			eacl.SetTargetECDSAKeys(&target, pubs...)
+			target := eacl.NewTargetByRole(eacl.RoleUnspecified)
+			for _, pub := range pubs {
+				target.SetRawSubjects(append(target.RawSubjects(), (*keys.PublicKey)(pub).Bytes()))
+			}
 			targets = append(targets, target)
 		case "address": // targets
 			var (