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

Raise BadRequest if static file name is invalid

Browse source 
* Raise BadRequest if static file name is invalid

* Clean up syntax a bit

* Remove unnecessary close()
This commit is contained in:
David Hou 2016-04-02 12:07:27 -07:00 • committed by Markus Unterwaditzer
parent d3d8a4694a
commit 9f1be8e795
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
flask/helpers.py
View file

@ -27,7 +27,7 @@ except ImportError:
from urlparse import quote as url_quote
from werkzeug.datastructures import Headers
from werkzeug.exceptions import NotFound
from werkzeug.exceptions import BadRequest, NotFound
# this was moved in 0.7
try:
@ -618,8 +618,11 @@ def send_from_directory(directory, filename, **options):
filename = safe_join(directory, filename)
if not os.path.isabs(filename):
filename = os.path.join(current_app.root_path, filename)
if not os.path.isfile(filename):
raise NotFound()
try:
if not os.path.isfile(filename):
raise NotFound()
except (TypeError, ValueError):
raise BadRequest()
options.setdefault('conditional', True)
return send_file(filename, **options)