Skip to content

GitLab

Commit 8a931304 authored by Christos Stavrakakis's avatar Christos Stavrakakis
Browse files

Merge branch 'devel-0.12' into devel-0.13 

Conflicts:
	snf-cyclades-app/synnefo/plankton/backend.py
parents a7b49bfe 6f68df8a
Hide whitespace changes
Inline Side-by-side
snf-cyclades-app/synnefo/api/util.py
View file @ 8a931304
......@@ -64,7 +64,7 @@ from synnefo.db.models import (Flavor, VirtualMachine, VirtualMachineMetadata,
from synnefo.db.pools import EmptyPool
from synnefo.lib.astakos import get_user
from synnefo.plankton.backend import ImageBackend
from synnefo.plankton.backend import ImageBackend, NotAllowedError
from synnefo.settings import MAX_CIDR_BLOCK
......@@ -408,6 +408,10 @@ def api_method(http_method=None, atom_allowed=False):
except VirtualMachine.BuildingError:
fault = BuildInProgress('Server is being built.')
return render_fault(request, fault)
except NotAllowedError:
# Image Backend Unathorized
fault = Forbidden('Request not allowed.')
return render_fault(request, fault)
except Fault, fault:
if fault.code >= 500:
log.exception('API fault')
......
snf-cyclades-app/synnefo/plankton/backend.py
View file @ 8a931304
......@@ -54,11 +54,12 @@ import json
import warnings
from operator import itemgetter
from time import gmtime, strftime, time
from time import gmtime, strftime
from functools import wraps
from django.conf import settings
from pithos.backends.base import NotAllowedError
from pithos.backends.base import NotAllowedError as PithosNotAllowedError
PLANKTON_DOMAIN = 'plankton'
......@@ -86,6 +87,10 @@ class BackendException(Exception):
pass
class NotAllowedError(BackendException):
pass
from pithos.backends.util import PithosBackendPool
POOL_SIZE = 8
_pithos_backend_pool = \
......@@ -98,6 +103,16 @@ def get_pithos_backend():
return _pithos_backend_pool.pool_get()
def handle_backend_exceptions(func):
@wraps(func)
def wrapper(*args, **kwargs):
try:
return func(*args, **kwargs)
except PithosNotAllowedError:
raise NotAllowedError()
return wrapper
class ImageBackend(object):
"""A wrapper arround the pithos backend to simplify image handling."""
......@@ -109,6 +124,7 @@ class ImageBackend(object):
self.backend = get_pithos_backend()
warnings.filters = original_filters # Restore warnings
@handle_backend_exceptions
def _get_image(self, location):
def format_timestamp(t):
return strftime('%Y-%m-%d %H:%M:%S', gmtime(t))
......@@ -159,6 +175,7 @@ class ImageBackend(object):
return image
@handle_backend_exceptions
def _get_meta(self, location, version=None):
account, container, object = split_location(location)
try:
......@@ -167,12 +184,14 @@ class ImageBackend(object):
except NameError:
return None
@handle_backend_exceptions
def _get_permissions(self, location):
account, container, object = split_location(location)
action, path, permissions = self.backend.get_object_permissions(
self.user, account, container, object)
return permissions
@handle_backend_exceptions
def _store(self, f, size=None):
"""Breaks data into blocks and stores them in the backend"""
......@@ -193,6 +212,7 @@ class ImageBackend(object):
return hashmap, bytes
@handle_backend_exceptions
def _update(self, location, size, hashmap, meta, permissions):
account, container, object = split_location(location)
self.backend.update_object_hashmap(self.user, account, container,
......@@ -200,6 +220,7 @@ class ImageBackend(object):
permissions=permissions)
self._update_meta(location, meta, replace=True)
@handle_backend_exceptions
def _update_meta(self, location, meta, replace=False):
account, container, object = split_location(location)
......@@ -213,11 +234,13 @@ class ImageBackend(object):
self.backend.update_object_meta(self.user, account, container, object,
PLANKTON_DOMAIN, prefixed, replace)
@handle_backend_exceptions
def _update_permissions(self, location, permissions):
account, container, object = split_location(location)
self.backend.update_object_permissions(self.user, account, container,
object, permissions)
@handle_backend_exceptions
def add_user(self, image_id, user):
image = self.get_image(image_id)
assert image, "Image not found"
......@@ -232,11 +255,13 @@ class ImageBackend(object):
def close(self):
self.backend.close()
@handle_backend_exceptions
def delete(self, image_id):
image = self.get_image(image_id)
account, container, object = split_location(image['location'])
self.backend.delete_object(self.user, account, container, object)
@handle_backend_exceptions
def get_data(self, location):
account, container, object = split_location(location)
size, hashmap = self.backend.get_object_hashmap(self.user, account,
......@@ -245,6 +270,7 @@ class ImageBackend(object):
assert len(data) == size
return data
@handle_backend_exceptions
def get_image(self, image_id):
try:
account, container, object = self.backend.get_uuid(self.user,
......@@ -255,6 +281,7 @@ class ImageBackend(object):
location = get_location(account, container, object)
return self._get_image(location)
@handle_backend_exceptions
def _iter(self, public=False, filters=None, shared_from=None):
filters = filters or {}
......@@ -301,7 +328,7 @@ class ImageBackend(object):
def iter_shared(self, filters=None, member=None):
"""Iter over images shared to member"""
return self._iter(filters=filters)
return self._iter(filters=filters, shared_from=member)
def list(self, filters=None, params={}):
"""Return all images available to the user"""
......@@ -326,6 +353,7 @@ class ImageBackend(object):
permissions = self._get_permissions(image['location'])
return [user for user in permissions.get('read', []) if user != '*']
@handle_backend_exceptions
def put(self, name, f, params):
assert 'checksum' not in params, "Passing a checksum is not supported"
assert 'id' not in params, "Passing an ID is not supported"
......@@ -353,6 +381,7 @@ class ImageBackend(object):
self._update(location, size, hashmap, meta, permissions)
return self._get_image(location)
@handle_backend_exceptions
def register(self, name, location, params):
assert 'id' not in params, "Passing an ID is not supported"
assert location.startswith('pithos://'), "Invalid location"
......@@ -392,6 +421,7 @@ class ImageBackend(object):
self._update_permissions(location, permissions)
return self._get_image(location)
@handle_backend_exceptions
def remove_user(self, image_id, user):
image = self.get_image(image_id)
assert image, "Image not found"
......@@ -404,6 +434,7 @@ class ImageBackend(object):
return # User did not have access anyway
self._update_permissions(location, permissions)
@handle_backend_exceptions
def replace_users(self, image_id, users):
image = self.get_image(image_id)
assert image, "Image not found"
......@@ -415,6 +446,7 @@ class ImageBackend(object):
permissions['read'].append('*')
self._update_permissions(location, permissions)
@handle_backend_exceptions
def update(self, image_id, params):
image = self.get_image(image_id)
assert image, "Image not found"
......@@ -437,4 +469,3 @@ class ImageBackend(object):
self._update_meta(location, meta)
return self.get_image(image_id)
snf-cyclades-app/synnefo/plankton/util.py
View file @ 8a931304
......@@ -31,8 +31,6 @@
# interpreted as representing official policies, either expressed
# or implied, of GRNET S.A.
import datetime
from functools import wraps
from logging import getLogger
from traceback import format_exc
......@@ -42,9 +40,8 @@ from django.http import (HttpResponse, HttpResponseBadRequest,
HttpResponseServerError, HttpResponseForbidden)
from synnefo.lib.astakos import get_user
from synnefo.plankton.backend import ImageBackend, BackendException
from pithos.backends.base import NotAllowedError
from synnefo.plankton.backend import (ImageBackend, BackendException,
NotAllowedError)
log = getLogger('synnefo.plankton')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment