summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-09-24 18:33:36 +0000
committerGerrit Code Review <review@openstack.org>2019-09-24 18:33:36 +0000
commit4cc91875bae17042e7f853340e79707423d2d948 (patch)
treeed3c52fbdf30630537ad9692a15108eba8e4b794
parentaef81805a97e4162797c055d3d55b960fc6d6878 (diff)
parent1f5620dee6d10c9f7f7873fdecf457b402d25e1d (diff)
downloadkeystone-4cc91875bae17042e7f853340e79707423d2d948.tar.gz
Merge "Clean up UserGroups target enforcement callback"
-rw-r--r--keystone/api/users.py15
1 files changed, 1 insertions, 14 deletions
diff --git a/keystone/api/users.py b/keystone/api/users.py
index 2e09f4b9a..b5938b17a 100644
--- a/keystone/api/users.py
+++ b/keystone/api/users.py
@@ -287,19 +287,6 @@ class UserGroupsResource(ks_flask.ResourceBase):
get_member_from_driver = PROVIDERS.deferred_provider_lookup(
api='identity_api', method='get_group')
- @staticmethod
- def _built_target_attr_enforcement():
- ref = None
- if flask.request.view_args:
- try:
- ref = {'user': PROVIDERS.identity_api.get_user(
- flask.request.view_args.get('user_id'))}
- except ks_exception.NotFound: # nosec
- # Defer existence in the event the user doesn't exist, we'll
- # check this later anyway.
- pass
- return ref
-
def get(self, user_id):
"""Get groups for a user.
@@ -308,7 +295,7 @@ class UserGroupsResource(ks_flask.ResourceBase):
filters = ('name',)
hints = self.build_driver_hints(filters)
ENFORCER.enforce_call(action='identity:list_groups_for_user',
- build_target=self._built_target_attr_enforcement,
+ build_target=_build_user_target_enforcement,
filters=filters)
refs = PROVIDERS.identity_api.list_groups_for_user(user_id=user_id,
hints=hints)