22328baf1f
It's mostly a matter of changing imports to a new location. Non-obvious changes needed: * pass overwrite= argument to oslo_context since oslo.log reads context from its thread local store and not local.store from incubator * don't store context at local.store now that there is no code that would consume it * LOG.deprecated() -> versionutils.report_deprecated_feature() * dropped LOG.audit check from hacking rule since now the method does not exist * WritableLogger is now located in oslo_log.loggers Dropped log module from the tree. Also dropped local module that is now of no use (and obsolete, as per oslo team). Added versionutils back to openstack-common.conf since now we use the module directly from neutron code and not just as a dependency of some other oslo-incubator module. Note: tempest tests are expected to be broken now, so instead of fixing all the oslo.log related issues for the subtree in this patch, I only added TODOs with directions for later fix. Closes-Bug: #1425013 Change-Id: I310e059a815377579de6bb2aa204de168e72571e
76 lines
2.5 KiB
Python
76 lines
2.5 KiB
Python
# Copyright 2012 OpenStack Foundation
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from oslo_config import cfg
|
|
from oslo_log import log as logging
|
|
from oslo_middleware import request_id
|
|
import webob.dec
|
|
import webob.exc
|
|
|
|
from neutron import context
|
|
from neutron import wsgi
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
class NeutronKeystoneContext(wsgi.Middleware):
|
|
"""Make a request context from keystone headers."""
|
|
|
|
@webob.dec.wsgify
|
|
def __call__(self, req):
|
|
# Determine the user ID
|
|
user_id = req.headers.get('X_USER_ID')
|
|
if not user_id:
|
|
LOG.debug("X_USER_ID is not found in request")
|
|
return webob.exc.HTTPUnauthorized()
|
|
|
|
# Determine the tenant
|
|
tenant_id = req.headers.get('X_PROJECT_ID')
|
|
|
|
# Suck out the roles
|
|
roles = [r.strip() for r in req.headers.get('X_ROLES', '').split(',')]
|
|
|
|
# Human-friendly names
|
|
tenant_name = req.headers.get('X_PROJECT_NAME')
|
|
user_name = req.headers.get('X_USER_NAME')
|
|
|
|
# Use request_id if already set
|
|
req_id = req.environ.get(request_id.ENV_REQUEST_ID)
|
|
|
|
# Get the auth token
|
|
auth_token = req.headers.get('X_AUTH_TOKEN',
|
|
req.headers.get('X_STORAGE_TOKEN'))
|
|
|
|
# Create a context with the authentication data
|
|
ctx = context.Context(user_id, tenant_id, roles=roles,
|
|
user_name=user_name, tenant_name=tenant_name,
|
|
request_id=req_id, auth_token=auth_token)
|
|
|
|
# Inject the context...
|
|
req.environ['neutron.context'] = ctx
|
|
|
|
return self.application
|
|
|
|
|
|
def pipeline_factory(loader, global_conf, **local_conf):
|
|
"""Create a paste pipeline based on the 'auth_strategy' config option."""
|
|
pipeline = local_conf[cfg.CONF.auth_strategy]
|
|
pipeline = pipeline.split()
|
|
filters = [loader.get_filter(n) for n in pipeline[:-1]]
|
|
app = loader.get_app(pipeline[-1])
|
|
filters.reverse()
|
|
for filter in filters:
|
|
app = filter(app)
|
|
return app
|