openstack/deb-python-sqlalchemy-utils
Code Issues Proposed changes

Rename .raw to .hash

Browse Source
This commit is contained in:
Ryan Leckey
2013-07-10 10:37:45 -07:00
parent cd5c45c1fc
commit 79965e7293
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sqlalchemy_utils/types/password.py
View File

@@ -15,18 +15,18 @@ class Password(object):
def __init__(self, value, context=None): def __init__(self, value, context=None):
# Store the hash. # Store the hash.
self.raw = value self.hash = value
# Save weakref of the password context (if we have one) # Save weakref of the password context (if we have one)
if context is not None: if context is not None:
self.context = weakref.proxy(context) self.context = weakref.proxy(context)
def __eq__(self, value): def __eq__(self, value):
valid, new = self.context.verify_and_update(value, self.raw) valid, new = self.context.verify_and_update(value, self.hash)
if valid and new: if valid and new:
# New hash was calculated due to various reasons; stored one # New hash was calculated due to various reasons; stored one
# wasn't optimal, etc. # wasn't optimal, etc.
self.raw = new self.hash = new
return valid return valid
def __ne__(self, value): def __ne__(self, value):
@@ -85,7 +85,7 @@ class PasswordType(types.TypeDecorator):
def process_bind_param(self, value, dialect): def process_bind_param(self, value, dialect):
if isinstance(value, Password): if isinstance(value, Password):
# Value has already been hashed. # Value has already been hashed.
return value.raw return value.hash
if isinstance(value, six.string_types): if isinstance(value, six.string_types):
# Assume value has not been hashed. # Assume value has not been hashed.

8
tests/test_password.py
View File

@@ -32,8 +32,8 @@ class TestPasswordType(TestCase):
obj = self.User() obj = self.User()
obj.password = b'b' obj.password = b'b'
assert obj.password.raw != 'b' assert obj.password.hash != 'b'
assert obj.password.raw.startswith(b'$pbkdf2-sha512$') assert obj.password.hash.startswith(b'$pbkdf2-sha512$')
def test_check(self): def test_check(self):
""" """
@@ -65,6 +65,6 @@ class TestPasswordType(TestCase):
obj = self.User() obj = self.User()
obj.password = Password(md5_crypt.encrypt('b')) obj.password = Password(md5_crypt.encrypt('b'))
assert obj.password.raw.startswith('$1$') assert obj.password.hash.startswith('$1$')
assert obj.password == 'b' assert obj.password == 'b'
assert obj.password.raw.startswith('$pbkdf2-sha512$') assert obj.password.hash.startswith('$pbkdf2-sha512$')