Skip to content

Fix filename handling for Unicode #18

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
wants to merge 1 commit into
base: 25.08-release
Choose a base branch
from
Open

Fix filename handling for Unicode #18

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
17 changes: 13 additions & 4 deletions redash/handlers/query_results.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import logging
import unicodedata
from urllib.parse import quote

Expand Down Expand Up @@ -36,6 +37,8 @@
to_filename,
)

logger = logging.getLogger(__name__)


def error_response(message, http_status=400):
return {"job": {"status": 4, "error": message}}, http_status
Expand Down Expand Up @@ -124,19 +127,25 @@ def get_download_filename(query_result, query, filetype):


def content_disposition_filenames(attachment_filename):
logger.info(
f"content_disposition_filenames called with: {attachment_filename} (type: {type(attachment_filename)})"
)
if not isinstance(attachment_filename, str):
attachment_filename = attachment_filename.decode("utf-8")

try:
attachment_filename = attachment_filename.encode("ascii")
# Test if we can encode as ASCII, but don't actually encode
attachment_filename.encode("ascii")
# If we can encode as ASCII, use the original string
filenames = {"filename": attachment_filename}
except UnicodeEncodeError:
# If we can't encode as ASCII, provide both filename and filename* for RFC 6266 compliance
filenames = {
"filename": unicodedata.normalize("NFKD", attachment_filename).encode("ascii", "ignore"),
"filename": unicodedata.normalize("NFKD", attachment_filename).encode("ascii", "ignore").decode("ascii"),
"filename*": "UTF-8''%s" % quote(attachment_filename, safe=b""),
}
else:
filenames = {"filename": attachment_filename}

logger.info(f"content_disposition_filenames returning: {filenames}")
return filenames


Expand Down