bugfix to CryptContext.verify [issue 17]

* fixed formatting error thrown by CryptContext.verify when issuing min_verify_time warning
* rewrote CryptContext.verify's min_verify_time UT to:
	- use mock hash handler
	- verify that appropriate warning is issued when going overtime

3 files changed, 52 insertions, 17 deletions

diff --git a/CHANGES b/CHANGES
index 2173b60..e17280e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,11 @@
 Release History
 ===============
 
+**1.5.1** (NOT YET RELEASED)
+
+    * bugfix: fixed error thrown by CryptContext.verify
+      when issuing min_verify_time warning [issue 17]
+
 **1.5** (2011-07-11)
 
     *"20% more unicode than the leading breakfast cereal"*
diff --git a/passlib/context.py b/passlib/context.py
index 986f015..e3da021 100644
--- a/passlib/context.py
+++ b/passlib/context.py
@@ -1082,7 +1082,8 @@ class CryptContext(object):
                 time.sleep(delta)
             elif delta < 0:
                 #warn app they aren't being protected against timing attacks...
-                warn("CryptContext: verify exceeded min_verify_time: scheme=%r min_verify_time=%r elapsed=%r", handler.name, mvt, end-start)
+                warn("CryptContext: verify exceeded min_verify_time: scheme=%r min_verify_time=%r elapsed=%r" %
+                     (handler.name, mvt, end-start))
 
         return result
 
diff --git a/passlib/tests/test_context.py b/passlib/tests/test_context.py
index 910b312..53f71f4 100644
--- a/passlib/tests/test_context.py
+++ b/passlib/tests/test_context.py
@@ -719,22 +719,51 @@ class CryptContextTest(TestCase):
             self.assertTrue(not cc.verify("test", None, scheme=handler.name))
 
     def test_24_min_verify_time(self):
-        cc = CryptContext(["plaintext", "bsdi_crypt"], min_verify_time=.1)
-
-        #plaintext should (in reality) take <.01,
-        #so this test checks mvt makes it take 0.09 - .5
-        s = time.time()
-        cc.verify("password", "password")
-        d = time.time()-s
-        self.assertTrue(d>=.09,d)
-        self.assertTrue(d<.5)
-
-        #this may take longer, so we just check min
-        s = time.time()
-        cc.verify("password", '_2b..iHVSUNMkJT.GcFU')
-        d = time.time()-s
-        self.assertTrue(d>=.09, "mvt=.1, delta=%r" % (d,))
-
+        "test verify() honors min_verify_time"
+        #NOTE: this whole test assumes time.sleep() and time.time()
+        #      have at least 1ms accuracy
+        
+        class TimedHash(uh.StaticHandler):
+            "psuedo hash that takes specified amount of time"
+            name = "timed_hash"            
+            delay = 0
+            
+            @classmethod
+            def identify(cls, hash):
+                return True
+        
+            @classmethod
+            def genhash(cls, secret, hash):
+                time.sleep(cls.delay)
+                return hash or 'x'
+        
+        cc = CryptContext([TimedHash], min_verify_time=.1)
+
+        def timecall(func, *args, **kwds):
+            start = time.time()
+            result = func(*args, **kwds)
+            end = time.time()
+            return end-start, result
+
+        #verify hashing works
+        TimedHash.delay = .05
+        elapsed, _ = timecall(TimedHash.genhash, 'stub', 'stub')
+        self.assertAlmostEquals(elapsed, .05, delta=.01)
+        
+        #ensure min verify time is honored
+        elapsed, _ = timecall(cc.verify, "stub", "stub")
+        self.assertAlmostEquals(elapsed, .1, delta=.01)
+        
+        #ensure taking longer emits a warning.
+        TimedHash.delay = .15
+        with catch_warnings(record=True) as wlog:
+            warnings.simplefilter("always")
+            elapsed, _ = timecall(cc.verify, "stub", "stub")
+        self.assertAlmostEquals(elapsed, .15, delta=.01)
+        self.assertEqual(len(wlog), 1)
+        self.assertWarningMatches(wlog[0],
+            message_re="CryptContext: verify exceeded min_verify_time")
+        
     def test_25_verify_and_update(self):
         "test verify_and_update()"
         cc = CryptContext(**self.sample_policy_1)