diff options
5 files changed, 89 insertions, 6 deletions
diff --git a/service/pixelated/adapter/services/mail_service.py b/service/pixelated/adapter/services/mail_service.py index f0bc056b..964e4354 100644 --- a/service/pixelated/adapter/services/mail_service.py +++ b/service/pixelated/adapter/services/mail_service.py @@ -35,6 +35,11 @@ class MailService(object): defer.returnValue(mails) @defer.inlineCallbacks + def attachment_id(self, _file): + _attachment_id = yield 'mocked_for_now' + defer.returnValue(_attachment_id) + + @defer.inlineCallbacks def mails(self, query, window_size, page): mail_ids, total = self.search_engine.search(query, window_size, page) diff --git a/service/pixelated/resources/attachments_resource.py b/service/pixelated/resources/attachments_resource.py index a78022ec..667d030e 100644 --- a/service/pixelated/resources/attachments_resource.py +++ b/service/pixelated/resources/attachments_resource.py @@ -13,19 +13,20 @@ # # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see <http://www.gnu.org/licenses/>. - import io - import re + +from twisted.internet import defer from twisted.protocols.basic import FileSender from twisted.python.log import msg from twisted.web import server from twisted.web.resource import Resource -from twisted.internet import defer +from twisted.web.server import NOT_DONE_YET +from pixelated.resources import respond_json_deferred -class AttachmentResource(Resource): +class AttachmentResource(Resource): isLeaf = True def __init__(self, mail_service, attachment_id): @@ -38,6 +39,7 @@ class AttachmentResource(Resource): msg(failure, 'attachment not found') request.code = 404 request.finish() + encoding = request.args.get('encoding', [None])[0] filename = request.args.get('filename', [self.attachment_id])[0] request.setHeader(b'Content-Type', b'application/force-download') @@ -67,6 +69,7 @@ class AttachmentResource(Resource): class AttachmentsResource(Resource): + BASE_URL = 'attachment' def __init__(self, mail_service): Resource.__init__(self) @@ -74,3 +77,20 @@ class AttachmentsResource(Resource): def getChild(self, attachment_id, request): return AttachmentResource(self.mail_service, attachment_id) + + def render_POST(self, request): + _file = request.args['attachment'][0] + + deferred = self.mail_service.attachment_id(_file) + + def send_location(attachment_id): + request.headers['Location'] = '/%s/%s'% (self.BASE_URL, attachment_id) + respond_json_deferred({"attachment_id": attachment_id}, request, status_code=201) + + def error_handler(error): + respond_json_deferred({"message": "Something went wrong. Attachement not saved."}, request, status_code=500) + + deferred.addCallback(send_location) + deferred.addErrback(error_handler) + + return NOT_DONE_YET diff --git a/service/pixelated/resources/root_resource.py b/service/pixelated/resources/root_resource.py index f1e5d02b..56da5cc7 100644 --- a/service/pixelated/resources/root_resource.py +++ b/service/pixelated/resources/root_resource.py @@ -41,7 +41,7 @@ class RootResource(Resource): self.putChild('assets', File(self._static_folder)) self.putChild('keys', KeysResource(keymanager)) - self.putChild('attachment', AttachmentsResource(mail_service)) + self.putChild(AttachmentsResource.BASE_URL, AttachmentsResource(mail_service)) self.putChild('contacts', ContactsResource(search_engine)) self.putChild('features', FeaturesResource()) self.putChild('tags', TagsResource(search_engine)) diff --git a/service/test/integration/test_retrieve_attachment.py b/service/test/integration/test_retrieve_attachment.py index e7e8670d..bc7f8a0d 100644 --- a/service/test/integration/test_retrieve_attachment.py +++ b/service/test/integration/test_retrieve_attachment.py @@ -17,9 +17,10 @@ from email.mime.application import MIMEApplication from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText -from test.support.integration.soledad_test_base import SoledadTestBase from twisted.internet import defer +from test.support.integration.soledad_test_base import SoledadTestBase + class RetrieveAttachmentTest(SoledadTestBase): diff --git a/service/test/unit/resources/test_attachments_resource.py b/service/test/unit/resources/test_attachments_resource.py new file mode 100644 index 00000000..c377324b --- /dev/null +++ b/service/test/unit/resources/test_attachments_resource.py @@ -0,0 +1,57 @@ +import json +import unittest + +from mockito import mock, when, verify +from twisted.internet import defer +from twisted.web.test.requesthelper import DummyRequest + +from pixelated.resources.attachments_resource import AttachmentsResource +from test.unit.resources import DummySite + + +class AttachmentsResourceTest(unittest.TestCase): + + def setUp(self): + self.mail_service = mock() + self.mails_resource = AttachmentsResource(self.mail_service) + self.mails_resource.isLeaf = True + self.web = DummySite(self.mails_resource) + + def test_post_new_attachment(self): + request = DummyRequest(['/attachment']) + request.method = 'POST' + attachment = 'some fake file' + request.args = {'attachment': [attachment,]} + attachment_id = 'B5B4ED80AC3B894523D72E375DACAA2FC6606C18EDF680FE95903086C8B5E14A' + + when(self.mail_service).attachment_id(attachment).thenReturn(defer.succeed(attachment_id)) + + d = self.web.get(request) + + def assert_response(_): + verify(self.mail_service).attachment_id(attachment) + self.assertEqual(201, request.code) + self.assertEqual('/attachment/%s' % attachment_id, request.headers['Location']) + self.assertEqual({'attachment_id': attachment_id}, json.loads(request.written[0])) + + d.addCallback(assert_response) + return d + + def test_post_attachment_fails(self): + request = DummyRequest(['/attachment']) + request.method = 'POST' + attachment = 'some fake file' + request.args = {'attachment': [attachment,]} + + when(self.mail_service).attachment_id(attachment).thenReturn(defer.fail(Exception)) + + d = self.web.get(request) + + def assert_response(_): + self.assertEqual(500, request.code) + self.assertFalse('Location' in request.headers) + verify(self.mail_service).attachment_id(attachment) + self.assertEqual({"message": "Something went wrong. Attachement not saved."}, json.loads(request.written[0])) + + d.addCallback(assert_response) + return d
\ No newline at end of file |