Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-29 13:46:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix #864 changed to boolean to prompt for verify

Browse Source
This commit is contained in:
guzzi_jones 2016-07-31 21:47:43 +00:00
parent 5bee966524
commit 1da1c68bd3
4 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/simplewallet/password_container.cpp
View File

@ -54,17 +54,23 @@ namespace tools
{ {
} }
password_container::password_container(const std::string m_wallet_file) password_container::password_container(bool verify)
: m_empty(true),m_wallet_file_name(m_wallet_file) : m_empty(true),m_verify(m_verify)
{ {
} }
password_container::password_container(std::string&& password)
: m_empty(false)
, m_password(std::move(password))
, m_verify(false)
{
}
password_container::password_container(password_container&& rhs) password_container::password_container(password_container&& rhs)
: m_empty(std::move(rhs.m_empty)) : m_empty(std::move(rhs.m_empty))
, m_password(std::move(rhs.m_password)) , m_password(std::move(rhs.m_password))
, m_wallet_file_name(std::move(rhs.m_wallet_file_name)) , m_verify(std::move(rhs.m_verify))
{ {
} }
password_container::~password_container() password_container::~password_container()
@ -141,7 +147,7 @@ bool password_container::read_from_tty_double_check(const char *message) {
std::cout << message <<": "; std::cout << message <<": ";
if (!password_container::read_from_tty(pass1)) if (!password_container::read_from_tty(pass1))
return false; return false;
if (m_wallet_file_name.empty()){//double check password; new wallet if (m_verify=false){//double check password; new wallet
if (message) if (message)
std::cout << message << ": "; std::cout << message << ": ";
if (!password_container::read_from_tty(pass2)) if (!password_container::read_from_tty(pass2))

5
src/simplewallet/password_container.h
View File

@ -39,7 +39,8 @@ namespace tools
{ {
public: public:
static const size_t max_password_size = 1024; static const size_t max_password_size = 1024;
password_container(const std::string walletFileName); password_container(bool verify);
password_container( std::string&& password);
password_container(password_container&& rhs); password_container(password_container&& rhs);
~password_container(); ~password_container();
@ -58,6 +59,6 @@ namespace tools
bool m_empty; bool m_empty;
std::string m_password; std::string m_password;
const std::string m_wallet_file_name; bool m_verify;
}; };
} }

39
src/simplewallet/simplewallet.cpp
View File

@ -347,7 +347,7 @@ bool simple_wallet::seed_set_language(const std::vector<std::string> &args/* = s
fail_msg_writer() << tr("wallet is non-deterministic and has no seed"); fail_msg_writer() << tr("wallet is non-deterministic and has no seed");
return true; return true;
} }
tools::password_container pwd_container(m_wallet_file); tools::password_container pwd_container(m_wallet_file_set);
success = pwd_container.read_password(); success = pwd_container.read_password();
if (!success) if (!success)
{ {
@ -379,7 +379,7 @@ bool simple_wallet::set_always_confirm_transfers(const std::vector<std::string>
fail_msg_writer() << tr("wallet is watch-only and cannot transfer"); fail_msg_writer() << tr("wallet is watch-only and cannot transfer");
return true; return true;
} }
tools::password_container pwd_container(m_wallet_file); tools::password_container pwd_container(m_wallet_file_set);
success = pwd_container.read_password(); success = pwd_container.read_password();
if (!success) if (!success)
{ {
@ -408,7 +408,7 @@ bool simple_wallet::set_store_tx_info(const std::vector<std::string> &args/* = s
fail_msg_writer() << tr("wallet is watch-only and cannot transfer"); fail_msg_writer() << tr("wallet is watch-only and cannot transfer");
return true; return true;
} }
tools::password_container pwd_container(m_wallet_file); tools::password_container pwd_container(m_wallet_file_set);
success = pwd_container.read_password(); success = pwd_container.read_password();
if (!success) if (!success)
{ {
@ -453,7 +453,7 @@ bool simple_wallet::set_default_mixin(const std::vector<std::string> &args/* = s
if (mixin == 0) if (mixin == 0)
mixin = DEFAULT_MIX; mixin = DEFAULT_MIX;
tools::password_container pwd_container(m_wallet_file); tools::password_container pwd_container(m_wallet_file_set);
success = pwd_container.read_password(); success = pwd_container.read_password();
if (!success) if (!success)
{ {
@ -515,7 +515,7 @@ bool simple_wallet::set_default_fee_multiplier(const std::vector<std::string> &a
} }
} }
tools::password_container pwd_container(m_wallet_file); tools::password_container pwd_container(m_wallet_file_set);
success = pwd_container.read_password(); success = pwd_container.read_password();
if (!success) if (!success)
{ {
@ -550,7 +550,7 @@ bool simple_wallet::set_default_fee_multiplier(const std::vector<std::string> &a
bool simple_wallet::set_auto_refresh(const std::vector<std::string> &args/* = std::vector<std::string>()*/) bool simple_wallet::set_auto_refresh(const std::vector<std::string> &args/* = std::vector<std::string>()*/)
{ {
bool success = false; bool success = false;
tools::password_container pwd_container(m_wallet_file); tools::password_container pwd_container(m_wallet_file_set);
success = pwd_container.read_password(); success = pwd_container.read_password();
if (!success) if (!success)
{ {
@ -594,7 +594,7 @@ bool simple_wallet::set_refresh_type(const std::vector<std::string> &args/* = st
return true; return true;
} }
tools::password_container pwd_container(m_wallet_file); tools::password_container pwd_container(m_wallet_file_set);
success = pwd_container.read_password(); success = pwd_container.read_password();
if (!success) if (!success)
{ {
@ -858,7 +858,7 @@ bool simple_wallet::ask_wallet_create_if_needed()
bool r; bool r;
if(keys_file_exists) if(keys_file_exists)
{ {
m_wallet_file = wallet_path; set_wallet_file(m_wallet_file);
r = true; r = true;
}else }else
{ {
@ -1083,7 +1083,7 @@ bool simple_wallet::generate_from_json(const boost::program_options::variables_m
} }
} }
m_wallet_file = field_filename; set_wallet_file(m_wallet_file);
bool was_deprecated_wallet = m_restore_deterministic_wallet && ((old_language == crypto::ElectrumWords::old_language_name) || bool was_deprecated_wallet = m_restore_deterministic_wallet && ((old_language == crypto::ElectrumWords::old_language_name) ||
crypto::ElectrumWords::get_is_old_style_seed(m_electrum_seed)); crypto::ElectrumWords::get_is_old_style_seed(m_electrum_seed));
@ -1222,7 +1222,7 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
} }
catch (const std::exception &e) { } catch (const std::exception &e) { }
tools::password_container pwd_container(m_wallet_file); //m_wallet_file will be empty at this point for new wallets tools::password_container pwd_container(m_wallet_file_set); //m_wallet_file will be empty at this point for new wallets
if (!cryptonote::simple_wallet::get_password(vm, true, pwd_container)) if (!cryptonote::simple_wallet::get_password(vm, true, pwd_container))
return false; return false;
@ -1309,7 +1309,7 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
} }
crypto::secret_key viewkey = *reinterpret_cast<const crypto::secret_key*>(viewkey_data.data()); crypto::secret_key viewkey = *reinterpret_cast<const crypto::secret_key*>(viewkey_data.data());
m_wallet_file = m_generate_from_view_key; set_wallet_file( m_generate_from_view_key);
// check the view key matches the given address // check the view key matches the given address
crypto::public_key pkey; crypto::public_key pkey;
@ -1376,7 +1376,7 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
} }
crypto::secret_key viewkey = *reinterpret_cast<const crypto::secret_key*>(viewkey_data.data()); crypto::secret_key viewkey = *reinterpret_cast<const crypto::secret_key*>(viewkey_data.data());
m_wallet_file = m_generate_from_keys; set_wallet_file(m_generate_from_keys);
// check the spend and view keys match the given address // check the spend and view keys match the given address
crypto::public_key pkey; crypto::public_key pkey;
@ -1432,7 +1432,7 @@ bool simple_wallet::deinit()
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
bool simple_wallet::handle_command_line(const boost::program_options::variables_map& vm) bool simple_wallet::handle_command_line(const boost::program_options::variables_map& vm)
{ {
m_wallet_file = command_line::get_arg(vm, arg_wallet_file); bool result=set_wallet_file(command_line::get_arg(vm, arg_wallet_file));
m_generate_new = command_line::get_arg(vm, arg_generate_new_wallet); m_generate_new = command_line::get_arg(vm, arg_generate_new_wallet);
m_generate_from_view_key = command_line::get_arg(vm, arg_generate_from_view_key); m_generate_from_view_key = command_line::get_arg(vm, arg_generate_from_view_key);
m_generate_from_keys = command_line::get_arg(vm, arg_generate_from_keys); m_generate_from_keys = command_line::get_arg(vm, arg_generate_from_keys);
@ -1538,7 +1538,7 @@ bool simple_wallet::new_wallet(const std::string &wallet_file, const std::string
return false; return false;
} }
m_wallet_file = wallet_file; set_wallet_file(wallet_file);
m_wallet.reset(new tools::wallet2(testnet)); m_wallet.reset(new tools::wallet2(testnet));
m_wallet->callback(this); m_wallet->callback(this);
@ -1597,7 +1597,7 @@ bool simple_wallet::new_wallet(const std::string &wallet_file, const std::string
bool simple_wallet::new_wallet(const std::string &wallet_file, const std::string& password, const cryptonote::account_public_address& address, bool simple_wallet::new_wallet(const std::string &wallet_file, const std::string& password, const cryptonote::account_public_address& address,
const crypto::secret_key& viewkey, bool testnet) const crypto::secret_key& viewkey, bool testnet)
{ {
m_wallet_file = wallet_file; set_wallet_file(wallet_file);
m_wallet.reset(new tools::wallet2(testnet)); m_wallet.reset(new tools::wallet2(testnet));
m_wallet->callback(this); m_wallet->callback(this);
@ -1625,7 +1625,7 @@ bool simple_wallet::new_wallet(const std::string &wallet_file, const std::string
bool simple_wallet::new_wallet(const std::string &wallet_file, const std::string& password, const cryptonote::account_public_address& address, bool simple_wallet::new_wallet(const std::string &wallet_file, const std::string& password, const cryptonote::account_public_address& address,
const crypto::secret_key& spendkey, const crypto::secret_key& viewkey, bool testnet) const crypto::secret_key& spendkey, const crypto::secret_key& viewkey, bool testnet)
{ {
m_wallet_file = wallet_file; set_wallet_file(wallet_file);
m_wallet.reset(new tools::wallet2(testnet)); m_wallet.reset(new tools::wallet2(testnet));
m_wallet->callback(this); m_wallet->callback(this);
@ -1657,7 +1657,7 @@ bool simple_wallet::open_wallet(const string &wallet_file, const std::string& pa
return false; return false;
} }
m_wallet_file = wallet_file; set_wallet_file(wallet_file);
m_wallet.reset(new tools::wallet2(testnet)); m_wallet.reset(new tools::wallet2(testnet));
m_wallet->callback(this); m_wallet->callback(this);
@ -1762,7 +1762,7 @@ bool simple_wallet::save(const std::vector<std::string> &args)
bool simple_wallet::save_watch_only(const std::vector<std::string> &args/* = std::vector<std::string>()*/) bool simple_wallet::save_watch_only(const std::vector<std::string> &args/* = std::vector<std::string>()*/)
{ {
bool success = false; bool success = false;
tools::password_container pwd_container(m_wallet_file); tools::password_container pwd_container(m_wallet_file_set);
success = pwd_container.read_password(tr("Password for the new watch-only wallet")); success = pwd_container.read_password(tr("Password for the new watch-only wallet"));
if (!success) if (!success)
@ -3618,7 +3618,8 @@ int main(int argc, char* argv[])
bool testnet = command_line::get_arg(vm, arg_testnet); bool testnet = command_line::get_arg(vm, arg_testnet);
bool restricted = command_line::get_arg(vm, arg_restricted); bool restricted = command_line::get_arg(vm, arg_restricted);
std::string wallet_file = command_line::get_arg(vm, arg_wallet_file); std::string wallet_file = command_line::get_arg(vm, arg_wallet_file);
tools::password_container pwd_container(wallet_file); bool wallet_exists=true;
tools::password_container pwd_container(wallet_exists);
if (!cryptonote::simple_wallet::get_password(vm, false, pwd_container)) if (!cryptonote::simple_wallet::get_password(vm, false, pwd_container))
return 1; return 1;
std::string daemon_address = command_line::get_arg(vm, arg_daemon_address); std::string daemon_address = command_line::get_arg(vm, arg_daemon_address);

2
src/simplewallet/simplewallet.h
View File

@ -229,11 +229,13 @@ namespace cryptonote
private: private:
std::string m_wallet_file; std::string m_wallet_file;
bool m_wallet_file_set;
std::string m_generate_new; std::string m_generate_new;
std::string m_generate_from_view_key; std::string m_generate_from_view_key;
std::string m_generate_from_keys; std::string m_generate_from_keys;
std::string m_generate_from_json; std::string m_generate_from_json;
std::string m_import_path; std::string m_import_path;
bool set_wallet_file(std::string name){m_wallet_file=name;m_wallet_file_set=true;return true;};
std::string m_electrum_seed; // electrum-style seed parameter std::string m_electrum_seed; // electrum-style seed parameter