Merge pull request #2412 from jeremycline/allow-content-too

Allow xsendfile to serve /var/lib/pulp/content.

server/pulp/server/content/web/views.py

@@ -11,8 +11,9 @@
 from pulp.server.config import config as pulp_conf
 
 
-# Make sure all requested paths fall under this directory.
+# Make sure all requested paths fall under these directories.
 PUBLISH_DIR = '/var/lib/pulp/published'
+CONTENT_DIR = '/var/lib/pulp/content'
 
 
 class ContentView(View):
@@ -141,7 +142,7 @@ def get(self, request):
             # Not Authorized
             return HttpResponseForbidden()
 
-        if not path.startswith(PUBLISH_DIR):
+        if not path.startswith(PUBLISH_DIR) and not path.startswith(CONTENT_DIR):
             # Someone is requesting something they shouldn't.
             return HttpResponseForbidden()
 

server/test/unit/server/content/web/test_views.py

@@ -152,7 +152,7 @@ def test_get_x_send(self, x_send, allow_access, exists, realpath):
     def test_get_redirected(self, redirect, allow_access, mock_conf_get, exists, realpath):
         allow_access.return_value = True
         exists.return_value = False
-        realpath.side_effect = lambda p: '/var/lib/pulp/published/content'
+        realpath.side_effect = lambda p: '/var/lib/pulp/content/rpm'
 
         host = 'localhost'
         path = '/var/www/pub/content'
@@ -167,7 +167,7 @@ def test_get_redirected(self, redirect, allow_access, mock_conf_get, exists, rea
         # validation
         allow_access.assert_called_once_with(request.environ, host)
         realpath.assert_called_once_with(path)
-        exists.assert_has_call('/var/lib/pulp/published/content')
+        exists.assert_has_call('/var/lib/pulp/content/rpm')
         self.assertTrue(exists.call_count > 0)
         redirect.assert_called_once_with(request, view.key)
         self.assertEqual(reply, redirect.return_value)