summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorColleen Murphy <comurphy@suse.com>2017-03-14 01:24:31 +0100
committerColleen Murphy <comurphy@suse.com>2017-03-14 09:23:19 +0100
commit853ea5ab59e5d7845d389e46527038575c3c170c (patch)
tree2be78acf1908ce25a40ed14bea06fb0adbdf12e1 /openstackclient
parent4a19f6753b9e21b3089824d17943b39c211a616a (diff)
downloadpython-openstackclient-853ea5ab59e5d7845d389e46527038575c3c170c.tar.gz
Narrow expected responses for CheckUserInGroup
When checking whether a given user is in a given group, keystone will return a 404 Not Found if all went well but the user was not in the group. It may also return a 403 if the user and the group are in different backends, which would also mean that the user was not in the group[1]. Any other 400 response is a client error and any 500 response is a server error to which the user should be alerted. Without this patch, openstackclient treats any exception as a valid "not found" and may end up hiding server errors. This patch reduces the caught exceptions to 403 and 404 responses and treats everything else as an error. [1] https://developer.openstack.org/api-ref/identity/v3/?expanded=check-whether-user-belongs-to-group-detail#check-whether-user-belongs-to-group Closes-bug: #1672634 Change-Id: Id3f3b2409b7cee480ee3c19b6d6c3070599ffe8f
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/identity/v3/group.py15
-rw-r--r--openstackclient/tests/unit/identity/v3/test_group.py17
2 files changed, 26 insertions, 6 deletions
diff --git a/openstackclient/identity/v3/group.py b/openstackclient/identity/v3/group.py
index 2afdabc1..b5f5d8ad 100644
--- a/openstackclient/identity/v3/group.py
+++ b/openstackclient/identity/v3/group.py
@@ -102,12 +102,15 @@ class CheckUserInGroup(command.Command):
try:
identity_client.users.check_in_group(user_id, group_id)
- except Exception:
- msg = _("%(user)s not in group %(group)s\n") % {
- 'user': parsed_args.user,
- 'group': parsed_args.group,
- }
- sys.stderr.write(msg)
+ except ks_exc.http.HTTPClientError as e:
+ if e.http_status == 403 or e.http_status == 404:
+ msg = _("%(user)s not in group %(group)s\n") % {
+ 'user': parsed_args.user,
+ 'group': parsed_args.group,
+ }
+ sys.stderr.write(msg)
+ else:
+ raise e
else:
msg = _("%(user)s in group %(group)s\n") % {
'user': parsed_args.user,
diff --git a/openstackclient/tests/unit/identity/v3/test_group.py b/openstackclient/tests/unit/identity/v3/test_group.py
index 00bd217d..5870e1db 100644
--- a/openstackclient/tests/unit/identity/v3/test_group.py
+++ b/openstackclient/tests/unit/identity/v3/test_group.py
@@ -115,6 +115,23 @@ class TestGroupCheckUser(TestGroup):
self.user.id, self.group.id)
self.assertIsNone(result)
+ def test_group_check_user_server_error(self):
+ def server_error(*args):
+ raise ks_exc.http.InternalServerError
+ self.users_mock.check_in_group.side_effect = server_error
+ arglist = [
+ self.group.name,
+ self.user.name,
+ ]
+ verifylist = [
+ ('group', self.group.name),
+ ('user', self.user.name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ self.assertRaises(ks_exc.http.InternalServerError,
+ self.cmd.take_action, parsed_args)
+
class TestGroupCreate(TestGroup):