openstack
/
keystone
Code Issues Proposed changes

Merge "No longer allow listing users by email" into stable/icehouse

This commit is contained in:
Jenkins 2014-09-08 07:36:24 +00:00 committed by Gerrit Code Review
parent 824f66df77 c48ec389fd
commit bb36e517f5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keystone/identity/controllers.py
View File

@ -276,7 +276,7 @@ class UserV3(controller.V3Controller):
ref = self.identity_api.create_user(ref['id'], ref)
return UserV3.wrap_member(context, ref)
@controller.filterprotected('domain_id', 'email', 'enabled', 'name')
@controller.filterprotected('domain_id', 'enabled', 'name')
def list_users(self, context, filters):
hints = UserV3.build_driver_hints(context, filters)
refs = self.identity_api.list_users(
@ -284,7 +284,7 @@ class UserV3(controller.V3Controller):
hints=hints)
return UserV3.wrap_collection(context, refs, hints=hints)
@controller.filterprotected('domain_id', 'email', 'enabled', 'name')
@controller.filterprotected('domain_id', 'enabled', 'name')
def list_users_in_group(self, context, filters, group_id):
hints = UserV3.build_driver_hints(context, filters)
refs = self.identity_api.list_users_in_group(