Simplify the handlers that manage the files download reducing the ove…

…rhead of the handler.
globaleaks · Sep 14, 2016 · d8232e5 · d8232e5
1 parent 1f07a76
commit d8232e5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 47 deletions.
diff --git a/backend/globaleaks/handlers/base.py b/backend/globaleaks/handlers/base.py
@@ -499,36 +499,16 @@ def do_verbose_log(self, content):
         except Exception as excep:
             log.err("Unable to open %s: %s" % (GLSettings.httplogfile, excep))
 
-    def write_chunk(self, f):
-        try:
-            chunk = f.read(GLSettings.file_chunk_size)
-            if len(chunk) != 0:
-                self.write(chunk)
-                self.flush()
-                reactor.callLater(0.01, self.write_chunk, f)
-            else:
-                f.close()
-                self.finish()
-        except Exception:
-            f.close()
-            self.finish()
-
+    @inlineCallbacks
     def write_file(self, filepath):
-        f = None
-
-        try:
-            f = open(filepath, "rb")
-        except IOError as srcerr:
-            log.err("Unable to open %s: %s " % (filepath, srcerr.strerror))
-            self.finish()
-
-        try:
-            reactor.callLater(0, self.write_chunk, f)
-        except Exception:
-            if f is not None:
-                f.close()
+        with open(filepath, "rb") as f:
+            chunk = f.read(GLSettings.file_chunk_size)
+            self.write(chunk)
 
-            self.finish()
+            chunk = f.read(GLSettings.file_chunk_size)
+            while(len(chunk) != 0):
+                yield deferred_sleep(0.001)
+                self.write(chunk)
 
     def write_error(self, status_code, **kw):
         exception = kw.get('exception')
@@ -701,24 +681,15 @@ def handler_request_logging_end(self):
 
 
 class BaseStaticFileHandler(BaseHandler):
-    def initialize(self, path=None):
-        if path is None:
-            path = GLSettings.static_path
-
-        self.root = "%s%s" % (os.path.abspath(path), os.path.sep)
-
-    def parse_url_path(self, url_path):
-        if os.path.sep != "/":
-            url_path = url_path.replace("/", os.path.sep)
-        return url_path
+    def initialize(self, path):
+        self.root = "%s%s" % (os.path.abspath(path), "/")
 
     @BaseHandler.unauthenticated
-    @web.asynchronous
+    @inlineCallbacks
     def get(self, path):
         if path == '':
             path = 'index.html'
 
-        path = self.parse_url_path(path)
         abspath = os.path.abspath(os.path.join(self.root, path))
 
         directory_traversal_check(self.root, abspath)
@@ -730,7 +701,7 @@ def get(self, path):
         if mime_type:
             self.set_header("Content-Type", mime_type)
 
-        self.write_file(abspath)
+        yield self.write_file(abspath)
 
 
 class BaseRedirectHandler(BaseHandler, RedirectHandler):

diff --git a/backend/globaleaks/handlers/files.py b/backend/globaleaks/handlers/files.py
@@ -9,7 +9,6 @@
 from twisted.internet import threads
 from twisted.internet.defer import inlineCallbacks
 
-from cyclone.web import asynchronous
 from globaleaks.handlers.base import BaseHandler
 from globaleaks.handlers.rtip import db_access_rtip
 from globaleaks.models import ReceiverFile, InternalTip, InternalFile, WhistleblowerTip
@@ -248,7 +247,6 @@ class Download(BaseHandler):
 
     @BaseHandler.transport_security_check('receiver')
     @BaseHandler.authenticated('receiver')
-    @asynchronous
     @inlineCallbacks
     def get(self, rtip_id, rfile_id):
         rfile = yield download_file(self.current_user.user_id, rtip_id, rfile_id)
@@ -260,6 +258,6 @@ def get(self, rtip_id, rfile_id):
             self.set_header('Content-Type', 'application/octet-stream')
             self.set_header('Content-Length', rfile['size'])
             self.set_header('Content-Disposition', 'attachment; filename=\"%s\"' % rfile['name'])
-            self.write_file(filelocation)
+            yield self.write_file(filelocation)
         else:
             self.set_status(404)
diff --git a/backend/globaleaks/handlers/public.py b/backend/globaleaks/handlers/public.py
@@ -332,7 +332,6 @@ def get(self):
 
 
 class RobotstxtHandler(BaseHandler):
-
     @BaseHandler.transport_security_check("unauth")
     @BaseHandler.unauthenticated
     def get(self):

diff --git a/backend/globaleaks/rest/api.py b/backend/globaleaks/rest/api.py
@@ -128,9 +128,8 @@
     (r'/wizard', wizard.Wizard),
 
     ## Special Files Handlers##
-    (r'/(favicon.ico)', base.BaseStaticFileHandler),
     (r'/robots.txt', public.RobotstxtHandler),
-    (r'/s/(.*)', base.BaseStaticFileHandler),
+    (r'/s/(.*)', base.BaseStaticFileHandler, {'path': GLSettings.static_path}),
     (r'/static/(.*)', base.BaseStaticFileHandler), # still here for backward compatibility
     (r'/l10n/(' + '|'.join(LANGUAGES_SUPPORTED_CODES) + ')', l10n.L10NHandler),