Merge pull request #943

f0c0a3f Fix #864 Squashed commit of the following: commit 9af9e4223b58bbb65a3519af2c2bfc273cbd23d6     fixed some formatting commit c7920e1cf88ff46eb9294101344d9a567f22e2da Merge: 97eb28b 1da1c68     fix#864 fix using boolean commit 97eb28ba5dd49ddde8c8785f39b24d955e5de31c     Fix #864 boolean value used to verify on new wallet commit 1da1c68bd3a9a373c70482b6e6e95251096149f1     fix #864 changed to boolean to prompt for verify commit 5bee96652434762d2c91ce31a1b1c9f169446ddc     fix 864; made variable names easier for understanding branching. commit 45715960d30293f781b2ff9e5e647c2ec893f4a3     fix #864;  allow password to be entered twice for new wallets for verification. fix #864 password entry verification; ammended boolean fix #864 ; default constructor for password_container should set verify=true (guzzi_jones)

4 files changed, 106 insertions, 53 deletions

diff --git a/src/simplewallet/password_container.cpp b/src/simplewallet/password_container.cpp
index 638322be7..480d132e7 100644
--- a/src/simplewallet/password_container.cpp
+++ b/src/simplewallet/password_container.cpp
@@ -48,24 +48,33 @@ namespace tools
   {
     bool is_cin_tty();
   }
-
+  // deleted via private member
   password_container::password_container()
-    : m_empty(true)
+    : m_empty(true),m_verify(true)
   {
+
+  }
+  password_container::password_container(bool verify)
+    : m_empty(true),m_verify(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)
     : m_empty(std::move(rhs.m_empty))
     , m_password(std::move(rhs.m_password))
+    , m_verify(std::move(rhs.m_verify))
   {
   }
-
   password_container::~password_container()
   {
     clear();
@@ -88,9 +97,7 @@ namespace tools
     bool r;
     if (is_cin_tty())
     {
-      if (message)
-        std::cout << message << ": ";
-      r = read_from_tty();
+     r = read_from_tty_double_check(message);
     }
     else
     {
@@ -132,6 +139,43 @@ namespace tools
     return true;
   }
 
+bool password_container::read_from_tty_double_check(const char *message) {
+    std::string pass1;
+    std::string pass2;
+    bool match=false;
+    bool doNotVerifyEntry=false;
+    do{
+        if (message)
+            std::cout << message <<": ";
+        if (!password_container::read_from_tty(pass1))
+            return false;
+        if (m_verify==true){//double check password; 
+            if (message)
+                std::cout << message << ": ";
+            if (!password_container::read_from_tty(pass2))
+                return false;
+            if(pass1!=pass2){ //new password entered did not match
+
+                std::cout << "Passwords do not match" << std::endl;
+                pass1="";
+                pass2="";
+                match=false;
+            }
+            else{//new password matches
+                match=true;
+            }
+        }
+        else
+            doNotVerifyEntry=true; //do not verify
+            //No need to verify password entered at this point in the code 
+            
+    }while(match==false && doNotVerifyEntry==false);
+
+    m_password=pass1;
+    return true;
+  }
+
+
 #if defined(_WIN32)
 
   namespace
@@ -142,7 +186,7 @@ namespace tools
     }
   }
 
-  bool password_container::read_from_tty()
+  bool password_container::read_from_tty(std::string & pass)
   {
     const char BACKSPACE = 8;
 
@@ -154,8 +198,8 @@ namespace tools
     ::SetConsoleMode(h_cin, mode_new);
 
     bool r = true;
-    m_password.reserve(max_password_size);
-    while (m_password.size() < max_password_size)
+    pass.reserve(max_password_size);
+    while (pass.size() < max_password_size)
     {
       DWORD read;
       char ch;
@@ -172,16 +216,16 @@ namespace tools
       }
       else if (ch == BACKSPACE)
       {
-        if (!m_password.empty())
+        if (!pass.empty())
         {
-          m_password.back() = '\0';
-          m_password.resize(m_password.size() - 1);
+          pass.back() = '\0';
+          pass.resize(pass.size() - 1);
           std::cout << "\b \b";
         }
       }
       else
       {
-        m_password.push_back(ch);
+        pass.push_back(ch);
         std::cout << '*';
       }
     }
@@ -217,13 +261,12 @@ namespace tools
       return ch;
     }
   }
-
-  bool password_container::read_from_tty()
+  bool password_container::read_from_tty(std::string &aPass)
   {
     const char BACKSPACE = 127;
 
-    m_password.reserve(max_password_size);
-    while (m_password.size() < max_password_size)
+    aPass.reserve(max_password_size);
+    while (aPass.size() < max_password_size)
     {
       int ch = getch();
       if (EOF == ch)
@@ -237,16 +280,16 @@ namespace tools
       }
       else if (ch == BACKSPACE)
       {
-        if (!m_password.empty())
+        if (!aPass.empty())
         {
-          m_password.back() = '\0';
-          m_password.resize(m_password.size() - 1);
+          aPass.back() = '\0';
+          aPass.resize(aPass.size() - 1);
           std::cout << "\b \b";
         }
       }
       else
       {
-        m_password.push_back(ch);
+        aPass.push_back(ch);
         std::cout << '*';
       }
     }
diff --git a/src/simplewallet/password_container.h b/src/simplewallet/password_container.h
index 64567978d..62f43aa37 100644
--- a/src/simplewallet/password_container.h
+++ b/src/simplewallet/password_container.h
@@ -31,6 +31,7 @@
 #pragma once
 
 #include <string>
+#include <boost/program_options/variables_map.hpp>
 
 namespace tools
 {
@@ -38,10 +39,9 @@ namespace tools
   {
   public:
     static const size_t max_password_size = 1024;
-
-    password_container();
-    password_container(std::string&& password);
+    password_container(bool verify);
     password_container(password_container&& rhs);
+    password_container(std::string&& password);
     ~password_container();
 
     void clear();
@@ -51,11 +51,14 @@ namespace tools
     bool read_password(const char *message = "password");
 
   private:
+    //delete constructor with no parameters
+    password_container();
     bool read_from_file();
-    bool read_from_tty();
+    bool read_from_tty(std::string & pass);
+    bool read_from_tty_double_check(const char *message);
 
-  private:
     bool m_empty;
     std::string m_password;
+    bool m_verify;
   };
 }
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index a3a4685b5..76970a44f 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -33,7 +33,6 @@
  * 
  * \brief Source file that defines simple_wallet class.
  */
-
 #include <thread>
 #include <iostream>
 #include <sstream>
@@ -348,7 +347,8 @@ 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");
     return true;
   }
-  tools::password_container pwd_container;
+ 
+  tools::password_container pwd_container(m_wallet_file.empty());
   success = pwd_container.read_password();
   if (!success)
   {
@@ -380,7 +380,7 @@ bool simple_wallet::set_always_confirm_transfers(const std::vector<std::string>
     fail_msg_writer() << tr("wallet is watch-only and cannot transfer");
     return true;
   }
-  tools::password_container pwd_container;
+  tools::password_container pwd_container(m_wallet_file.empty());
   success = pwd_container.read_password();
   if (!success)
   {
@@ -409,7 +409,8 @@ 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");
     return true;
   }
-  tools::password_container pwd_container;
+ 
+  tools::password_container pwd_container(m_wallet_file.empty());
   success = pwd_container.read_password();
   if (!success)
   {
@@ -453,8 +454,9 @@ bool simple_wallet::set_default_mixin(const std::vector<std::string> &args/* = s
     }
     if (mixin == 0)
       mixin = DEFAULT_MIX;
+ 
+    tools::password_container pwd_container(m_wallet_file.empty());
 
-    tools::password_container pwd_container;
     success = pwd_container.read_password();
     if (!success)
     {
@@ -515,8 +517,8 @@ bool simple_wallet::set_default_fee_multiplier(const std::vector<std::string> &a
         return true;
       }
     }
-
-    tools::password_container pwd_container;
+ 
+    tools::password_container pwd_container(m_wallet_file.empty());
     success = pwd_container.read_password();
     if (!success)
     {
@@ -550,9 +552,10 @@ 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 success = false;
-  tools::password_container pwd_container;
-  success = pwd_container.read_password();
+ 
+  tools::password_container pwd_container(m_wallet_file.empty());
+
+  bool success = pwd_container.read_password();
   if (!success)
   {
     fail_msg_writer() << tr("failed to read wallet password");
@@ -594,8 +597,8 @@ bool simple_wallet::set_refresh_type(const std::vector<std::string> &args/* = st
   {
     return true;
   }
-
-  tools::password_container pwd_container;
+ 
+  tools::password_container pwd_container(m_wallet_file.empty());
   success = pwd_container.read_password();
   if (!success)
   {
@@ -861,7 +864,7 @@ bool simple_wallet::ask_wallet_create_if_needed()
   bool r;
   if(keys_file_exists)
   {
-    m_wallet_file = wallet_path;
+    m_wallet_file=wallet_path;
     r = true;
   }else
   {
@@ -896,7 +899,7 @@ void simple_wallet::print_seed(std::string seed)
 }
 
 //----------------------------------------------------------------------------------------------------
-static bool get_password(const boost::program_options::variables_map& vm, bool allow_entry, tools::password_container &pwd_container)
+bool simple_wallet::get_password(const boost::program_options::variables_map& vm, bool allow_entry, tools::password_container &pwd_container)
 {
   // has_arg returns true even when the parameter is not passed ??
   const std::string gfj = command_line::get_arg(vm, arg_generate_from_json);
@@ -937,6 +940,8 @@ static bool get_password(const boost::program_options::variables_map& vm, bool a
 
   if (allow_entry)
   {
+      //vm is already part of the password container class.  just need to check vm for an already existing wallet
+      //here need to pass in variable map.  This will indicate if the wallet already exists to the read password function
     bool r = pwd_container.read_password();
     if (!r)
     {
@@ -1084,7 +1089,7 @@ bool simple_wallet::generate_from_json(const boost::program_options::variables_m
     }
   }
 
-  m_wallet_file = field_filename;
+  m_wallet_file=field_filename;
 
   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));
@@ -1222,9 +1227,8 @@ bool simple_wallet::init(const boost::program_options::variables_map& vm)
     }
   }
   catch (const std::exception &e) { }
-
-  tools::password_container pwd_container;
-  if (!get_password(vm, true, pwd_container))
+  tools::password_container pwd_container(m_wallet_file.empty()); //m_wallet_file will be empty at this point for new wallets
+  if (!cryptonote::simple_wallet::get_password(vm, true, pwd_container))
     return false;
 
   if (!m_generate_new.empty() || m_restore_deterministic_wallet || !m_generate_from_view_key.empty() || !m_generate_from_keys.empty() || !m_generate_from_json.empty())
@@ -1310,7 +1314,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());
 
-      m_wallet_file = m_generate_from_view_key;
+      m_wallet_file=m_generate_from_view_key;
 
       // check the view key matches the given address
       crypto::public_key pkey;
@@ -1377,7 +1381,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());
 
-      m_wallet_file = m_generate_from_keys;
+      m_wallet_file=m_generate_from_keys;
 
       // check the spend and view keys match the given address
       crypto::public_key pkey;
@@ -1539,7 +1543,8 @@ bool simple_wallet::new_wallet(const std::string &wallet_file, const std::string
       return false;
   }
 
-  m_wallet_file = wallet_file;
+
+  m_wallet_file=wallet_file;
 
   m_wallet.reset(new tools::wallet2(testnet));
   m_wallet->callback(this);
@@ -1598,7 +1603,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,
   const crypto::secret_key& viewkey, bool testnet)
 {
-  m_wallet_file = wallet_file;
+  m_wallet_file=wallet_file;
 
   m_wallet.reset(new tools::wallet2(testnet));
   m_wallet->callback(this);
@@ -1626,7 +1631,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,
   const crypto::secret_key& spendkey, const crypto::secret_key& viewkey, bool testnet)
 {
-  m_wallet_file = wallet_file;
+  m_wallet_file=wallet_file;
 
   m_wallet.reset(new tools::wallet2(testnet));
   m_wallet->callback(this);
@@ -1658,7 +1663,7 @@ bool simple_wallet::open_wallet(const string &wallet_file, const std::string& pa
     return false;
   }
 
-  m_wallet_file = wallet_file;
+  m_wallet_file=wallet_file;
   m_wallet.reset(new tools::wallet2(testnet));
   m_wallet->callback(this);
 
@@ -1764,7 +1769,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 success = false;
-  tools::password_container pwd_container;
+  tools::password_container pwd_container(m_wallet_file.empty());
 
   success = pwd_container.read_password(tr("Password for the new watch-only wallet"));
   if (!success)
@@ -3753,8 +3758,9 @@ int main(int argc, char* argv[])
     bool testnet = command_line::get_arg(vm, arg_testnet);
     bool restricted = command_line::get_arg(vm, arg_restricted);
     std::string wallet_file     = command_line::get_arg(vm, arg_wallet_file);
-    tools::password_container pwd_container;
-    if (!get_password(vm, false, pwd_container))
+ 
+    tools::password_container pwd_container(wallet_file.empty());
+    if (!cryptonote::simple_wallet::get_password(vm, false, pwd_container))
       return 1;
     std::string daemon_address  = command_line::get_arg(vm, arg_daemon_address);
     std::string daemon_host = command_line::get_arg(vm, arg_daemon_host);
diff --git a/src/simplewallet/simplewallet.h b/src/simplewallet/simplewallet.h
index b35ca0866..8e3d5d6e0 100644
--- a/src/simplewallet/simplewallet.h
+++ b/src/simplewallet/simplewallet.h
@@ -58,6 +58,7 @@ namespace cryptonote
   class simple_wallet : public tools::i_wallet2_callback
   {
   public:
+    static bool get_password(const boost::program_options::variables_map& vm, bool allow_entry, tools::password_container &pwd_container);
     static const char *tr(const char *str) { return i18n_translate(str, "cryptonote::simple_wallet"); }
 
   public: