openstack
/
keystone
Code Issues Proposed changes

Determine is_admin based on 'Admin' role; remove dead project_ref code; 

pass auth_token into request context; pass user_id/project_id into
request context instead of their refs

Change-Id: Ib23f59694301dcfc91cf8e8deff8ae0a090e82df
This commit is contained in:
Kevin L. Mitchell 2011-08-02 15:34:18 -05:00
parent 8ff14cde88
commit f9ca57105e
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
keystone/middleware/nova_auth_token.py
View File

@ -62,21 +62,28 @@ class KeystoneAuthShim(wsgi.Middleware):
except:
user_ref = self.auth.create_user(user_id)
# get the roles
roles = [r.strip() for r in req.headers.get('X_ROLE', '').split(',')]
# set user admin-ness to keystone admin-ness
if user_ref.is_admin() != (req.headers.get('X_ROLE', None) == 'Admin'):
self.auth.modify_user(user_ref,
admin=req.headers.get('X_ROLE') == 'Admin')
if user_ref.is_admin() != ('Admin' in roles):
self.auth.modify_user(user_ref, ('Admin' in roles))
# create a project for tenant
project_id = req.headers['X_TENANT']
try:
project_ref = self.auth.get_project(project_id)
except:
project_ref = self.auth.create_project(project_id, user_id)
# ensure user is a member of project
if not self.auth.is_project_member(user_id, project_id):
self.auth.add_to_project(user_id, project_id)
req.environ['nova.context'] = context.RequestContext(user_ref, project_ref)
# Get the auth token
auth_token = req.headers.get('X_AUTH_TOKEN',
req.headers.get('X_STORAGE_TOKEN'))
# Build a context, including the auth_token...
ctx = context.RequestContext(user_id, project_id,
is_admin=('Admin' in roles),
auth_token=auth_token)
req.environ['nova.context'] = ctx
return self.application