summaryrefslogtreecommitdiff
path: root/src/leap/soledad/server
diff options
context:
space:
mode:
authorVictor Shyba <victor1984@riseup.net>2017-06-26 05:25:55 -0300
committerVictor Shyba <victor1984@riseup.net>2017-07-02 01:40:32 -0300
commitab297c4efe10c70949fac5384a63cbf553ba5da9 (patch)
tree43e0dea081dc38440bd18f90f7910762a1c8fd46 /src/leap/soledad/server
parentb672d210fb34013a7c1b9c663eaa6afecbfacd80 (diff)
[feature] namespace capability to BlobsBackend
Adds an extra parameter called "namespace" on the backend interface and on FileSystemBlobsBackend. This parameter overrides default id partitioning and uses a separate folder for a custom namespace. -- Resolves: #8889
Diffstat (limited to 'src/leap/soledad/server')
-rw-r--r--src/leap/soledad/server/_blobs.py31
-rw-r--r--src/leap/soledad/server/interfaces.py12
2 files changed, 24 insertions, 19 deletions
diff --git a/src/leap/soledad/server/_blobs.py b/src/leap/soledad/server/_blobs.py
index 10678360..f87c3818 100644
--- a/src/leap/soledad/server/_blobs.py
+++ b/src/leap/soledad/server/_blobs.py
@@ -66,16 +66,16 @@ class FilesystemBlobsBackend(object):
os.makedirs(blobs_path)
self.path = blobs_path
- def read_blob(self, user, blob_id, request):
+ def read_blob(self, user, blob_id, request, namespace=''):
logger.info('reading blob: %s - %s' % (user, blob_id))
- path = self._get_path(user, blob_id)
+ path = self._get_path(user, blob_id, namespace)
logger.debug('blob path: %s' % path)
_file = static.File(path, defaultType='application/octet-stream')
return _file.render_GET(request)
@defer.inlineCallbacks
- def write_blob(self, user, blob_id, request):
- path = self._get_path(user, blob_id)
+ def write_blob(self, user, blob_id, request, namespace=''):
+ path = self._get_path(user, blob_id, namespace)
try:
mkdir_p(os.path.split(path)[0])
except OSError:
@@ -95,16 +95,16 @@ class FilesystemBlobsBackend(object):
fbp = FileBodyProducer(request.content)
yield fbp.startProducing(open(path, 'wb'))
- def delete_blob(self, user, blob_id):
- blob_path = self._get_path(user, blob_id)
+ def delete_blob(self, user, blob_id, namespace=''):
+ blob_path = self._get_path(user, blob_id, namespace)
os.unlink(blob_path)
- def get_blob_size(user, blob_id):
+ def get_blob_size(user, blob_id, namespace=''):
raise NotImplementedError
- def list_blobs(self, user, request):
+ def list_blobs(self, user, request, namespace=''):
blob_ids = []
- base_path = self._get_path(user)
+ base_path = self._get_path(user, custom_preffix=namespace)
for _, _, filenames in os.walk(base_path):
blob_ids += filenames
return json.dumps(blob_ids)
@@ -112,8 +112,8 @@ class FilesystemBlobsBackend(object):
def get_total_storage(self, user):
return self._get_disk_usage(self._get_path(user))
- def add_tag_header(self, user, blob_id, request):
- with open(self._get_path(user, blob_id)) as doc_file:
+ def add_tag_header(self, user, blob_id, request, namespace=''):
+ with open(self._get_path(user, blob_id, namespace)) as doc_file:
doc_file.seek(-16, 2)
tag = base64.urlsafe_b64encode(doc_file.read())
request.responseHeaders.setRawHeaders('Tag', [tag])
@@ -140,14 +140,19 @@ class FilesystemBlobsBackend(object):
raise Exception(err)
return desired_path
- def _get_path(self, user, blob_id=False):
+ def _get_path(self, user, blob_id='', custom_preffix=''):
parts = [user]
+ parts += self._get_preffix(blob_id, custom_preffix)
if blob_id:
- parts += [blob_id[0], blob_id[0:3], blob_id[0:6]]
parts += [blob_id]
path = os.path.join(self.path, *parts)
return self._validate_path(path, user, blob_id)
+ def _get_preffix(self, blob_id, custom=''):
+ if custom or not blob_id:
+ return [custom]
+ return [blob_id[0], blob_id[0:3], blob_id[0:6]]
+
class ImproperlyConfiguredException(Exception):
pass
diff --git a/src/leap/soledad/server/interfaces.py b/src/leap/soledad/server/interfaces.py
index 67b04bc3..ccb2ffdc 100644
--- a/src/leap/soledad/server/interfaces.py
+++ b/src/leap/soledad/server/interfaces.py
@@ -25,31 +25,31 @@ class IBlobsBackend(Interface):
An interface for a BlobsBackend.
"""
- def read_blob(user, blob_id, request):
+ def read_blob(user, blob_id, request, namespace=''):
"""
Read blob with a given blob_id, and write it to the passed request.
:returns: a deferred that fires upon finishing.
"""
- def write_blob(user, blob_id, request):
+ def write_blob(user, blob_id, request, namespace=''):
"""
Write blob to the storage, reading it from the passed request.
:returns: a deferred that fires upon finishing.
"""
- def delete_blob(user, blob_id):
+ def delete_blob(user, blob_id, namespace=''):
"""
Delete the given blob_id.
"""
- def get_blob_size(user, blob_id):
+ def get_blob_size(user, blob_id, namespace=''):
"""
Get the size of the given blob id.
"""
- def list_blobs(user, request):
+ def list_blobs(user, request, namespace=''):
"""
Returns a json-encoded list of ids from user's blob.
@@ -62,7 +62,7 @@ class IBlobsBackend(Interface):
unders its namespace.
"""
- def add_tag_header(user, blob_id, request):
+ def add_tag_header(user, blob_id, request, namespace=''):
"""
Adds a header 'Tag' to the passed request object, containing the last
16 bytes of the encoded blob, which according to the spec contains the