1 files changed, 20 insertions, 9 deletions
diff --git a/service/pixelated/resources/attachments_resource.py b/service/pixelated/resources/attachments_resource.py
index 83c7156d..a78022ec 100644
--- a/service/pixelated/resources/attachments_resource.py
+++ b/service/pixelated/resources/attachments_resource.py
@@ -18,9 +18,10 @@ import io
 
 import re
 from twisted.protocols.basic import FileSender
-from twisted.python.log import err
+from twisted.python.log import msg
 from twisted.web import server
 from twisted.web.resource import Resource
+from twisted.internet import defer
 
 
 class AttachmentResource(Resource):
@@ -33,23 +34,33 @@ class AttachmentResource(Resource):
         self.mail_service = mail_service
 
     def render_GET(self, request):
+        def error_handler(failure):
+            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]
-        attachment = self.mail_service.attachment(self.attachment_id, encoding)
-
         request.setHeader(b'Content-Type', b'application/force-download')
         request.setHeader(b'Content-Disposition', bytes('attachment; filename=' + filename))
+
+        d = self._send_attachment(encoding, filename, request)
+        d.addErrback(error_handler)
+
+        return server.NOT_DONE_YET
+
+    @defer.inlineCallbacks
+    def _send_attachment(self, encoding, filename, request):
+        attachment = yield self.mail_service.attachment(self.attachment_id)
+
         bytes_io = io.BytesIO(attachment['content'])
-        d = FileSender().beginFileTransfer(bytes_io, request)
 
-        def cb_finished(_):
+        try:
+            request.code = 200
+            yield FileSender().beginFileTransfer(bytes_io, request)
+        finally:
             bytes_io.close()
             request.finish()
 
-        d.addErrback(err).addCallback(cb_finished)
-
-        return server.NOT_DONE_YET
-
     def _extract_mimetype(self, content_type):
         match = re.compile('([A-Za-z-]+\/[A-Za-z-]+)').search(content_type)
         return match.group(1)