dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Improve CLI --wallet_import (#1800)

Browse source 
Return error if new wallet is encrypted & provided password invalid
Full import for new wallet with --force option instead of private keys import
This commit is contained in:
Sergey Kroshnin 2019-03-06 22:43:05 +03:00 • committed by GitHub
commit bd0707dbb2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

42
nano/node/cli.cpp
View file

@ -712,9 +712,30 @@ std::error_code nano::handle_node_options (boost::program_options::variables_map
auto existing (node.node->wallets.items.find (wallet_id)); auto existing (node.node->wallets.items.find (wallet_id));
if (existing != node.node->wallets.items.end ()) if (existing != node.node->wallets.items.end ())
{ {
if (existing->second->import (contents.str (), password)) bool valid (false);
{ {
std::cerr << "Unable to import wallet\n"; auto transaction (node.node->wallets.tx_begin_write ());
valid = existing->second->store.valid_password (transaction);
if (!valid)
{
valid = !existing->second->enter_password (transaction, password);
}
}
if (valid)
{
if (existing->second->import (contents.str (), password))
{
std::cerr << "Unable to import wallet\n";
ec = nano::error_cli::invalid_arguments;
}
else
{
std::cout << "Import completed\n";
}
}
else
{
std::cerr << boost::str (boost::format ("Invalid password for wallet %1%\nNew wallet should have empty (default) password or passwords for new wallet & json file should match\n") % wallet_id.to_string ());
ec = nano::error_cli::invalid_arguments; ec = nano::error_cli::invalid_arguments;
} }
} }
@ -727,13 +748,24 @@ std::error_code nano::handle_node_options (boost::program_options::variables_map
} }
else else
{ {
node.node->wallets.create (wallet_id); bool error (true);
auto existing (node.node->wallets.items.find (wallet_id)); {
if (existing->second->import (contents.str (), password)) std::lock_guard<std::mutex> lock (node.node->wallets.mutex);
auto transaction (node.node->wallets.tx_begin_write ());
nano::wallet wallet (error, transaction, node.node->wallets, wallet_id.to_string (), contents.str ());
}
if (error)
{ {
std::cerr << "Unable to import wallet\n"; std::cerr << "Unable to import wallet\n";
ec = nano::error_cli::invalid_arguments; ec = nano::error_cli::invalid_arguments;
} }
else
{
node.node->wallets.reload ();
std::lock_guard<std::mutex> lock (node.node->wallets.mutex);
release_assert (node.node->wallets.items.find (wallet_id) != node.node->wallets.items.end ());
std::cout << "Import completed\n";
}
} }
} }
} }