aarifullin/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#1103] neofs-cli: allow to set password in config

Browse source 
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-01-26 10:50:32 +03:00 committed by LeL
parent 0c46827a08
commit 007158ebe1
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cmd/neofs-cli/modules/key_test.go
View file

@ -92,6 +92,16 @@ func Test_getKey(t *testing.T) {
in.WriteString("pass\r")
checkKey(t, nep2, nep2Key)
t.Run("password from config", func(t *testing.T) {
viper.Set(password, "invalid")
in.WriteString("pass\r")
checkKeyError(t, nep2, errInvalidPassword)
viper.Set(password, "pass")
in.WriteString("invalid\r")
checkKey(t, nep2, nep2Key)
})
})
t.Run("raw key", func(t *testing.T) {

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

@ -54,6 +54,8 @@ const (
addressDefault = ""
addressUsage = "address of wallet account"
password = "password"
rpc = "rpc-endpoint"
rpcShorthand = "r"
rpcDefault = ""
@ -203,6 +205,13 @@ func getKey() (*ecdsa.PrivateKey, error) {
return nil, errInvalidKey
}
func getPassword() (string, error) {
if pass := viper.GetString(password); pass != "" {
return pass, nil
}
return input.ReadPassword("Enter password > ")
}
func getKeyFromFile(keyPath string) (*ecdsa.PrivateKey, error) {
data, err := os.ReadFile(keyPath)
if err != nil {
@ -218,7 +227,7 @@ func getKeyFromFile(keyPath string) (*ecdsa.PrivateKey, error) {
}
func getKeyFromNEP2(encryptedWif string) (*ecdsa.PrivateKey, error) {
pass, err := input.ReadPassword("Enter password > ")
pass, err := getPassword()
if err != nil {
printVerbose("Can't read password: %v", err)
return nil, errInvalidPassword
@ -256,7 +265,7 @@ func getKeyFromWallet(w *wallet.Wallet, addrStr string) (*ecdsa.PrivateKey, erro
return nil, errInvalidAddress
}
pass, err := input.ReadPassword("Enter password > ")
pass, err := getPassword()
if err != nil {
printVerbose("Can't read password: %v", err)
return nil, errInvalidPassword