Attachment 652344 Details for Bug 880399 – OpenStack-essex-CVE-2012-5571.patch

[patch] OpenStack-essex-CVE-2012-5571.patch

OpenStack-essex-CVE-2012-5571.patch (text/plain), 1.85 KB, created by Kurt Seifried on 2012-11-26 22:16:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Seifried

Created: 2012-11-26 22:16:23 UTC

Size: 1.85 KB

patch

obsolete

>diff --git a/keystone/contrib/ec2/core.py b/keystone/contrib/ec2/core.py
>index 4449b6b..11107eb 100644
>--- a/keystone/contrib/ec2/core.py
>+++ b/keystone/contrib/ec2/core.py
>@@ -161,9 +161,19 @@ class Ec2Controller(wsgi.Application):
>                 context=context,
>                 user_id=creds_ref['user_id'])
>         metadata_ref = self.identity_api.get_metadata(
>-                context=context,
>-                user_id=user_ref['id'],
>-                tenant_id=tenant_ref['id'])
>+            context=context,
>+            user_id=user_ref['id'],
>+            tenant_id=tenant_ref['id'])
>+
>+        # TODO(termie): optimize this call at some point and put it into the
>+        #               the return for metadata
>+        # fill out the roles in the metadata
>+        roles = metadata_ref.get('roles', [])
>+        if not roles:
>+            raise exception.Unauthorized(message='User not valid for tenant.')
>+        roles_ref = [self.identity_api.get_role(context, role_id)
>+                     for role_id in roles]
>+
>         catalog_ref = self.catalog_api.get_catalog(
>                 context=context,
>                 user_id=user_ref['id'],
>@@ -176,13 +186,6 @@ class Ec2Controller(wsgi.Application):
>                                         tenant=tenant_ref,
>                                         metadata=metadata_ref))
> 
>-        # TODO(termie): optimize this call at some point and put it into the
>-        #               the return for metadata
>-        # fill out the roles in the metadata
>-        roles_ref = []
>-        for role_id in metadata_ref.get('roles', []):
>-            roles_ref.append(self.identity_api.get_role(context, role_id))
>-
>         # TODO(termie): make this a util function or something
>         # TODO(termie): i don't think the ec2 middleware currently expects a
>         #               full return, but it contains a note saying that it

Actions: View | Diff

Attachments on bug 880399: 652344 | 652345