diff options
| author | Brian Waldon <bcwaldon@gmail.com> | 2012-02-09 09:53:03 -0800 |
|---|---|---|
| committer | Brian Waldon <bcwaldon@gmail.com> | 2012-02-10 10:20:16 -0800 |
| commit | 2c18314e7cb7e5b7e5b6237f0793ec82739468f1 (patch) | |
| tree | 4d919df6dad89d35c6efdd38e43588ad38cd284f /keystone/contrib/ec2 | |
| parent | 1951c87de39f8dde704632512db92b22f967bf08 (diff) | |
| download | keystone-2c18314e7cb7e5b7e5b6237f0793ec82739468f1.tar.gz keystone-2c18314e7cb7e5b7e5b6237f0793ec82739468f1.tar.xz keystone-2c18314e7cb7e5b7e5b6237f0793ec82739468f1.zip | |
Add TokenNotFound exception
* raise TokenNotFound from token backends on get/delete when token doesn't exist
Change-Id: Ic9aba7911088c30c20fe62501a05d75232f2d8b9
Diffstat (limited to 'keystone/contrib/ec2')
| -rw-r--r-- | keystone/contrib/ec2/core.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/keystone/contrib/ec2/core.py b/keystone/contrib/ec2/core.py index 888b8ddd..c8ad4425 100644 --- a/keystone/contrib/ec2/core.py +++ b/keystone/contrib/ec2/core.py @@ -26,6 +26,7 @@ import webob.exc from keystone import catalog from keystone import config +from keystone import exception from keystone import identity from keystone import policy from keystone import service @@ -252,8 +253,11 @@ class Ec2Controller(wsgi.Application): :raises webob.exc.HTTPForbidden: when token is invalid """ - token_ref = self.token_api.get_token(context=context, - token_id=context['token_id']) + try: + token_ref = self.token_api.get_token(context=context, + token_id=context['token_id']) + except exception.TokenNotFound: + raise exception.Unauthorized() token_user_id = token_ref['user'].get('id') if not token_user_id == user_id: raise webob.exc.HTTPForbidden() |