Mercurial > kallithea

comparison rhodecode/lib/auth.py @ 1633:2c0d35e336b5 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring of models names for repoGroup permissions
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 02 Nov 2011 03:08:33 +0200
parents 25d8e4836bc2
children 59c26a9aba63
comparison
equal deleted inserted replaced
1632:5b2cf21b1947 1633:2c0d35e336b5
46 from rhodecode.lib.utils import get_repo_slug 46 from rhodecode.lib.utils import get_repo_slug
47 from rhodecode.lib.auth_ldap import AuthLdap 47 from rhodecode.lib.auth_ldap import AuthLdap
48 48
49 from rhodecode.model import meta 49 from rhodecode.model import meta
50 from rhodecode.model.user import UserModel 50 from rhodecode.model.user import UserModel
51 from rhodecode.model.db import Permission, RhodeCodeSettings, User 51 from rhodecode.model.db import Permission, RhodeCodeSetting, User
52 52
53 log = logging.getLogger(__name__) 53 log = logging.getLogger(__name__)
54 54
55 55
56 class PasswordGenerator(object): 56 class PasswordGenerator(object):
182 182
183 if user_obj is not None and not user_obj.ldap_dn: 183 if user_obj is not None and not user_obj.ldap_dn:
184 log.debug('this user already exists as non ldap') 184 log.debug('this user already exists as non ldap')
185 return False 185 return False
186 186
187 ldap_settings = RhodeCodeSettings.get_ldap_settings() 187 ldap_settings = RhodeCodeSetting.get_ldap_settings()
188 #====================================================================== 188 #======================================================================
189 # FALLBACK TO LDAP AUTH IF ENABLE 189 # FALLBACK TO LDAP AUTH IF ENABLE
190 #====================================================================== 190 #======================================================================
191 if str2bool(ldap_settings.get('ldap_active')): 191 if str2bool(ldap_settings.get('ldap_active')):
192 log.debug("Authenticating user using ldap") 192 log.debug("Authenticating user using ldap")