8282371da4
Important features: - Nova client with microversion support is required. - Nova API server may not support microversion 2.3 (not tested). - Attaching volumes are not displayed in an instance bdm. Because Cinder volume doesn't yet contain attachment info (which contains a device name), and Nova instance volumes_attached doesn't contain a device name (mountpoint). But a bdm must contain it. Other features: - v2.3 is requested always - RunInstance result is formatted w/o extra v2.3 info, so it doesn't contain rootDeviceName and other such info - if rootDeviceName property is empty it's omitted instead of to report fake /dev/sda1 as Nova EC2 does it. This leads to omit rootDeviceType property in this case as well. Also the same is done for corresponding image's properties. - deleteOnTermination volume property is omitted for volume at all, and for instance bdm if Nova doesn't report it. Previously this volume property contained 'False' only. - DescribeVolumes isn't used in DescribeInstances (as opposed to DescribeNetworkInterfaces), because both methods require actual state of corresponding OS objects, so we prevent duplication of OS requests. - Not merged Nova client is used https://review.openstack.org/#/c/152569/ Also: - fix multi-run instances for EC2 Classic mode - safe getting of OS instance security groups - ec2context module alias is renamed to ec2_context, as it is in other code - fakes.CinderVolume is renamed to local standard OSVolume - fakes.OSInstance it transformed to be initialized from a dictionary, as it is for other fakes.OSXxx objects - fix code style Depends-On: Icf2b9739aaf87b4c9af13ad64a310081a68f776e Change-Id: Id65ea0f56ffd889286d5ca082e1daf2643205c52
187 lines
6.0 KiB
Python
187 lines
6.0 KiB
Python
# Copyright 2014
|
|
# The Cloudscaling Group, 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.
|
|
|
|
"""RequestContext: context for requests that persist through all of ec2."""
|
|
|
|
import uuid
|
|
|
|
from keystoneclient.v2_0 import client as keystone_client
|
|
from oslo_config import cfg
|
|
from oslo_log import log as logging
|
|
from oslo_utils import timeutils
|
|
import six
|
|
|
|
from ec2api import exception
|
|
from ec2api.i18n import _
|
|
from ec2api.openstack.common import local
|
|
|
|
|
|
ec2_opts = [
|
|
cfg.StrOpt('admin_user',
|
|
help=_("Admin user")),
|
|
cfg.StrOpt('admin_password',
|
|
help=_("Admin password"),
|
|
secret=True),
|
|
cfg.StrOpt('admin_tenant_name',
|
|
help=_("Admin tenant name")),
|
|
]
|
|
|
|
CONF = cfg.CONF
|
|
CONF.register_opts(ec2_opts)
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
def generate_request_id():
|
|
return 'req-' + str(uuid.uuid4())
|
|
|
|
|
|
class RequestContext(object):
|
|
"""Security context and request information.
|
|
|
|
Represents the user taking a given action within the system.
|
|
|
|
"""
|
|
|
|
def __init__(self, user_id, project_id,
|
|
is_admin=None, roles=None, remote_address=None,
|
|
auth_token=None, user_name=None, project_name=None,
|
|
overwrite=True, service_catalog=None, api_version=None,
|
|
is_os_admin=None, **kwargs):
|
|
"""Parameters
|
|
|
|
:param overwrite: Set to False to ensure that the greenthread local
|
|
copy of the index is not overwritten.
|
|
|
|
|
|
:param kwargs: Extra arguments that might be present, but we ignore
|
|
because they possibly came in from older rpc messages.
|
|
"""
|
|
if kwargs:
|
|
LOG.warn(_('Arguments dropped when creating context: %s') %
|
|
str(kwargs))
|
|
|
|
self.user_id = user_id
|
|
self.project_id = project_id
|
|
self.cached_secret_key = None
|
|
self.roles = roles or []
|
|
self.remote_address = remote_address
|
|
timestamp = timeutils.utcnow()
|
|
if isinstance(timestamp, six.string_types):
|
|
timestamp = timeutils.parse_strtime(timestamp)
|
|
self.timestamp = timestamp
|
|
self.request_id = generate_request_id()
|
|
self.auth_token = auth_token
|
|
|
|
self.service_catalog = service_catalog
|
|
if self.service_catalog is None:
|
|
# if list is empty or none
|
|
self.service_catalog = []
|
|
|
|
self.user_name = user_name
|
|
self.project_name = project_name
|
|
self.is_admin = is_admin
|
|
# TODO(ft): call policy.check_is_admin if is_admin is None
|
|
self.is_os_admin = is_os_admin
|
|
self.api_version = api_version
|
|
if overwrite or not hasattr(local.store, 'context'):
|
|
self.update_store()
|
|
|
|
def update_store(self):
|
|
local.store.context = self
|
|
|
|
def to_dict(self):
|
|
return {'user_id': self.user_id,
|
|
'project_id': self.project_id,
|
|
'is_admin': self.is_admin,
|
|
'roles': self.roles,
|
|
'remote_address': self.remote_address,
|
|
'timestamp': timeutils.strtime(self.timestamp),
|
|
'request_id': self.request_id,
|
|
'auth_token': self.auth_token,
|
|
'user_name': self.user_name,
|
|
'service_catalog': self.service_catalog,
|
|
'project_name': self.project_name,
|
|
'tenant': self.tenant,
|
|
'user': self.user}
|
|
|
|
@classmethod
|
|
def from_dict(cls, values):
|
|
values.pop('user', None)
|
|
values.pop('tenant', None)
|
|
return cls(**values)
|
|
|
|
# NOTE(sirp): the openstack/common version of RequestContext uses
|
|
# tenant/user whereas the ec2 version uses project_id/user_id. We need
|
|
# this shim in order to use context-aware code from openstack/common, like
|
|
# logging, until we make the switch to using openstack/common's version of
|
|
# RequestContext.
|
|
@property
|
|
def tenant(self):
|
|
return self.project_id
|
|
|
|
@property
|
|
def user(self):
|
|
return self.user_id
|
|
|
|
|
|
def get_admin_context(project_id=None, read_deleted="no"):
|
|
return RequestContext(user_id=None,
|
|
project_id=project_id,
|
|
access_key=None,
|
|
is_admin=True,
|
|
read_deleted=read_deleted,
|
|
overwrite=False)
|
|
|
|
|
|
def is_user_context(context):
|
|
"""Indicates if the request context is a normal user."""
|
|
if not context:
|
|
return False
|
|
if context.is_admin:
|
|
return False
|
|
if not context.user_id or not context.project_id:
|
|
return False
|
|
return True
|
|
|
|
|
|
def get_os_admin_context():
|
|
"""Create a context to interact with OpenStack as an administrator."""
|
|
if (getattr(local.store, 'context', None) and
|
|
local.store.context.is_os_admin):
|
|
return local.store.context
|
|
# TODO(ft): make an authentification token reusable
|
|
keystone = keystone_client.Client(
|
|
username=CONF.admin_user,
|
|
password=CONF.admin_password,
|
|
tenant_name=CONF.admin_tenant_name,
|
|
auth_url=CONF.keystone_url,
|
|
)
|
|
service_catalog = keystone.service_catalog.get_data()
|
|
return RequestContext(
|
|
keystone.auth_user_id,
|
|
keystone.auth_tenant_id,
|
|
auth_token=keystone.auth_token,
|
|
service_catalog=service_catalog,
|
|
is_os_admin=True)
|
|
|
|
|
|
def require_context(ctxt):
|
|
"""Raise exception.Forbidden()
|
|
|
|
if context is not a user or an admin context.
|
|
"""
|
|
if not ctxt.is_admin and not is_user_context(ctxt):
|
|
raise exception.Forbidden()
|