Mercurial > kallithea

comparison rhodecode/lib/auth.py @ 3370:fdb0f59b2189 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes #762, LDAP and container created users are now activated based on the registration settings in permissions
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 14 Feb 2013 23:34:59 +0100
parents 14697de1598f
children 199fd214b213
comparison
equal deleted inserted replaced
3369:667630c98eaa 3370:fdb0f59b2189
224 224
225 user_attrs = { 225 user_attrs = {
226 'name': safe_unicode(get_ldap_attr('ldap_attr_firstname')), 226 'name': safe_unicode(get_ldap_attr('ldap_attr_firstname')),
227 'lastname': safe_unicode(get_ldap_attr('ldap_attr_lastname')), 227 'lastname': safe_unicode(get_ldap_attr('ldap_attr_lastname')),
228 'email': get_ldap_attr('ldap_attr_email'), 228 'email': get_ldap_attr('ldap_attr_email'),
229 'active': 'hg.register.auto_activate' in User\
230 .get_by_username('default').AuthUser.permissions['global']
229 } 231 }
230 232
231 # don't store LDAP password since we don't need it. Override 233 # don't store LDAP password since we don't need it. Override
232 # with some random generated password 234 # with some random generated password
233 _password = PasswordGenerator().gen_password(length=8) 235 _password = PasswordGenerator().gen_password(length=8)
252 if user is None: 254 if user is None:
253 user_attrs = { 255 user_attrs = {
254 'name': username, 256 'name': username,
255 'lastname': None, 257 'lastname': None,
256 'email': None, 258 'email': None,
259 'active': 'hg.register.auto_activate' in User\
260 .get_by_username('default').AuthUser.permissions['global']
257 } 261 }
258 user = UserModel().create_for_container_auth(username, user_attrs) 262 user = UserModel().create_for_container_auth(username, user_attrs)
259 if not user: 263 if not user:
260 return None 264 return None
261 log.info('User %s was created by container authentication' % username) 265 log.info('User %s was created by container authentication' % username)