summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-10 19:56:15 +0000
committerGerrit Code Review <review@openstack.org>2012-02-10 19:56:15 +0000
commit8cc4fdc9ef3b828f85bdbb4e2d78912e7638bb9e (patch)
tree80cca5eb89fd1be2f9ff6b3b6a5e29636728db37
parent6fb0adc066f0f8a64a5ec1fdcbe374b26935485a (diff)
parent90ded87acd5db7d03e2a86e799cab5e79e196f19 (diff)
downloadnova-8cc4fdc9ef3b828f85bdbb4e2d78912e7638bb9e.tar.gz
nova-8cc4fdc9ef3b828f85bdbb4e2d78912e7638bb9e.tar.xz
nova-8cc4fdc9ef3b828f85bdbb4e2d78912e7638bb9e.zip
Merge "Pass in project_id in ext. authorizer"
-rw-r--r--nova/api/openstack/extensions.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py
index 33cd0bf57..52559278e 100644
--- a/nova/api/openstack/extensions.py
+++ b/nova/api/openstack/extensions.py
@@ -375,8 +375,9 @@ def load_standard_extensions(ext_mgr, logger, path, package, ext_list=None):
def extension_authorizer(api_name, extension_name):
def authorize(context, target=None):
- if target == None:
- target = {}
+ if target is None:
+ target = {'project_id': context.project_id,
+ 'user_id': context.user_id}
action = '%s_extension:%s' % (api_name, extension_name)
nova.policy.enforce(context, action, target)
return authorize