Skip to content

Fix escape twice url with mark_safe #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
theeko74 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix escape twice url with mark_safe #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions lazy_srcset/templatetags/lazy_srcset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from django.contrib.staticfiles.storage import staticfiles_storage
from django.core.files.images import ImageFile
from django.template.exceptions import TemplateSyntaxError
from django.utils.html import format_html
from django.utils.html import format_html, mark_safe
from imagekit.cachefiles import ImageCacheFile
from imagekit.registry import generator_registry

Expand Down Expand Up @@ -332,8 +332,16 @@ def srcset(*args, **kwargs):
return format_html(
'src="{}" srcset="{}" sizes="{}" width="{}" height="{}"',
output_imgs[0].url,
", ".join(srcsets),
", ".join(sizes),
# ------ FIX ------
# mark_safe on joins to prevent the double escaping signed URLs.
# format_html already escaped each individual srcset/size entry above,
# so the joined string is safe and must not be escaped again.
# Example of bug
# image url: http://static.com/img.jpg?help=true&dim=480
# becomes
# http://static.com/img.jpg?help=true&dim=480 -> 404 ERROR
mark_safe(", ".join(srcsets)),
mark_safe(", ".join(sizes)),
output_imgs[0].width,
output_imgs[0].height,
)