Mercurial > kallithea
changeset 1195:74251f8004d2 beta
merged freebsd support issue from default
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sat, 02 Apr 2011 00:44:13 +0200 |
parents | 07963dd1f0f1 |
children | 49ea527452d3 |
files | rhodecode/lib/auth.py |
diffstat | 1 files changed, 9 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/auth.py Sat Apr 02 00:42:17 2011 +0200 +++ b/rhodecode/lib/auth.py Sat Apr 02 00:44:13 2011 +0200 @@ -36,11 +36,11 @@ from pylons.controllers.util import abort, redirect from pylons.i18n.translation import _ -from rhodecode import __platform__ +from rhodecode import __platform__, PLATFORM_WIN, PLATFORM_OTHERS -if __platform__ == 'Windows': +if __platform__ in PLATFORM_WIN: from hashlib import sha256 -if __platform__ in ('Linux', 'Darwin'): +if __platform__ in PLATFORM_OTHERS: import bcrypt from rhodecode.lib import str2bool @@ -90,12 +90,12 @@ :param password: password to hash """ - if __platform__ == 'Windows': + if __platform__ in PLATFORM_WIN: return sha256(str_).hexdigest() - elif __platform__ in ('Linux', 'Darwin'): + elif __platform__ in PLATFORM_OTHERS: return bcrypt.hashpw(str_, bcrypt.gensalt(10)) else: - raise Exception('Unknown or unsupoprted platform %s' % __platform__) + raise Exception('Unknown or unsupported platform %s' % __platform__) @classmethod def hash_check(cls, password, hashed): @@ -107,15 +107,12 @@ :param hashed: password in hashed form """ - if __platform__ == 'Windows': + if __platform__ in PLATFORM_WIN: return sha256(password).hexdigest() == hashed - elif __platform__ in ('Linux', 'Darwin'): + elif __platform__ in PLATFORM_OTHERS: return bcrypt.hashpw(password, hashed) == hashed else: - raise Exception('Unknown or unsupoprted platform %s' % __platform__) - - - + raise Exception('Unknown or unsupported platform %s' % __platform__) def get_crypt_password(password):