Use django-sendfile for serving local files.

puppet/zulip/files/nginx/sites-available/zulip-enterprise

@@ -12,7 +12,8 @@ server {
     ssl_certificate /etc/ssl/certs/zulip.combined-chain.crt;
     ssl_certificate_key /etc/ssl/private/zulip.key;
 
-    location /user_uploads {
+    location /user_uploads_internal {
+        internal;
         add_header X-Content-Type-Options nosniff;
         include /etc/nginx/zulip-include/uploads.types;
         alias /home/zulip/uploads/files;

zerver/views/upload.py

@@ -14,6 +14,8 @@
 from zerver.models import UserProfile, validate_attachment_request
 from django.conf import settings
 
+from sendfile import sendfile
+
 def serve_s3(request, user_profile, realm_id_str, filename, redir):
     # type: (HttpRequest, UserProfile, str, str, bool) -> HttpResponse
     url_path = "%s/%s" % (realm_id_str, filename)
@@ -36,18 +38,13 @@ def serve_s3(request, user_profile, realm_id_str, filename, redir):
     else:
         return HttpResponseForbidden()
 
-# TODO: Rewrite this once we have django-sendfile
 def serve_local(request, path_id):
     # type: (HttpRequest, str) -> HttpResponse
-    import os
-    import mimetypes
     local_path = get_local_file_path(path_id)
     if local_path is None:
         return HttpResponseNotFound('<p>File not found</p>')
-    filename = os.path.basename(local_path)
-    response = FileResponse(open(local_path, 'rb'), content_type = mimetypes.guess_type(filename))
-    return response
-    response['Content-Disposition'] = 'attachment; filename=%s' % (filename)
+    else:
+        return sendfile(request, local_path)
 
 @has_request_variables
 def serve_file_backend(request, user_profile, realm_id_str, filename,

zproject/dev_settings.py

@@ -21,4 +21,5 @@
 # Disable Camo in development
 CAMO_URI = ''
 OPEN_REALM_CREATION = True
+SENDFILE_BACKEND = 'sendfile.backends.development'
 

zproject/settings.py

@@ -81,6 +81,10 @@ def get_secret(key):
 # Import local_settings after determining the deployment/machine type
 if PRODUCTION:
     from .local_settings import *
+    # Configuration for django-sendfile
+    SENDFILE_BACKEND = 'sendfile.backends.nginx'
+    SENDFILE_ROOT = os.path.join(LOCAL_UPLOADS_DIR, 'files')
+    SENDFILE_URL = '/user_uploads_internal'
 else:
     from .dev_settings import *