diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-11 04:48:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-11 04:48:15 +0000 |
| commit | 6adeec97b3592103c709a3f07d8962a6b0baee87 (patch) | |
| tree | 539a52e6358cbd50de11efaac9d70f7abf05322c /keystone/token | |
| parent | 756cd5a2972e076cdc9a119526e2038d0b838256 (diff) | |
| parent | 26ecdca88845a56e7d2793db76484cbcc5f6fa85 (diff) | |
| download | keystone-6adeec97b3592103c709a3f07d8962a6b0baee87.tar.gz keystone-6adeec97b3592103c709a3f07d8962a6b0baee87.tar.xz keystone-6adeec97b3592103c709a3f07d8962a6b0baee87.zip | |
Merge "Change exception raised to Forbidden on trust_id"
Diffstat (limited to 'keystone/token')
| -rw-r--r-- | keystone/token/controllers.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/keystone/token/controllers.py b/keystone/token/controllers.py index 4474deaa..07a94451 100644 --- a/keystone/token/controllers.py +++ b/keystone/token/controllers.py @@ -175,8 +175,8 @@ class Auth(controller.V2Controller): #A trust token cannot be used to get another token if 'trust' in old_token_ref: - raise exception.Unauthorized() - if 'trust_id' in old_token_ref["metadata"]: + raise exception.Forbidden() + if 'trust_id' in old_token_ref['metadata']: raise exception.Forbidden() user_ref = old_token_ref['user'] @@ -207,7 +207,6 @@ class Auth(controller.V2Controller): current_user_ref = trustee_user_ref else: - tenant_id = self._get_project_id_from_auth(context, auth) current_user_ref = self.identity_api.get_user(context=context, user_id=user_id) |