openstack
/
anchor
Code Issues Proposed changes

Merge "Make Anchor compatible with ldap3>=2.0.7"

This commit is contained in:
Jenkins 2016-12-01 17:42:33 +00:00 committed by Gerrit Code Review
parent 8a06c10924 b4be922aab
commit 24ba8fc0c8
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
anchor/auth/ldap.py
View File

@ -15,6 +15,7 @@ from __future__ import absolute_import
import logging
import ldap3
from ldap3.core import exceptions as ldap3_exc
from ldap3.utils import dn
from anchor.auth import results
@ -65,10 +66,10 @@ def login(ra_name, user, secret):
user_attrs = ldc.response[0]['attributes']
user_groups = user_get_groups(user_attrs)
return results.AuthDetails(username=user, groups=user_groups)
except ldap3.LDAPSocketOpenError:
except ldap3_exc.LDAPSocketOpenError:
logger.error("cannot connect to LDAP host '%s' (authority '%s')",
conf['host'], ra_name)
return None
except ldap3.LDAPBindError:
except ldap3_exc.LDAPBindError:
logger.info("failed ldap auth for user %s", user)
return None

6
tests/auth/test_ldap.py
View File

@ -16,7 +16,7 @@
import unittest
import ldap3
from ldap3.core import exceptions as ldap3_exc
import mock
from webob import exc as http_status
@ -98,7 +98,7 @@ class AuthLdapTests(tests.DefaultConfigMixin, unittest.TestCase):
jsonloader.conf.load_extensions()
config = "anchor.jsonloader.conf._config"
mock_connection.side_effect = ldap3.LDAPBindError()
mock_connection.side_effect = ldap3_exc.LDAPBindError()
with mock.patch.dict(config, self.sample_conf):
with self.assertRaises(http_status.HTTPUnauthorized):
@ -110,7 +110,7 @@ class AuthLdapTests(tests.DefaultConfigMixin, unittest.TestCase):
jsonloader.conf.load_extensions()
config = "anchor.jsonloader.conf._config"
mock_connection.side_effect = ldap3.LDAPSocketOpenError()
mock_connection.side_effect = ldap3_exc.LDAPSocketOpenError()
with mock.patch.dict(config, self.sample_conf):
with self.assertRaises(http_status.HTTPUnauthorized):