Mercurial > kallithea

comparison rhodecode/lib/auth.py @ 1135:1aa1655bf019 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed some config bool converter problems with ldap
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 15 Mar 2011 23:34:14 +0100
parents 31e82d872631
children 74251f8004d2
comparison
equal deleted inserted replaced
1134:1dc5d169e85a 1135:1aa1655bf019
41 if __platform__ == 'Windows': 41 if __platform__ == 'Windows':
42 from hashlib import sha256 42 from hashlib import sha256
43 if __platform__ in ('Linux', 'Darwin'): 43 if __platform__ in ('Linux', 'Darwin'):
44 import bcrypt 44 import bcrypt
45 45
46 46 from rhodecode.lib import str2bool
47 from rhodecode.lib.exceptions import LdapPasswordError, LdapUsernameError 47 from rhodecode.lib.exceptions import LdapPasswordError, LdapUsernameError
48 from rhodecode.lib.utils import get_repo_slug 48 from rhodecode.lib.utils import get_repo_slug
49 from rhodecode.lib.auth_ldap import AuthLdap 49 from rhodecode.lib.auth_ldap import AuthLdap
50 50
51 from rhodecode.model import meta 51 from rhodecode.model import meta
177 ldap_settings = SettingsModel().get_ldap_settings() 177 ldap_settings = SettingsModel().get_ldap_settings()
178 178
179 #====================================================================== 179 #======================================================================
180 # FALLBACK TO LDAP AUTH IF ENABLE 180 # FALLBACK TO LDAP AUTH IF ENABLE
181 #====================================================================== 181 #======================================================================
182 if ldap_settings.get('ldap_active', False): 182 if str2bool(ldap_settings.get('ldap_active')):
183 log.debug("Authenticating user using ldap") 183 log.debug("Authenticating user using ldap")
184 kwargs = { 184 kwargs = {
185 'server':ldap_settings.get('ldap_host', ''), 185 'server':ldap_settings.get('ldap_host', ''),
186 'base_dn':ldap_settings.get('ldap_base_dn', ''), 186 'base_dn':ldap_settings.get('ldap_base_dn', ''),
187 'port':ldap_settings.get('ldap_port'), 187 'port':ldap_settings.get('ldap_port'),
188 'bind_dn':ldap_settings.get('ldap_dn_user'), 188 'bind_dn':ldap_settings.get('ldap_dn_user'),
189 'bind_pass':ldap_settings.get('ldap_dn_pass'), 189 'bind_pass':ldap_settings.get('ldap_dn_pass'),
190 'use_ldaps':ldap_settings.get('ldap_ldaps'), 190 'use_ldaps':str2bool(ldap_settings.get('ldap_ldaps')),
191 'tls_reqcert':ldap_settings.get('ldap_tls_reqcert'), 191 'tls_reqcert':ldap_settings.get('ldap_tls_reqcert'),
192 'ldap_filter':ldap_settings.get('ldap_filter'), 192 'ldap_filter':ldap_settings.get('ldap_filter'),
193 'search_scope':ldap_settings.get('ldap_search_scope'), 193 'search_scope':ldap_settings.get('ldap_search_scope'),
194 'attr_login':ldap_settings.get('ldap_attr_login'), 194 'attr_login':ldap_settings.get('ldap_attr_login'),
195 'ldap_version':3, 195 'ldap_version':3,