2858689767
Since Glare support was introduced the 'catalog/packages' part of Murano API (/v1/catalog/packages) became obsolete and was intended to be used for "legacy" (i.e. non-glare-based) package storage. The murano client was supposed to directly call glare to retrieve the packages. However, the "GetPackageUI" call (GET /v1/catalog/packages/%pkg_id%/ui) is different: not all the packages bundle the UI definitions, some require Murano to generate them based on the contents of the package. This is true for HOT-based packages and others, plugin-based ones. In future this will be true for 100% of the packages when the dynamic ui and object model generation is added. Because of this that API should be callable even if Glare is configured as a package storage backend. It should fetch the artifact from glare, unpack it and use whatever plugin-specific logic required to generate the UI definitions for this particular package. This patch introduces appropriate change while maintaining the backwards compatibility: in the legacy mode (i.e. when murano's DB acts as package storage) the UI is read directly from an appropriate DB table without fetching the whole package. This fixes the issue when the HOT-based packages could not be deplpoyed properly with murano-dashboard, but the murano-client has to be updated as well to properly call the modified API even if Glare is enabled. Change-Id: Id9327e4015e1c0a1553c0b1a0151a94ee4da2928 Partial-bug: #1565805
64 lines
2.3 KiB
Python
64 lines
2.3 KiB
Python
# Copyright (c) 2013 Mirantis, Inc.
|
|
#
|
|
# 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_middleware import request_id as oslo_request_id
|
|
from oslo_serialization import jsonutils
|
|
|
|
from murano.common.i18n import _
|
|
from murano.common import wsgi
|
|
import murano.context
|
|
|
|
context_opts = [
|
|
cfg.StrOpt('admin_role', default='admin',
|
|
help=_('Role used to identify an authenticated user as '
|
|
'administrator.'))]
|
|
|
|
CONF = cfg.CONF
|
|
CONF.register_opts(context_opts)
|
|
CONF = cfg.CONF
|
|
|
|
|
|
class ContextMiddleware(wsgi.Middleware):
|
|
def process_request(self, req):
|
|
|
|
"""Convert authentication information into a request context
|
|
|
|
Generate a murano.context.RequestContext object from the available
|
|
authentication headers and store on the 'context' attribute
|
|
of the req object.
|
|
|
|
:param req: wsgi request object that will be given the context object
|
|
"""
|
|
roles = [r.strip() for r in req.headers.get('X-Roles').split(',')]
|
|
kwargs = {
|
|
'user': req.headers.get('X-User-Id'),
|
|
'tenant': req.headers.get('X-Tenant-Id'),
|
|
'auth_token': req.headers.get('X-Auth-Token'),
|
|
'session': req.headers.get('X-Configuration-Session'),
|
|
'is_admin': CONF.admin_role in roles,
|
|
'request_id': req.environ.get(oslo_request_id.ENV_REQUEST_ID),
|
|
'roles': roles
|
|
}
|
|
sc_header = req.headers.get('X-Service-Catalog')
|
|
if sc_header:
|
|
kwargs['service_catalog'] = jsonutils.loads(sc_header)
|
|
req.context = murano.context.RequestContext(**kwargs)
|
|
|
|
@classmethod
|
|
def factory(cls, global_conf, **local_conf):
|
|
def filter(app):
|
|
return cls(app)
|
|
return filter
|