diff options
author | Nathanael Burton <nathanael.i.burton.work@gmail.com> | 2013-02-19 10:15:24 -0600 |
---|---|---|
committer | Dolph Mathews <dolph.mathews@gmail.com> | 2013-02-19 11:57:10 -0600 |
commit | 9572bfc393f66f5ce3b44c0a77a9e29cc0374c6f (patch) | |
tree | 7b4c4aaeb0f84727c5ffbbb80b774eef90342941 /keystone/contrib/ec2 | |
parent | 9ec12e2e54e3cca84fda0fcc63a849eebcaafe96 (diff) | |
download | keystone-9572bfc393f66f5ce3b44c0a77a9e29cc0374c6f.tar.gz keystone-9572bfc393f66f5ce3b44c0a77a9e29cc0374c6f.tar.xz keystone-9572bfc393f66f5ce3b44c0a77a9e29cc0374c6f.zip |
Ensure user and tenant enabled in EC2
Fixes bug 1121494.
Change-Id: If7277f0b4a55aa5be81b354cd4c7ed338a600a62
Diffstat (limited to 'keystone/contrib/ec2')
-rw-r--r-- | keystone/contrib/ec2/core.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/keystone/contrib/ec2/core.py b/keystone/contrib/ec2/core.py index 02a0f649..d04b7455 100644 --- a/keystone/contrib/ec2/core.py +++ b/keystone/contrib/ec2/core.py @@ -161,6 +161,9 @@ class Ec2Controller(controller.V2Controller): user_id=user_ref['id'], tenant_id=tenant_ref['id']) + # Validate that the auth info is valid and nothing is disabled + token.validate_auth_info(self, context, user_ref, tenant_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 |