Support x-send and nginx headers.

closes #2914

docs/installation/configuration-files.rst

@@ -41,6 +41,19 @@ logging
          handlers: ["myCustomHandler"]
          level: DEBUG
 
+content
+^^^^^^^
+
+The configuration for the content serving application.
+
+web_server
+  Defines the type of web server that is running the content application.
+  When set to `django`, the content is streamed.
+  When set to `apache`, the `X-SENDFILE` header is injected which delegates
+  streaming the content to Apache.  Requires: `mod_xsendfile` to be installed.
+  When set to `nginx`, the `X-Accel-Redirect` header is injected which delegates
+  streaming the content to NGINX.
+
 JWT_AUTH
 ^^^^^^^^
 

pulpcore/pulpcore/app/settings.py

@@ -204,6 +204,9 @@
     'server': {
         'working_directory': '/var/cache/pulp',
     },
+    'content': {
+        'web_server': 'django',
+    },
     'broker': {
         'url': 'amqp://guest@localhost//',
         'celery_require_ssl': False,

pulpcore/pulpcore/app/views/content.py

@@ -3,8 +3,10 @@
 from gettext import gettext as _
 from logging import getLogger, DEBUG
 
+from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
-from django.http import HttpResponseNotFound, StreamingHttpResponse
+from django.http import (HttpResponse, HttpResponseForbidden, HttpResponseNotFound,
+                         StreamingHttpResponse)
 from django.views.generic import View
 
 from wsgiref.util import FileWrapper
@@ -117,32 +119,32 @@ def _match(self, path):
         else:
             raise ObjectDoesNotExist()
 
-    @staticmethod
-    def _stream(storage_path):
+    def _stream(self, storage_path):
         """
         Get streaming response.
 
         Args:
             storage_path (str): The storage path of the requested object.
 
         Returns:
-            HttpResponse: Always.
+            StreamingHttpResponse: Stream the requested content.
 
         """
         try:
             file = FileWrapper(open(storage_path, 'rb'))
         except FileNotFoundError:
             return HttpResponseNotFound()
+        except PermissionError:
+            return HttpResponseForbidden()
         response = StreamingHttpResponse(file)
         response['Content-Length'] = os.path.getsize(storage_path)
         response['Content-Disposition'] = \
             'attachment; filename={n}'.format(n=os.path.basename(storage_path))
         return response
 
-    @staticmethod
-    def _redirect(storage_path):
+    def _redirect(self, storage_path):
         """
-        Redirect to streamer.
+        Get redirect-to-streamer response.
 
         Args:
             storage_path (str): The storage path of the requested object.
@@ -152,18 +154,40 @@ def _redirect(storage_path):
         """
         # :TODO:
 
-    @staticmethod
-    def _xsend(storage_path):
+    def _apache(self, storage_path):
         """
-        Stream using X-SEND.
+        The content web server is Apache.
 
         Args:
             storage_path (str): The storage path of the requested object.
 
         Returns:
+            HttpResponse: A response with X-SENDFILE header.
+        """
+        response = HttpResponse()
+        response['X-SENDFILE'] = storage_path
+        return response
 
+    def _nginx(self, storage_path):
         """
-        # :TODO:
+        The content web server is NGINX.
+
+        Args:
+            storage_path (str): The storage path of the requested object.
+
+        Returns:
+            HttpResponse: A response with X-Accel-Redirect header.
+        """
+        response = HttpResponse()
+        response['X-Accel-Redirect'] = storage_path
+        return response
+
+    # Mapping of responder method by web server.
+    RESPONDER = {
+        'django': _stream,
+        'apache': _apache,
+        'nginx': _nginx,
+    }
 
     def get(self, request):
         """
@@ -175,14 +199,21 @@ def get(self, request):
         Returns:
             django.http.StreamingHttpResponse: on found.
             django.http.HttpResponseNotFound: on not-found.
+            django.http.HttpResponseForbidden: on forbidden.
 
         """
+        server = settings.CONTENT['web_server']
+
         try:
             path = request.path.strip('/')
             path = path[len(self.BASE_PATH):]
             storage_path = self._match(path)
         except ObjectDoesNotExist:
             return HttpResponseNotFound()
 
-        # TODO: Eventually, choose _redirect() and _xsend() as appropriate.
-        return self._stream(storage_path)
+        try:
+            responder = self.RESPONDER[server]
+        except KeyError:
+            raise ValueError(_('Web server "{t}" not supported.'.format(t=server)))
+        else:
+            return responder(self, storage_path)

pulpcore/pulpcore/etc/pulp/server.yaml

@@ -85,6 +85,17 @@
 # server:
 #   working_directory: /var/cache/pulp
 
+# Content Application
+#
+# `content`: The content serving application.
+#   `web_server`: The type of web server.  Must be: (django|apache|nginx).
+#                 When set to 'apache', the X-SENDFILE header is injected which delegates
+#                 streaming the content to Apache.  Requires: mod_xsendfile to be installed.
+#                 When set to 'nginx', the X-Accel-Redirect header is injected which delegates
+#                 streaming the content to NGINX.
+#
+# web_server: django
+
 # JWT Authentication configuration
 #
 # For more JWT settings, see