mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-22 17:16:24 +00:00
Code Issues 25 Releases Wiki Activity

Implemented double hashing detection idea.

Browse Source
This commit is contained in:
GappleBee 2024-11-08 21:52:52 +00:00
parent 0b53628187
commit e6c68fa540
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
django/contrib/staticfiles/storage.py
View File

@ -203,7 +203,7 @@ class HashedFilesMixin:
""" """
return self._url(self.stored_name, name, force) return self._url(self.stored_name, name, force)
def url_converter(self, name, hashed_files, template=None): def url_converter(self, name, hashed_files, hashed_imports_exports, template=None):
""" """
Return the custom URL converter for the given file name. Return the custom URL converter for the given file name.
""" """
@ -221,6 +221,10 @@ class HashedFilesMixin:
matched = matches["matched"] matched = matches["matched"]
url = matches["url"] url = matches["url"]
# Ignore already hashed imports and exports
if url in hashed_imports_exports:
return matched
# Ignore absolute/protocol-relative and data-uri URLs. # Ignore absolute/protocol-relative and data-uri URLs.
if re.match(r"^[a-z]+:", url) or url.startswith("//"): if re.match(r"^[a-z]+:", url) or url.startswith("//"):
return matched return matched
@ -264,6 +268,7 @@ class HashedFilesMixin:
# Return the hashed version to the file # Return the hashed version to the file
matches["url"] = unquote(transformed_url) matches["url"] = unquote(transformed_url)
hashed_imports_exports.add(matches["url"])
return template % matches return template % matches
return converter return converter
@ -363,41 +368,25 @@ class HashedFilesMixin:
# ..to apply each replacement pattern to the content # ..to apply each replacement pattern to the content
if name in adjustable_paths: if name in adjustable_paths:
old_hashed_name = hashed_name old_hashed_name = hashed_name
hashed_imports_exports = set()
try: try:
unprocessed_content = original_file.read().decode("utf-8") content = original_file.read().decode("utf-8")
final_content = unprocessed_content
except UnicodeDecodeError as exc: except UnicodeDecodeError as exc:
yield name, None, exc, False yield name, None, exc, False
for extension, patterns in self._patterns.items(): for extension, patterns in self._patterns.items():
if matches_patterns(path, (extension,)): if matches_patterns(path, (extension,)):
for pattern, template in patterns: for pattern, template in patterns:
converter = self.url_converter( converter = self.url_converter(
name, hashed_files, template name, hashed_files, hashed_imports_exports, template
) )
try: try:
processed_content = pattern.sub( content = pattern.sub(converter, content)
converter, unprocessed_content
)
final_content_lines = final_content.split("\n")
processed_content_lines = processed_content.split(
"\n"
)
for i, final_content_line in enumerate(
final_content_lines
):
if len(final_content_line) < len(
processed_content_lines[i]
):
final_content_lines[i] = (
processed_content_lines[i]
) # Keep the processed line
final_content = "\n".join(final_content_lines)
except ValueError as exc: except ValueError as exc:
yield name, None, exc, False yield name, None, exc, False
if hashed_file_exists: if hashed_file_exists:
self.delete(hashed_name) self.delete(hashed_name)
# then save the processed result # then save the processed result
content_file = ContentFile(final_content.encode()) content_file = ContentFile(content.encode())
if self.keep_intermediate_files: if self.keep_intermediate_files:
# Save intermediate file for reference # Save intermediate file for reference
self._save(hashed_name, content_file) self._save(hashed_name, content_file)