Skip to content

remove redundunt check in static_file() #1300

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

remove redundunt check in static_file() #1300

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
2 changes: 1 addition & 1 deletion bottle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2883,7 +2883,7 @@ def static_file(filename, root,

if not filename.startswith(root):
return HTTPError(403, "Access denied.")
if not os.path.exists(filename) or not os.path.isfile(filename):
if not os.path.isfile(filename):
Copy link
Contributor

@oz123 oz123 Jan 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, this is redundant.

In [71]: os.path.isfile("no-such-file")
Out[71]: False

@SergBobrovsky I believe that it will be easier for @defnull to review all your PRs if your commit messages are a bit more verbose.
Adding stuff like this in the commit message surely helps.

return HTTPError(404, "File does not exist.")
if not os.access(filename, os.R_OK):
return HTTPError(403, "You do not have permission to access this file.")
Expand Down