openstack/heat
Code Issues Proposed changes

Merge "Retrieve user_id from HTTP Headers to populate Context"

Browse Source
This commit is contained in:
Jenkins 2014-02-13 13:03:42 +00:00 committed by Gerrit Code Review
commit 8c4adee13f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
heat/common/context.py
View File

@ -35,7 +35,7 @@ class RequestContext(context.RequestContext):
""" """
def __init__(self, auth_token=None, username=None, password=None, def __init__(self, auth_token=None, username=None, password=None,
aws_creds=None, tenant=None, aws_creds=None, tenant=None, user_id=None,
tenant_id=None, auth_url=None, roles=None, is_admin=None, tenant_id=None, auth_url=None, roles=None, is_admin=None,
read_only=False, show_deleted=False, read_only=False, show_deleted=False,
overwrite=True, trust_id=None, trustor_user_id=None, overwrite=True, trust_id=None, trustor_user_id=None,
@ -55,6 +55,7 @@ class RequestContext(context.RequestContext):
request_id=request_id) request_id=request_id)
self.username = username self.username = username
self.user_id = user_id
self.password = password self.password = password
self.aws_creds = aws_creds self.aws_creds = aws_creds
self.tenant_id = tenant_id self.tenant_id = tenant_id
@ -84,6 +85,7 @@ class RequestContext(context.RequestContext):
def to_dict(self): def to_dict(self):
return {'auth_token': self.auth_token, return {'auth_token': self.auth_token,
'username': self.username, 'username': self.username,
'user_id': self.user_id,
'password': self.password, 'password': self.password,
'aws_creds': self.aws_creds, 'aws_creds': self.aws_creds,
'tenant': self.tenant, 'tenant': self.tenant,
@ -131,11 +133,13 @@ class ContextMiddleware(wsgi.Middleware):
try: try:
username = None username = None
user_id = None
password = None password = None
aws_creds = None aws_creds = None
if headers.get('X-Auth-User') is not None: if headers.get('X-Auth-User') is not None:
username = headers.get('X-Auth-User') username = headers.get('X-Auth-User')
user_id = headers.get('X-User-Id')
password = headers.get('X-Auth-Key') password = headers.get('X-Auth-Key')
elif headers.get('X-Auth-EC2-Creds') is not None: elif headers.get('X-Auth-EC2-Creds') is not None:
aws_creds = headers.get('X-Auth-EC2-Creds') aws_creds = headers.get('X-Auth-EC2-Creds')
@ -155,6 +159,7 @@ class ContextMiddleware(wsgi.Middleware):
tenant=tenant, tenant_id=tenant_id, tenant=tenant, tenant_id=tenant_id,
aws_creds=aws_creds, aws_creds=aws_creds,
username=username, username=username,
user_id=user_id,
password=password, password=password,
auth_url=auth_url, roles=roles) auth_url=auth_url, roles=roles)

2
heat/tests/test_common_context.py
View File

@ -34,6 +34,7 @@ class TestRequestContext(HeatTestCase):
'show_deleted': False, 'show_deleted': False,
'roles': ['arole', 'notadmin'], 'roles': ['arole', 'notadmin'],
'tenant_id': '456tenant', 'tenant_id': '456tenant',
'user_id': 'fooUser',
'tenant': 'atenant', 'tenant': 'atenant',
'auth_url': 'http://xyz', 'auth_url': 'http://xyz',
'aws_creds': 'blah'} 'aws_creds': 'blah'}
@ -47,6 +48,7 @@ class TestRequestContext(HeatTestCase):
aws_creds=self.ctx.get('aws_creds'), aws_creds=self.ctx.get('aws_creds'),
tenant=self.ctx.get('tenant'), tenant=self.ctx.get('tenant'),
tenant_id=self.ctx.get('tenant_id'), tenant_id=self.ctx.get('tenant_id'),
user_id=self.ctx.get('user_id'),
auth_url=self.ctx.get('auth_url'), auth_url=self.ctx.get('auth_url'),
roles=self.ctx.get('roles'), roles=self.ctx.get('roles'),
show_deleted=self.ctx.get('show_deleted'), show_deleted=self.ctx.get('show_deleted'),