coverage masterpassword

xeroc · Aug 7, 2018 · dddee40 · dddee40
1 parent 84a3d21
commit dddee40
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/graphenestorage/masterpassword.py b/graphenestorage/masterpassword.py
@@ -84,11 +84,15 @@ def decryptEncryptedMaster(self):
         try:
             decrypted_master = aes.decrypt(encrypted_master)
         except:
-            raise WrongMasterPasswordException
+            self.raiseWrongMasterPasswordException()
         if checksum != self.deriveChecksum(decrypted_master):
-            raise WrongMasterPasswordException
+            self.raiseWrongMasterPasswordException()
         self.decrypted_master = decrypted_master
 
+    def raiseWrongMasterPasswordException(self):
+        self.password = None
+        raise WrongMasterPasswordException
+
     def saveEncrytpedMaster(self):
         self.config[self.config_key] = self.getEncryptedMaster()
 
@@ -140,7 +144,7 @@ def tryUnlockFromEnv(self):
             log.debug("Trying to use environmental variable to unlock wallet")
             self.unlock(os.environ.get("UNLOCK"))
         else:
-            raise WrongMasterPasswordException
+            self.raiseWrongMasterPasswordException()
 
     def decrypt(self, wif):
         return format(

diff --git a/tests/test_storage.py b/tests/test_storage.py
@@ -1,6 +1,8 @@
+import os
 import unittest
 
 from graphenebase.account import PrivateKey
+from graphenestorage.exceptions import WrongMasterPasswordException
 
 import graphenestorage as storage
 
@@ -130,10 +132,32 @@ def test_masterpassword(self):
         )
 
     def test_wrongmastermass(self):
-        from graphenestorage.exceptions import WrongMasterPasswordException
         config = storage.InRamConfigurationStore()
         keys = storage.InRamEncryptedKeyStore(config=config)
         keys.newMaster("foobar")
         keys.lock()
         with self.assertRaises(WrongMasterPasswordException):
             keys.unlock("foobar2")
+
+    def test_masterpwd(self):
+        with self.assertRaises(Exception):
+            storage.InRamEncryptedKeyStore()
+        config = storage.InRamConfigurationStore()
+        keys = storage.InRamEncryptedKeyStore(config=config)
+        self.assertTrue(keys.locked())
+        keys.unlock("foobar")
+        keys.password = "FOoo"
+        with self.assertRaises(Exception):
+            keys.decryptEncryptedMaster()
+        keys.lock()
+
+        with self.assertRaises(WrongMasterPasswordException):
+            keys.unlock("foobar2")
+
+        with self.assertRaises(Exception):
+            keys.getEncryptedMaster()
+
+        os.environ["UNLOCK"] = "foobar"
+        keys.unlocked()
+
+        self.assertFalse(keys.locked())