diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-17 16:04:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-17 16:04:13 +0000 |
| commit | dcddfbccf35d3950ab58b4b9e8129fa91a722410 (patch) | |
| tree | 71343dd22ad4f8f5e14d31ccf46c8ff7fe75a401 | |
| parent | 3c687d17016cb8efcfdce2de0d2f923121917fcb (diff) | |
| parent | 61c72f73424c47d21e533b0bdde997f6e0a4de45 (diff) | |
| download | keystone-dcddfbccf35d3950ab58b4b9e8129fa91a722410.tar.gz keystone-dcddfbccf35d3950ab58b4b9e8129fa91a722410.tar.xz keystone-dcddfbccf35d3950ab58b4b9e8129fa91a722410.zip | |
Merge "LDAP get_project_users should not return password"
| -rw-r--r-- | keystone/identity/backends/ldap/core.py | 6 | ||||
| -rw-r--r-- | tests/test_backend_ldap.py | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap/core.py index 89ecd06e..07cd83b6 100644 --- a/keystone/identity/backends/ldap/core.py +++ b/keystone/identity/backends/ldap/core.py @@ -171,7 +171,11 @@ class Identity(identity.Driver): def get_project_users(self, tenant_id): self.get_project(tenant_id) - return self._set_default_domain(self.project.get_users(tenant_id)) + user_refs = self.project.get_users(tenant_id) + users = [] + for user_ref in user_refs: + users.append(identity.filter_user(user_ref)) + return self._set_default_domain(users) def get_roles_for_user_and_project(self, user_id, tenant_id): self.get_user(user_id) diff --git a/tests/test_backend_ldap.py b/tests/test_backend_ldap.py index 60b9f4ba..3c3d9f58 100644 --- a/tests/test_backend_ldap.py +++ b/tests/test_backend_ldap.py @@ -518,9 +518,6 @@ class LDAPIdentity(test.TestCase, test_backend.IdentityTests): def test_list_user_projects(self): raise nose.exc.SkipTest('Blocked by bug 1101287') - def test_get_project_users(self): - raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains') - def test_create_duplicate_user_name_in_different_domains(self): raise nose.exc.SkipTest('Blocked by bug 1101276') |