From a254fd6bc8ee6da4fb01e1d569baff7555fcdeb4 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Mon, 28 Mar 2022 13:42:18 +0300 Subject: [PATCH] [#1216] neofs-cli: Allow to use session token from file Signed-off-by: Evgenii Stratonikov --- cmd/neofs-cli/modules/object.go | 34 +++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/cmd/neofs-cli/modules/object.go b/cmd/neofs-cli/modules/object.go index b4cc1445a..cccf76e3c 100644 --- a/cmd/neofs-cli/modules/object.go +++ b/cmd/neofs-cli/modules/object.go @@ -7,6 +7,7 @@ import ( "errors" "fmt" "io" + "io/ioutil" "os" "path/filepath" "strconv" @@ -289,6 +290,23 @@ func init() { initObjectHashCmd() initObjectRangeCmd() initCommandObjectLock() + + for _, cmd := range []*cobra.Command{ + objectPutCmd, + objectDelCmd, + objectGetCmd, + objectSearchCmd, + objectHeadCmd, + objectRangeCmd, + cmdObjectLock, + } { + cmd.Flags().StringVar( + &sessionTokenPath, + sessionTokenFlag, + "", + "path to a JSON-encoded container session token", + ) + } } type clientKeySession interface { @@ -320,8 +338,20 @@ func prepareSessionPrmWithOwner( cli, err := getSDKClient(key) exitOnErr(cmd, errf("create API client: %w", err)) - sessionToken, err := sessionCli.CreateSession(cli, ownerID, sessionTokenLifetime) - exitOnErr(cmd, err) + var sessionToken *session.Token + if tokenPath, _ := cmd.Flags().GetString(sessionTokenFlag); len(tokenPath) != 0 { + data, err := ioutil.ReadFile(tokenPath) + exitOnErr(cmd, errf("can't read session token: %w", err)) + + sessionToken = session.NewToken() + if err := sessionToken.Unmarshal(data); err != nil { + err = sessionToken.UnmarshalJSON(data) + exitOnErr(cmd, errf("can't unmarshal session token: %w", err)) + } + } else { + sessionToken, err = sessionCli.CreateSession(cli, ownerID, sessionTokenLifetime) + exitOnErr(cmd, err) + } for i := range prms { objectContext := session.NewObjectContext()