Fixed #36348 -- Fixed handling multiple nested url()s in ManifestStaticFilesStorage.

Signed-off-by: Samuel Cormier-Iijima <[email protected]>

Author: sciyoshi

django/contrib/staticfiles/storage.py

@@ -80,7 +80,8 @@ class HashedFilesMixin:
         (
             "*.css",
             (
-                r"""(?P<matched>url\(['"]{0,1}\s*(?P<url>.*?)["']{0,1}\))""",
+                r"""(?P<matched>url\((?P<quote>['"]{0,1})"""
+                r"""\s*(?P<url>.*?)(?P=quote)\))""",
                 (
                     r"""(?P<matched>@import\s*["']\s*(?P<url>.*?)["'])""",
                     """@import url("%(url)s")""",

tests/staticfiles_tests/project/documents/cached/data_uri_with_nested_url.css

@@ -0,0 +1,3 @@
+#example {
+    background-image: url("data:image/svg+xml,url(%23b) url(%23c)");
+}

tests/staticfiles_tests/test_storage.py

@@ -235,6 +235,13 @@ def test_css_import_case_insensitive(self):
             self.assertIn(b"other.d41d8cd98f00.css", content)
         self.assertPostCondition()
 
+    def test_css_data_uri_with_nested_url(self):
+        relpath = self.hashed_file_path("cached/data_uri_with_nested_url.css")
+        with storage.staticfiles_storage.open(relpath) as relfile:
+            content = relfile.read()
+            self.assertIn(b'url("data:image/svg+xml,url(%23b) url(%23c)")', content)
+        self.assertPostCondition()
+
     def test_css_source_map(self):
         relpath = self.hashed_file_path("cached/source_map.css")
         self.assertEqual(relpath, "cached/source_map.b2fceaf426aa.css")