orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Keep using only filename if it's valid ascii

Browse source
This commit is contained in:
Antonio Larrosa 2017-04-07 20:34:52 +02:00
parent bf023e7dc0
commit d50a5db5ed
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
flask/helpers.py
View file

@ -14,7 +14,7 @@ import sys
import pkgutil import pkgutil
import posixpath import posixpath
import mimetypes import mimetypes
import unicodedata from unicodedata import normalize
from time import time from time import time
from zlib import adler32 from zlib import adler32
from threading import RLock from threading import RLock
@ -535,13 +535,22 @@ def send_file(filename_or_fp, mimetype=None, as_attachment=False,
if attachment_filename is None: if attachment_filename is None:
raise TypeError('filename unavailable, required for ' raise TypeError('filename unavailable, required for '
'sending as attachment') 'sending as attachment')
filename_dict = { normalized = normalize('NFKD', text_type(attachment_filename))
'filename': (unicodedata.normalize('NFKD',
text_type(attachment_filename)).encode('ascii', try:
'ignore')), normalized.encode('ascii')
'filename*': "UTF-8''%s" % url_quote(attachment_filename)} except UnicodeEncodeError:
filenames = {
'filename': normalized.encode('ascii', 'ignore'),
'filename*': "UTF-8''%s" % url_quote(attachment_filename),
}
else:
filenames = {
'filename': attachment_filename,
}
headers.add('Content-Disposition', 'attachment', headers.add('Content-Disposition', 'attachment',
**filename_dict) **filenames)
if current_app.use_x_sendfile and filename: if current_app.use_x_sendfile and filename:
if file is not None: if file is not None: