kallithea Changeset - 3dedf3991d40

Changeset - 3dedf3991d40

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 14 years ago 2011-07-10 15:50:31
marcin@python-works.com

fixes #173, many thanks for slestak for contributing into this one.

3 files changed with 64 insertions and 9 deletions:

CONTRIBUTORS

rhodecode/lib/auth.py

rhodecode/tests/functional/test_admin_ldap_settings.py

0 comments (0 inline, 0 general)

CONTRIBUTORS

➞

Show inline comments

 List of contributors to RhodeCode project:
     Marcin Kuźmiński <marcin@python-works.com>
     Lukasz Balcerzak <lukaszbalcerzak@gmail.com>
     Jason Harris <jason@jasonfharris.com>
     Thayne Harbaugh  <thayne@fusionio.com>
     cejones
     Lorenzo M. Catucci <lorenzo@sancho.ccd.uniroma2.it>
     Dmitri Kuznetsov
     Jared Bunting <jared.bunting@peachjean.com>
@@ \ No newline at end of file @@
     Jared Bunting <jared.bunting@peachjean.com>
     Steve Romanow <slestak989@gmail.com>
@@ \ No newline at end of file @@

rhodecode/lib/auth.py

➞

Show inline comments

@@ @@ -32,25 +32,25 @@ from decorator import decorator @@
 from pylons import config, session, url, request
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
 from rhodecode import __platform__, PLATFORM_WIN, PLATFORM_OTHERS
 if __platform__ in PLATFORM_WIN:
     from hashlib import sha256
 if __platform__ in PLATFORM_OTHERS:
     import bcrypt
 from rhodecode.lib import str2bool
+from rhodecode.lib import str2bool, safe_unicode
 from rhodecode.lib.exceptions import LdapPasswordError, LdapUsernameError
 from rhodecode.lib.utils import get_repo_slug
 from rhodecode.lib.auth_ldap import AuthLdap
 from rhodecode.model import meta
 from rhodecode.model.user import UserModel
 from rhodecode.model.db import Permission, RhodeCodeSettings
 log = logging.getLogger(__name__)
 class PasswordGenerator(object):
@@ @@ -198,28 +198,28 @@ def authenticate(username, password): @@
+                  }
             log.debug('Checking for ldap authentication')
             try:
                 aldap = AuthLdap(**kwargs)
                 (user_dn, ldap_attrs) = aldap.authenticate_ldap(username,
                                                                 password)
                 log.debug('Got ldap DN response %s', user_dn)
                 get_ldap_attr = lambda k: ldap_attrs.get(ldap_settings\
                                                            .get(k), [''])[0]
                 user_attrs = {
                     'name': get_ldap_attr('ldap_attr_firstname'),
                     'lastname': get_ldap_attr('ldap_attr_lastname'),
                     'email': get_ldap_attr('ldap_attr_email'),
+                    }
                  'name': safe_unicode(get_ldap_attr('ldap_attr_firstname')),
                  'lastname': safe_unicode(get_ldap_attr('ldap_attr_lastname')),
                  'email': get_ldap_attr('ldap_attr_email'),
+                }
                 if user_model.create_ldap(username, password, user_dn,
                                           user_attrs):
                     log.info('created new ldap user %s', username)
                 return True
             except (LdapUsernameError, LdapPasswordError,):
                 pass
             except (Exception,):
                 log.error(traceback.format_exc())
                 pass
     return False

rhodecode/tests/functional/test_admin_ldap_settings.py

➞

Show inline comments

 from rhodecode.tests import *
 from rhodecode.model.db import RhodeCodeSettings
 try:
     import ldap
 except ImportError:
     # means that python-ldap is not installed
     pass
 class TestLdapSettingsController(TestController):
     def test_index(self):
         self.log_user()
         response = self.app.get(url(controller='admin/ldap_settings',
                                     action='index'))
-        # Test response...
+        self.assertTrue('LDAP administration' in response.body)
     def test_ldap_save_settings(self):
         pass
         self.log_user()
         test_url = url(controller='admin/ldap_settings',
                        action='ldap_settings')
         response = self.app.post(url=test_url,
             params={'ldap_host' : u'dc.example.com',
                     'ldap_port' : '999',
                     'ldap_tls_kind' : 'PLAIN',
                     'ldap_tls_reqcert' : 'NEVER',
                     'ldap_dn_user':'test_user',
                     'ldap_dn_pass':'test_pass',
                     'ldap_base_dn':'test_base_dn',
                     'ldap_filter':'test_filter',
                     'ldap_search_scope':'BASE',
                     'ldap_attr_login':'test_attr_login',
                     'ldap_attr_firstname':'ima',
                     'ldap_attr_lastname':'tester',
                     'ldap_attr_email':'test@example.com' })
         new_settings = RhodeCodeSettings.get_ldap_settings()
         self.assertEqual(new_settings['ldap_host'], u'dc.example.com',
                          'fail db write compare')
         self.checkSessionFlash(response,
                                'Ldap settings updated successfully')
     def test_ldap_error_form(self):
         pass
         self.log_user()
         test_url = url(controller='admin/ldap_settings',
                        action='ldap_settings')
         response = self.app.post(url=test_url,
             params={'ldap_host' : '',
                     'ldap_port' : 'i-should-be-number',
                     'ldap_tls_kind' : 'PLAIN',
                     'ldap_tls_reqcert' : 'NEVER',
                     'ldap_dn_user':'',
                     'ldap_dn_pass':'',
                     'ldap_base_dn':'',
                     'ldap_filter':'',
                     'ldap_search_scope':'BASE',
                     'ldap_attr_login':'', #  <----- missing required input
                     'ldap_attr_firstname':'',
                     'ldap_attr_lastname':'',
                     'ldap_attr_email':'' })
         self.assertTrue("""<span class="error-message">The LDAP Login"""
                         """ attribute of the CN must be specified""" in
                         response.body)
         self.assertTrue("""<span class="error-message">Please """
                         """enter a number</span>""" in response.body)
     def test_ldap_login(self):
         pass
     def test_ldap_login_incorrect(self):
         pass

0 comments (0 inline, 0 general)