summaryrefslogtreecommitdiffstats
path: root/keystone-moon/keystone/contrib/moon/controllers.py
diff options
context:
space:
mode:
authorasteroide <thomas.duval@orange.com>2015-09-26 23:31:49 +0200
committerasteroide <thomas.duval@orange.com>2015-09-26 23:31:49 +0200
commit43da0e268fd88c05e49a3d949e3685a13fa43926 (patch)
tree089a7404eb370c844444613afa550a53490f59b8 /keystone-moon/keystone/contrib/moon/controllers.py
parent82636f27ac48eadd10c7a6e5c20b87466f2d3fc2 (diff)
Review the KeystoneMiddleware code, fix some bugs in the authz functions.
Change-Id: I9d9966c061fc71cd8ef5ce88217dcdfa63e0722f
Diffstat (limited to 'keystone-moon/keystone/contrib/moon/controllers.py')
-rw-r--r--keystone-moon/keystone/contrib/moon/controllers.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/keystone-moon/keystone/contrib/moon/controllers.py b/keystone-moon/keystone/contrib/moon/controllers.py
index c4fc0add..58e62a28 100644
--- a/keystone-moon/keystone/contrib/moon/controllers.py
+++ b/keystone-moon/keystone/contrib/moon/controllers.py
@@ -134,11 +134,11 @@ class Authz_v3(controller.V3Controller):
super(Authz_v3, self).__init__()
@controller.protected()
- def get_authz(self, context, tenant_name, subject_name, object_name, action_name):
+ def get_authz(self, context, tenant_id, subject_k_id, object_name, action_name):
try:
- return self.authz_api.authz(tenant_name, subject_name, object_name, action_name)
- except:
- return False
+ return self.authz_api.authz(tenant_id, subject_k_id, object_name, action_name)
+ except Exception as e:
+ return {'authz': False, 'comment': unicode(e)}
@dependency.requires('admin_api', 'authz_api')