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

Fix PasswordType

Browse Source 
This commit fixes an error when hex_md5 and other schemes that does not
have max_salt_size. This kind of schemes are needed to migrate from very
old and stupid databases.
This commit is contained in:
Choongmin Lee
2014-04-01 15:12:45 +09:00
parent 7e9d582975
commit dd7b66fa28
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sqlalchemy_utils/types/password.py
View File

@@ -143,7 +143,7 @@ class PasswordType(types.TypeDecorator, ScalarCoercible):
scheme = getattr(__import__('passlib.hash').hash, name) scheme = getattr(__import__('passlib.hash').hash, name)
length = 4 + len(scheme.name) length = 4 + len(scheme.name)
length += len(str(getattr(scheme, 'max_rounds', ''))) length += len(str(getattr(scheme, 'max_rounds', '')))
length += scheme.max_salt_size or 0 length += getattr(scheme, 'max_salt_size', 0)
length += getattr( length += getattr(
scheme, scheme,
'encoded_checksum_size', 'encoded_checksum_size',

5
tests/types/test_password.py
View File

@@ -16,10 +16,11 @@ class TestPasswordType(TestCase):
schemes=[ schemes=[
'pbkdf2_sha512', 'pbkdf2_sha512',
'pbkdf2_sha256', 'pbkdf2_sha256',
'md5_crypt' 'md5_crypt',
'hex_md5'
], ],
deprecated=['md5_crypt'] deprecated=['md5_crypt', 'hex_md5']
)) ))
def __repr__(self): def __repr__(self):