openstack/nova
Code Issues Proposed changes

Merge "Remove manual handling of old context variables"

Browse Source
This commit is contained in:
Jenkins 2016-12-12 17:20:30 +00:00 committed by Gerrit Code Review
commit 56d9175988
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nova/api/auth.py
View File

@ -18,7 +18,6 @@ Common Auth Middleware.
from oslo_log import log as logging
from oslo_log import versionutils
from oslo_middleware import request_id
from oslo_serialization import jsonutils
import webob.dec
import webob.exc
@ -76,10 +75,6 @@ class NovaKeystoneContext(wsgi.Middleware):
@webob.dec.wsgify(RequestClass=wsgi.Request)
def __call__(self, req):
project_name = req.headers.get('X_TENANT_NAME')
user_name = req.headers.get('X_USER_NAME')
req_id = req.environ.get(request_id.ENV_REQUEST_ID)
# Build a context, including the auth_token...
remote_address = req.remote_addr
if CONF.api.use_forwarded_for:
@ -100,12 +95,9 @@ class NovaKeystoneContext(wsgi.Middleware):
ctx = context.RequestContext.from_environ(
req.environ,
user_name=user_name,
project_name=project_name,
user_auth_plugin=user_auth_plugin,
remote_address=remote_address,
service_catalog=service_catalog,
request_id=req_id)
service_catalog=service_catalog)
if ctx.user_id is None:
LOG.debug("Neither X_USER_ID nor X_USER found in request")