mkadilov/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#610] neofs-cli: add --generate-key flag

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2021-06-15 18:43:09 +03:00 committed by Alex Vanin
parent b7dfbf4c23
commit 2b5998b820
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmd/neofs-cli/modules/root.go
View file

@ -24,8 +24,6 @@ import (
const ( const (
envPrefix = "NEOFS_CLI" envPrefix = "NEOFS_CLI"
generateKeyConst = "new"
ttlDefaultValue = 2 ttlDefaultValue = 2
) )
@ -79,7 +77,11 @@ func init() {
rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "", "config file (default is $HOME/.config/neofs-cli/config.yaml)") rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "c", "", "config file (default is $HOME/.config/neofs-cli/config.yaml)")
rootCmd.PersistentFlags().StringP("key", "k", "", "private key in hex, WIF, NEP-2 or filepath (use `--key new` to generate key for request)") // Key options.
rootCmd.PersistentFlags().BoolP("generate-key", "", false, "generate new private key")
_ = viper.BindPFlag("generate-key", rootCmd.PersistentFlags().Lookup("generate-key"))
rootCmd.PersistentFlags().StringP("key", "k", "", "private key in hex, WIF, NEP-2 or filepath")
_ = viper.BindPFlag("key", rootCmd.PersistentFlags().Lookup("key")) _ = viper.BindPFlag("key", rootCmd.PersistentFlags().Lookup("key"))
rootCmd.PersistentFlags().StringP("address", "", "", "address of wallet account") rootCmd.PersistentFlags().StringP("address", "", "", "address of wallet account")
@ -133,8 +135,7 @@ const nep2Base58Length = 58
// getKey returns private key that was provided in global arguments. // getKey returns private key that was provided in global arguments.
func getKey() (*ecdsa.PrivateKey, error) { func getKey() (*ecdsa.PrivateKey, error) {
privateKey := viper.GetString("key") if viper.GetBool("generate-key") {
if privateKey == generateKeyConst {
priv, err := keys.NewPrivateKey() priv, err := keys.NewPrivateKey()
if err != nil { if err != nil {
return nil, errCantGenerateKey return nil, errCantGenerateKey
@ -142,6 +143,7 @@ func getKey() (*ecdsa.PrivateKey, error) {
return &priv.PrivateKey, nil return &priv.PrivateKey, nil
} }
privateKey := viper.GetString("key")
w, err := wallet.NewWalletFromFile(privateKey) w, err := wallet.NewWalletFromFile(privateKey)
if err == nil { if err == nil {
return getKeyFromWallet(w, viper.GetString("address")) return getKeyFromWallet(w, viper.GetString("address"))