Ticket #21219: add_static_file_permission.diff

django/conf/global_settings.py

@@ -610 +610 @@
 #    'django.contrib.staticfiles.finders.DefaultStorageFinder',
 )
 
+# The numeric mode to set newly-collected static files to. The value should be
+# a mode you'd pass directly to os.chmod; see
+# http://docs.python.org/lib/os-file-dir.html.
+STATIC_FILE_PERMISSIONS = None
+
 ##############
 # MIGRATIONS #
 ##############

django/contrib/staticfiles/storage.py

@@ -28 +28 @@
     ``STATIC_ROOT`` and ``STATIC_URL``.
     """
     def __init__(self, location=None, base_url=None, *args, **kwargs):
+        self.permissions_mode = settings.STATIC_FILE_PERMISSIONS
         if location is None:
             location = settings.STATIC_ROOT
         if base_url is None:

django/core/files/storage.py

@@ -146 +146 @@
     """
     Standard filesystem storage
     """
+    permissions_mode = None
 
     def __init__(self, location=None, base_url=None):
         if location is None:
@@ -171 +172 @@
             try:
                 if settings.FILE_UPLOAD_DIRECTORY_PERMISSIONS is not None:
                     # os.makedirs applies the global umask, so we reset it,
-                    # for consistency with FILE_UPLOAD_PERMISSIONS behavior.
+                    # for consistency with self.permissions_mode behavior.
                     old_umask = os.umask(0)
                     try:
                         os.makedirs(directory, settings.FILE_UPLOAD_DIRECTORY_PERMISSIONS)
@@ -232 +233 @@
                 # OK, the file save worked. Break out of the loop.
                 break
 
-        if settings.FILE_UPLOAD_PERMISSIONS is not None:
+        if self.permissions_mode is not None:
+            os.chmod(full_path, self.permissions_mode)
+        elif settings.FILE_UPLOAD_PERMISSIONS:
             os.chmod(full_path, settings.FILE_UPLOAD_PERMISSIONS)
 
         return name

docs/ref/contrib/staticfiles.txt

@@ -28 +28 @@
 * :setting:`STATICFILES_DIRS`
 * :setting:`STATICFILES_STORAGE`
 * :setting:`STATICFILES_FINDERS`
+* :setting:`STATIC_FILE_PERMISSIONS`
 
 Management Commands
 ===================
@@ -322 +323 @@
 
 .. _staticfiles-development-view:
 
+Permissions
+===========
+
+When running :djadmin:`collectstatic` management command, the newly-collected
+static files will derive their permissions from
+:setting:`STATIC_FILE_PERMISSIONS`. If it is ``None``, they will get the
+permissions from :setting:`FILE_UPLOAD_PERMISSIONS`.
+
 Static file development view
 ----------------------------
 

docs/ref/settings.txt

@@ -2678 +2678 @@
 Static file finders are currently considered a private interface, and this
 interface is thus undocumented.
 
+STATIC_FILE_PERMISSIONS
+-----------------------
+
+Default: ``None``
+
+The numeric mode (i.e. ``0644``) to set newly-collected static files to. For
+more information about what these modes mean, see the documentation for
+:func:`os.chmod`.
+
+If this isn't given or is ``None``, you'll get FILE_UPLOAD_PERMISSIONS
+permission.
+
+.. warning::
+
+    **Always prefix the mode with a 0.**
+
+    If you're not familiar with file modes, please note that the leading
+    ``0`` is very important: it indicates an octal number, which is the
+    way that modes must be specified. If you try to use ``644``, you'll
+    get totally incorrect behavior.
+
 Core Settings Topical Index
 ===========================
 

docs/releases/1.7.txt

@@ -337 +337 @@
 * The ``enter`` argument was added to the
   :data:`~django.test.signals.setting_changed` signal.
 
+Static File
+^^^^^^^^^^^
+
+* The new :setting:`STATIC_FILE_PERMISSIONS` controls the file system
+  permissions of newly-collected static files during deployment.
+
 Templates
 ^^^^^^^^^
 

tests/staticfiles_tests/tests.py

@@ -7 +7 @@
 import shutil
 import sys
 import tempfile
+import unittest
 
 from django.template import loader, Context
 from django.conf import settings
@@ -21 +22 @@
 from django.utils import six
 
 from django.contrib.staticfiles import finders, storage
+from django.contrib.staticfiles.management.commands import collectstatic
 
 TEST_ROOT = os.path.dirname(upath(__file__))
 TEST_SETTINGS = {
@@ -804 +806 @@
             st.path('bar')
         finally:
             sys.getfilesystemencoding = old_enc_func
+
+
+@unittest.skipIf(sys.platform.startswith('win'),
+    "Windows only partially supports umasks and chmod.")
+class TestStaticFilePermissions(BaseCollectionTestCase, StaticFilesTestCase):
+
+    @override_settings(STATIC_FILE_PERMISSIONS=0o654)
+    def test_collect_static_file_permissions(self):
+        command = collectstatic.Command()
+        command.execute(**self.defaults)
+        mode = os.stat(
+                settings.STATIC_ROOT + os.path.sep + "test.txt")[0] & 0o777
+        self.assertEqual(mode, 0o654)
+
+    @override_settings(STATIC_FILE_PERMISSIONS=None,
+                       FILE_UPLOAD_PERMISSIONS=0o655)
+    def test_collect_static_file_default_permissions(self):
+        command = collectstatic.Command()
+        command.execute(**self.defaults)
+        mode = os.stat(
+                settings.STATIC_ROOT + os.path.sep + "test.txt")[0] & 0o777
+        self.assertEqual(mode, 0o655)
+
+    # It is very hard to pass settings to external process, so we use instance
+    # of collectstatic command directly to collect static files.
+    def run_collectstatic(self, **kwargs):
+        self.defaults = {'interactive': False,
+                         'post_process': True,
+                         'verbosity': '0',
+                         'ignore_patterns': ['*.ignoreme'],
+                         'use_default_ignore_patterns': True,
+                         'clear': False,
+                         'link': False,
+                         'dry_run': False}