
Switch to using the self-contained django_openstack_auth package which is a proper django.contrib.auth pluggable backend. Notable functional improvements include: * Better overall security via use of standard Django auth code (well-vetted by security experts). * Token expiration checking. * User "enabled" attribute checking. * Support for full range of Django auth attributes such as is_anonymous, is_active, is_superuser, etc. * Improved hooks for RBAC/permission-based acess control. Regarding the RBAC/permission-based access control, this patch moves all "role" and "service"-oriented checks to permission checks. This will make transitioning to policy-driven checking much easier once that fully lands in OpenStack. Implements blueprint move-keystone-support-to-django-auth-backend Change-Id: I4f3112af797aff8c4c5e9930c6ca33a70e45589d
100 lines
3.1 KiB
Python
100 lines
3.1 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2012 United States Government as represented by the
|
|
# Administrator of the National Aeronautics and Space Administration.
|
|
# All Rights Reserved.
|
|
#
|
|
# Copyright 2012 Nebula, 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 __future__ import absolute_import
|
|
|
|
import logging
|
|
import thread
|
|
import urlparse
|
|
|
|
from django.conf import settings
|
|
|
|
from glanceclient.v1 import client as glance_client
|
|
|
|
from horizon.api.base import url_for
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
def glanceclient(request):
|
|
o = urlparse.urlparse(url_for(request, 'image'))
|
|
url = "://".join((o.scheme, o.netloc))
|
|
LOG.debug('glanceclient connection created using token "%s" and url "%s"'
|
|
% (request.user.token.id, url))
|
|
return glance_client.Client(endpoint=url, token=request.user.token.id)
|
|
|
|
|
|
def image_delete(request, image_id):
|
|
return glanceclient(request).images.delete(image_id)
|
|
|
|
|
|
def image_get(request, image_id):
|
|
"""
|
|
Returns an Image object populated with metadata for image
|
|
with supplied identifier.
|
|
"""
|
|
return glanceclient(request).images.get(image_id)
|
|
|
|
|
|
def image_list_detailed(request, marker=None, filters=None):
|
|
filters = filters or {}
|
|
limit = getattr(settings, 'API_RESULT_LIMIT', 1000)
|
|
images = glanceclient(request).images.list(limit=limit + 1,
|
|
marker=marker,
|
|
filters=filters)
|
|
if(len(images) > limit):
|
|
return (images[0:-1], True)
|
|
else:
|
|
return (images, False)
|
|
|
|
|
|
def image_update(request, image_id, **kwargs):
|
|
return glanceclient(request).images.update(image_id, **kwargs)
|
|
|
|
|
|
def image_create(request, **kwargs):
|
|
copy_from = None
|
|
|
|
if kwargs.get('copy_from'):
|
|
copy_from = kwargs.pop('copy_from')
|
|
|
|
image = glanceclient(request).images.create(**kwargs)
|
|
|
|
if copy_from:
|
|
thread.start_new_thread(image_update,
|
|
(request, image.id),
|
|
{'copy_from': copy_from})
|
|
|
|
return image
|
|
|
|
|
|
def snapshot_list_detailed(request, marker=None, extra_filters=None):
|
|
filters = {'property-image_type': 'snapshot'}
|
|
filters.update(extra_filters or {})
|
|
limit = getattr(settings, 'API_RESULT_LIMIT', 1000)
|
|
images = glanceclient(request).images.list(limit=limit + 1,
|
|
marker=marker,
|
|
filters=filters)
|
|
if len(images) > limit:
|
|
return (images[0:-1], True)
|
|
else:
|
|
return (images, False)
|