vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor: Correct Content-Disposition headers (#22383)

Browse source
This commit is contained in:
Ankush Menat 2023-09-13 12:57:14 +05:30 • committed by GitHub
parent 64dd4b876b
commit 0eb509aac3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
frappe/utils/response.py
View file

@ -66,9 +66,8 @@ def build_response(response_type=None):
def as_csv():
response = Response()
response.mimetype = "text/csv"
response.headers["Content-Disposition"] = (
'attachment; filename="%s.csv"' % frappe.response["doctype"].replace(" ", "_")
).encode("utf-8")
filename = f"{frappe.response['doctype']}.csv"
response.headers.add("Content-Disposition", "attachment", filename=filename)
response.data = frappe.response["result"]
return response
@ -76,9 +75,8 @@ def as_csv():
def as_txt():
response = Response()
response.mimetype = "text"
response.headers["Content-Disposition"] = (
'attachment; filename="%s.txt"' % frappe.response["doctype"].replace(" ", "_")
).encode("utf-8")
filename = f"{frappe.response['doctype']}.txt"
response.headers.add("Content-Disposition", "attachment", filename=filename)
response.data = frappe.response["result"]
return response
@ -90,9 +88,11 @@ def as_raw():
or mimetypes.guess_type(frappe.response["filename"])[0]
or "application/unknown"
)
response.headers["Content-Disposition"] = (
f'{frappe.response.get("display_content_as","attachment")}; filename="{frappe.response["filename"].replace(" ", "_")}"'
).encode()
response.headers.add(
"Content-Disposition",
frappe.response.get("display_content_as", "attachment"),
filename=frappe.response["filename"],
)
response.data = frappe.response["filecontent"]
return response
@ -112,11 +112,7 @@ def as_json():
def as_pdf():
response = Response()
response.mimetype = "application/pdf"
encoded_filename = quote(frappe.response["filename"].replace(" ", "_"))
response.headers["Content-Disposition"] = (
'filename="%s"' % frappe.response["filename"].replace(" ", "_")
+ ";filename*=utf-8''%s" % encoded_filename
).encode("utf-8")
response.headers.add("Content-Disposition", filename=frappe.response["filename"])
response.data = frappe.response["filecontent"]
return response
@ -124,10 +120,7 @@ def as_pdf():
def as_binary():
response = Response()
response.mimetype = "application/octet-stream"
filename = "_".join(frappe.response["filename"].split())
response.headers["Content-Disposition"] = (
'filename="%s"' % filename
).encode("utf-8")
response.headers.add("Content-Disposition", filename=frappe.response["filename"])
response.data = frappe.response["filecontent"]
return response
@ -262,7 +255,7 @@ def send_private_file(path: str) -> Response:
blacklist = [".svg", ".html", ".htm", ".xml"]
if extension.lower() in blacklist:
response.headers.add("Content-Disposition", "attachment", filename=filename.encode("utf-8"))
response.headers.add("Content-Disposition", "attachment", filename=filename)
response.mimetype = mimetypes.guess_type(filename)[0] or "application/octet-stream"