api: Replace the private key with slicer completely

Signed-off-by: Evgenii Baidakov <[email protected]>
nspcc-dev · Aug 9, 2023 · a443041 · a443041
1 parent 141497b
commit a443041
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/handlers/api.go b/handlers/api.go
@@ -24,7 +24,6 @@ import (
 type API struct {
 	log              *zap.Logger
 	pool             *pool.Pool
-	key              *keys.PrivateKey
 	owner            *user.ID
 	signer           user.Signer
 	defaultTimestamp bool
@@ -82,7 +81,6 @@ func New(prm *PrmAPI) *API {
 	return &API{
 		log:              prm.Logger,
 		pool:             prm.Pool,
-		key:              prm.Key,
 		signer:           signer,
 		owner:            &owner,
 		defaultTimestamp: prm.DefaultTimestamp,

diff --git a/handlers/auth.go b/handlers/auth.go
@@ -7,15 +7,14 @@ import (
 
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/google/uuid"
-	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
 	"github.com/nspcc-dev/neofs-api-go/v2/acl"
 	"github.com/nspcc-dev/neofs-api-go/v2/refs"
 	sessionv2 "github.com/nspcc-dev/neofs-api-go/v2/session"
 	"github.com/nspcc-dev/neofs-rest-gw/gen/models"
 	"github.com/nspcc-dev/neofs-rest-gw/gen/restapi/operations"
 	"github.com/nspcc-dev/neofs-rest-gw/internal/util"
 	"github.com/nspcc-dev/neofs-sdk-go/client"
-	neofsecdsa "github.com/nspcc-dev/neofs-sdk-go/crypto/ecdsa"
+	neofscrypto "github.com/nspcc-dev/neofs-sdk-go/crypto"
 	"github.com/nspcc-dev/neofs-sdk-go/pool"
 	"github.com/nspcc-dev/neofs-sdk-go/user"
 )
@@ -93,7 +92,7 @@ func (a *API) PostAuth(params operations.AuthParams) middleware.Responder {
 			response[i], err = prepareObjectToken(ctx, prm, a.pool, *a.owner)
 		} else {
 			prm := newContainerParams(commonPrm, token)
-			response[i], err = prepareContainerTokens(ctx, prm, a.pool, a.key.PublicKey())
+			response[i], err = prepareContainerTokens(ctx, prm, a.pool, a.signer.Public())
 		}
 		if err != nil {
 			return operations.NewAuthBadRequest().WithPayload(util.NewErrorResponse(err))
@@ -148,7 +147,7 @@ func prepareObjectToken(ctx context.Context, params objectTokenParams, pool *poo
 	}, nil
 }
 
-func prepareContainerTokens(ctx context.Context, params containerTokenParams, pool *pool.Pool, key *keys.PublicKey) (*models.TokenResponse, error) {
+func prepareContainerTokens(ctx context.Context, params containerTokenParams, pool *pool.Pool, pubKey neofscrypto.PublicKey) (*models.TokenResponse, error) {
 	iat, exp, err := getTokenLifetime(ctx, pool, params.XBearerLifetime)
 	if err != nil {
 		return nil, fmt.Errorf("couldn't get lifetime: %w", err)
@@ -168,8 +167,7 @@ func prepareContainerTokens(ctx context.Context, params containerTokenParams, po
 	stoken.SetIat(iat)
 	stoken.SetExp(exp)
 
-	authKey := neofsecdsa.PublicKey(*key)
-	stoken.SetAuthKey(&authKey)
+	stoken.SetAuthKey(pubKey)
 
 	var v2token sessionv2.Token
 	stoken.WriteToV2(&v2token)