StaticHandler now provides internal _norm_hash() method for subclasses to override

* enhanced StaticHandler.verify method to normalize hash unicode/bytes better
* changed various StaticHandler-derived classes to use _norm_hash() instead of re-implementing verify()
* oracle, postgres hashes now derive from StaticHandler instead of object.

1 files changed, 16 insertions, 5 deletions

diff --git a/passlib/utils/handlers.py b/passlib/utils/handlers.py
index d8a9c3a..cfa9381 100644
--- a/passlib/utils/handlers.py
+++ b/passlib/utils/handlers.py
@@ -199,16 +199,27 @@ class StaticHandler(object):
         raise NotImplementedError("%s subclass must implement genhash()" % (cls,))
 
     @classmethod
-    def encrypt(cls, secret, **context):
+    def encrypt(cls, secret, *cargs, **context):
+        #NOTE: subclasses generally won't need to override this.
         config = cls.genconfig()
-        return cls.genhash(secret, config, **context)
+        return cls.genhash(secret, config, *cargs, **context)
 
     @classmethod
-    def verify(cls, secret, hash, **context):
+    def verify(cls, secret, hash, *cargs, **context):
+        #NOTE: subclasses generally won't need to override this.
         if hash is None:
             raise ValueError("no hash specified")
-        hash = to_hash_str(hash) #so equality works
-        return cls.genhash(secret, hash, **context) == hash
+        hash = cls._norm_hash(hash)
+        result = cls.genhash(secret, hash, *cargs, **context)
+        return cls._norm_hash(result) == hash
+        
+    @classmethod
+    def _norm_hash(cls, hash):
+        """[helper for verify] normalize hash for comparsion purposes"""
+        #NOTE: this is mainly provided for case-insenstive subclasses to override.
+        if isinstance(hash, bytes):
+            hash = hash.decode("ascii")
+        return hash
 
     #=====================================================
     #eoc