1
0
mirror of https://github.com/kakwa/ldapcherry synced 2024-11-24 10:14:31 +01:00

enable password hash.

This commit is contained in:
Yuusuke KOUNOIKE 2016-06-18 22:38:01 +09:00
parent e56835d4f4
commit a07b7d48c5

View File

@ -31,6 +31,9 @@ from mako.template import Template
from mako import lookup from mako import lookup
from sets import Set from sets import Set
# passlib hash password module import
from passlib.context import CryptContext
SESSION_KEY = '_cp_username' SESSION_KEY = '_cp_username'
@ -596,7 +599,12 @@ class LdapCherry(object):
raise PasswordMissMatch() raise PasswordMissMatch()
if not self._checkppolicy(params['attrs'][pwd1])['match']: if not self._checkppolicy(params['attrs'][pwd1])['match']:
raise PPolicyError() raise PPolicyError()
params['attrs'][attr] = params['attrs'][pwd1] hash_type = self.attributes.attributes[attr].get('hash')
if hash_type:
ctx = CryptContext(schemes=[hash_type])
params['attrs'][attr] = ctx.encrypt(params['attrs'][pwd1])
else:
params['attrs'][attr] = params['attrs'][pwd1]
if attr in params['attrs']: if attr in params['attrs']:
self.attributes.check_attr(attr, params['attrs'][attr]) self.attributes.check_attr(attr, params['attrs'][attr])
backends = self.attributes.get_backends_attributes(attr) backends = self.attributes.get_backends_attributes(attr)
@ -653,7 +661,12 @@ class LdapCherry(object):
params['attrs'][pwd1] params['attrs'][pwd1]
)['match']: )['match']:
raise PPolicyError() raise PPolicyError()
params['attrs'][attr] = params['attrs'][pwd1] hash_type = self.attributes.attributes[attr].get('hash')
if hash_type:
ctx = CryptContext(schemes=[hash_type])
params['attrs'][attr] = ctx.encrypt(params['attrs'][pwd1])
else:
params['attrs'][attr] = params['attrs'][pwd1]
if attr in params['attrs'] and params['attrs'][attr] != '': if attr in params['attrs'] and params['attrs'][attr] != '':
self.attributes.check_attr(attr, params['attrs'][attr]) self.attributes.check_attr(attr, params['attrs'][attr])
backends = self.attributes.get_backends_attributes(attr) backends = self.attributes.get_backends_attributes(attr)