mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-05-03 22:02:51 +08:00
Fix Content-Disposition header to comply with RFC 2183/8187
Changed Content-Disposition header from filename="name.ext" format to RFC 8187 compliant filename*=utf-8''encoded format. This ensures proper handling of special characters in filenames and compliance with web standards. Fixes Comfy-Org/ComfyUI#8914
This commit is contained in:
parent
3cdc0d523f
commit
b00db6fad0
26
server.py
26
server.py
@ -54,6 +54,24 @@ if args.enable_manager:
|
|||||||
import comfyui_manager
|
import comfyui_manager
|
||||||
|
|
||||||
|
|
||||||
|
def _make_content_disposition(filename: str) -> str:
|
||||||
|
"""
|
||||||
|
Generate RFC 8187 compliant Content-Disposition header.
|
||||||
|
|
||||||
|
According to RFC 8187, the filename parameter should use the extended notation
|
||||||
|
with 'filename*=' and 'utf-8'' language tag when the filename contains non-ASCII
|
||||||
|
characters or needs special encoding.
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
ASCII: filename="test.png"
|
||||||
|
Unicode: filename*=utf-8''%E6%B5%8B%E8%AF%95.png
|
||||||
|
"""
|
||||||
|
import urllib.parse
|
||||||
|
# Always use RFC 8187 extended notation for maximum compatibility
|
||||||
|
encoded_filename = urllib.parse.quote(filename, safe='')
|
||||||
|
return f"filename*=utf-8''{encoded_filename}"
|
||||||
|
|
||||||
|
|
||||||
def _remove_sensitive_from_queue(queue: list) -> list:
|
def _remove_sensitive_from_queue(queue: list) -> list:
|
||||||
"""Remove sensitive data (index 5) from queue item tuples."""
|
"""Remove sensitive data (index 5) from queue item tuples."""
|
||||||
return [item[:5] for item in queue]
|
return [item[:5] for item in queue]
|
||||||
@ -559,7 +577,7 @@ class PromptServer():
|
|||||||
buffer.seek(0)
|
buffer.seek(0)
|
||||||
|
|
||||||
return web.Response(body=buffer.read(), content_type=f'image/{image_format}',
|
return web.Response(body=buffer.read(), content_type=f'image/{image_format}',
|
||||||
headers={"Content-Disposition": f"filename=\"{filename}\""})
|
headers={"Content-Disposition": _make_content_disposition(filename)})
|
||||||
|
|
||||||
if 'channel' not in request.rel_url.query:
|
if 'channel' not in request.rel_url.query:
|
||||||
channel = 'rgba'
|
channel = 'rgba'
|
||||||
@ -579,7 +597,7 @@ class PromptServer():
|
|||||||
buffer.seek(0)
|
buffer.seek(0)
|
||||||
|
|
||||||
return web.Response(body=buffer.read(), content_type='image/png',
|
return web.Response(body=buffer.read(), content_type='image/png',
|
||||||
headers={"Content-Disposition": f"filename=\"{filename}\""})
|
headers={"Content-Disposition": _make_content_disposition(filename)})
|
||||||
|
|
||||||
elif channel == 'a':
|
elif channel == 'a':
|
||||||
with Image.open(file) as img:
|
with Image.open(file) as img:
|
||||||
@ -596,7 +614,7 @@ class PromptServer():
|
|||||||
alpha_buffer.seek(0)
|
alpha_buffer.seek(0)
|
||||||
|
|
||||||
return web.Response(body=alpha_buffer.read(), content_type='image/png',
|
return web.Response(body=alpha_buffer.read(), content_type='image/png',
|
||||||
headers={"Content-Disposition": f"filename=\"{filename}\""})
|
headers={"Content-Disposition": _make_content_disposition(filename)})
|
||||||
else:
|
else:
|
||||||
# Use the content type from asset resolution if available,
|
# Use the content type from asset resolution if available,
|
||||||
# otherwise guess from the filename.
|
# otherwise guess from the filename.
|
||||||
@ -613,7 +631,7 @@ class PromptServer():
|
|||||||
return web.FileResponse(
|
return web.FileResponse(
|
||||||
file,
|
file,
|
||||||
headers={
|
headers={
|
||||||
"Content-Disposition": f"filename=\"{filename}\"",
|
"Content-Disposition": _make_content_disposition(filename),
|
||||||
"Content-Type": content_type
|
"Content-Type": content_type
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user