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

Refactored password type

Browse Source
This commit is contained in:
Konsta Vesterinen
2013-10-24 13:49:11 +03:00
parent 576edb19a5
commit f37d9d6a03
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sqlalchemy_utils/types/password.py
View File

@@ -14,7 +14,6 @@ except ImportError:
class Password(object): class Password(object):
def __init__(self, value, context=None): def __init__(self, value, context=None):
# Store the hash. # Store the hash.
self.hash = value self.hash = value
@@ -87,6 +86,12 @@ class PasswordType(types.TypeDecorator, ScalarCoercible):
self.context = CryptContext(**kwargs) self.context = CryptContext(**kwargs)
if max_length is None: if max_length is None:
max_length = self.calculate_max_length()
# Set the length to the now-calculated max length.
self.length = max_length
def calculate_max_length(self):
# Calculate the largest possible encoded password. # Calculate the largest possible encoded password.
# name + rounds + salt + hash + ($ * 4) of largest hash # name + rounds + salt + hash + ($ * 4) of largest hash
max_lengths = [1024] max_lengths = [1024]
@@ -102,11 +107,8 @@ class PasswordType(types.TypeDecorator, ScalarCoercible):
) )
max_lengths.append(length) max_lengths.append(length)
# Set the max_length to the maximum calculated max length. # Return the maximum calculated max length.
max_length = max(max_lengths) return max(max_lengths)
# Set the length to the now-calculated max length.
self.length = max_length
def load_dialect_impl(self, dialect): def load_dialect_impl(self, dialect):
if dialect.name == 'postgresql': if dialect.name == 'postgresql':