From 7ef11157c9af8dcddbc52f063f8f362bddc6c36f Mon Sep 17 00:00:00 2001 From: Victor Shyba Date: Mon, 29 May 2017 04:02:20 -0300 Subject: [feature] make /incoming persist doc on CouchDB -- Resolves: #8827 --- server/src/leap/soledad/server/_incoming.py | 19 +++++++++ testing/tests/server/test_incoming_resource.py | 48 ++++++++++++++++++++++ testing/tests/server/test_incoming_server.py | 57 ++++++++++++++++++++++++++ 3 files changed, 124 insertions(+) create mode 100644 testing/tests/server/test_incoming_resource.py create mode 100644 testing/tests/server/test_incoming_server.py diff --git a/server/src/leap/soledad/server/_incoming.py b/server/src/leap/soledad/server/_incoming.py index 1583e362..a9845af1 100644 --- a/server/src/leap/soledad/server/_incoming.py +++ b/server/src/leap/soledad/server/_incoming.py @@ -18,11 +18,30 @@ A twisted resource that saves externally delivered documents into user's db. """ from twisted.web.resource import Resource +from leap.soledad.common.document import ServerDocument +from ._config import get_config +from leap.soledad.common.couch.state import CouchServerState +import json __all__ = ['IncomingResource'] +def _default_backend(): + conf = get_config() + return CouchServerState(conf['couch_url'], create_cmd=conf['create_cmd']) + + class IncomingResource(Resource): + isLeaf = True + + def __init__(self, backend_factory=None): + self.factory = backend_factory or _default_backend() + def render_PUT(self, request): + uuid, doc_id = request.postpath + db = self.factory.open_database(uuid) + doc = ServerDocument(doc_id) + doc.content = json.loads(request.content.read()) + db.put_doc(doc) return '' diff --git a/testing/tests/server/test_incoming_resource.py b/testing/tests/server/test_incoming_resource.py new file mode 100644 index 00000000..ccec2198 --- /dev/null +++ b/testing/tests/server/test_incoming_resource.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- +# test_blobs_resource_validation.py +# Copyright (C) 2017 LEAP +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +""" +Unit tests for incoming API resource +""" +from twisted.trial import unittest +from twisted.web.test.test_web import DummyRequest +from leap.soledad.server._incoming import IncomingResource +from io import BytesIO +from uuid import uuid4 +from mock import Mock + + +class BlobServerTestCase(unittest.TestCase): + + def setUp(self): + self.couchdb = Mock() + self.backend_factory = Mock() + self.backend_factory.open_database.return_value = self.couchdb + self.resource = IncomingResource(self.backend_factory) + self.user_uuid = uuid4().hex + + def test_save_document(self): + doc_id = uuid4().hex + request = DummyRequest([self.user_uuid, doc_id]) + request.content = BytesIO('{}') + self.resource.render_PUT(request) + + open_database = self.backend_factory.open_database + open_database.assert_called_once_with(self.user_uuid) + self.couchdb.put_doc.assert_called_once() + doc = self.couchdb.put_doc.call_args[0][0] + self.assertEquals(doc_id, doc.doc_id) + self.assertEquals('{}', doc.get_json()) diff --git a/testing/tests/server/test_incoming_server.py b/testing/tests/server/test_incoming_server.py new file mode 100644 index 00000000..6e05206a --- /dev/null +++ b/testing/tests/server/test_incoming_server.py @@ -0,0 +1,57 @@ +# -*- coding: utf-8 -*- +# test_blobs_server.py +# Copyright (C) 2017 LEAP +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +""" +Integration tests for incoming API +""" +import pytest +from io import BytesIO +from uuid import uuid4 +from twisted.web.server import Site +from twisted.internet import reactor +from twisted.internet import defer +import treq + +from leap.soledad.server._incoming import IncomingResource +from test_soledad.util import CouchServerStateForTests +from test_soledad.util import CouchDBTestCase + + +class BlobServerTestCase(CouchDBTestCase): + + def setUp(self): + self.state = CouchServerStateForTests(self.couch_url) + root = IncomingResource(self.state) + site = Site(root) + self.port = reactor.listenTCP(0, site, interface='127.0.0.1') + self.host = self.port.getHost() + self.uri = 'http://%s:%s/' % (self.host.host, self.host.port) + self.user_id = 'user-' + uuid4().hex + self.state.ensure_database(self.user_id) + + def tearDown(self): + self.port.stopListening() + + @defer.inlineCallbacks + @pytest.mark.usefixtures("method_tmpdir") + def test_put_incoming_creates_a_document(self): + user_id, doc_id = self.user_id, uuid4().hex + incoming_endpoint = self.uri + '%s/%s' % (user_id, doc_id) + yield treq.put(incoming_endpoint, BytesIO('{}'), persistent=False) + db = self.state.open_database(user_id) + + doc = db.get_doc(doc_id) + self.assertEquals(doc.content, {}) -- cgit v1.2.3