From 61c72f73424c47d21e533b0bdde997f6e0a4de45 Mon Sep 17 00:00:00 2001 From: Sahdev Zala Date: Wed, 12 Jun 2013 14:38:33 -0500 Subject: LDAP get_project_users should not return password Also with this fix no need to skip get_project_users for LDAP. Fixes bug1190286 Change-Id: I6ab6b4179c36d49b8a2eab1ea67ce0d6339751f5 --- keystone/identity/backends/ldap/core.py | 6 +++++- 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 4493e49c..69fd7e5b 100644 --- a/keystone/identity/backends/ldap/core.py +++ b/keystone/identity/backends/ldap/core.py @@ -182,7 +182,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 5845dda7..864a657f 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') -- cgit