aarifullin/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

cli: allow to request NEP2 password from input

Browse source 
In case if wrong password was provided via config file we allow the
user to provide the password manually.
This commit is contained in:
Anna Shaleva 2023-01-25 09:51:54 +03:00
parent 1ef39a6e30
commit b77c2846ee
2 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cli/wallet/wallet.go
View file

@ -1000,7 +1000,19 @@ func newAccountFromWIF(w io.Writer, wif string, scrypt keys.ScryptParams, label
acc, err := wallet.NewAccountFromEncryptedWIF(wif, phrase, scrypt)
if err != nil {
return nil, err
// If password from wallet config wasn't OK then retry with the user input,
// see the https://github.com/nspcc-dev/neo-go/issues/2883#issuecomment-1399923088.
if pass == nil {
return nil, err
}
phrase, err = input.ReadPassword(EnterPasswordPrompt)
if err != nil {
return nil, fmt.Errorf("error reading password: %w", err)
}
acc, err = wallet.NewAccountFromEncryptedWIF(wif, phrase, scrypt)
if err != nil {
return nil, err
}
}
acc.Label = name
return acc, nil

35
cli/wallet/wallet_test.go
View file

@ -369,6 +369,41 @@ func TestWalletInit(t *testing.T) {
require.NotNil(t, actual)
require.NoError(t, actual.Decrypt("somepass", w.Scrypt))
})
t.Run("EncryptedWIF with wallet config", func(t *testing.T) {
pass := "somepass"
check := func(t *testing.T, configPass string, needUserPass bool) {
acc, err := wallet.NewAccount()
require.NoError(t, acc.Encrypt(pass, keys.NEP2ScryptParams()))
configPath := filepath.Join(t.TempDir(), "wallet-config.yaml")
require.NoError(t, err)
cfg := &config.Wallet{
Path: walletPath,
Password: configPass,
}
bytes, err := yaml.Marshal(cfg)
require.NoError(t, err)
require.NoError(t, os.WriteFile(configPath, bytes, os.ModePerm))
if needUserPass {
e.In.WriteString(pass + "\r")
}
e.Run(t, "neo-go", "wallet", "import", "--wallet-config", configPath,
"--wif", acc.EncryptedWIF)
w, err := wallet.NewWalletFromFile(walletPath)
require.NoError(t, err)
actual := w.GetAccount(acc.PrivateKey().GetScriptHash())
require.NotNil(t, actual)
require.NoError(t, actual.Decrypt(pass, w.Scrypt))
}
t.Run("config password mismatch", func(t *testing.T) {
check(t, pass+"badpass", true)
})
t.Run("good config password", func(t *testing.T) {
check(t, pass, false)
})
})
t.Run("Multisig", func(t *testing.T) {
t.Run("missing wallet", func(t *testing.T) {
e.RunWithError(t, "neo-go", "wallet", "import-multisig")