Skip to content
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

Jump to bottom

fixes #580 and makes it "fit" #1373

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixes #580 and makes it "fit" #1373

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
7 changes: 3 additions & 4 deletions bottle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2843,8 +2843,7 @@ def static_file(filename, root,
mimetype=True,
download=False,
charset='UTF-8',
etag=None,
headers=None):
etag=None):
""" Open a file in a safe way and return an instance of :exc:`HTTPResponse`
that can be sent back to the client.

Expand All @@ -2861,7 +2860,7 @@ def static_file(filename, root,
(default: UTF-8)
:param etag: Provide a pre-computed ETag header. If set to ``False``,
ETag handling is disabled. (default: auto-generate ETag header)
:param headers: Additional headers dict to add to the response.


While checking user input is always a good idea, this function provides
additional protection against malicious ``filename`` parameters from
Expand All @@ -2879,7 +2878,7 @@ def static_file(filename, root,

root = os.path.join(os.path.abspath(root), '')
filename = os.path.abspath(os.path.join(root, filename.strip('/\\')))
headers = headers.copy() if headers else {}
headers = response.headers

if not filename.startswith(root):
return HTTPError(403, "Access denied.")
Expand Down