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

Implemented possible solution for path traversal #28

Open
wants to merge 5 commits into
base: dev-0.3
Choose a base branch
from
Open

Implemented possible solution for path traversal #28

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c26e5e2
Added check for only accessing config files in the nginx directory to…
chris18191 Jul 1, 2020
4b16c9b
Added entry for error handling on domains page in case that the confi…
chris18191 Jul 1, 2020
e55c8b8
added error rendering function and a function for getting valid paths.
chris18191 Jul 2, 2020
f09f1d0
added path filtering for other domains
chris18191 Jul 2, 2020
dedde58
removed camel case notation
chris18191 Jul 2, 2020
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
10 changes: 9 additions & 1 deletion app/api/endpoints.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ def post_config(name: str):
content = flask.request.get_json()
nginx_path = flask.current_app.config['NGINX_PATH']

with io.open(os.path.join(nginx_path, name), 'w') as f:
config_file = os.path.join(nginx_path, name)

if not os.path.commonprefix(os.path.realpath(config_file), nginx_path):
return flask.make_response({'success': False}), 200
Copy link
Owner

Choose a reason for hiding this comment

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

I would choose a different status code. For example a 400 (Bad Request) or 403 (Forbidden).

Copy link

@erikgeiser erikgeiser Jul 1, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Also note that os.path.commonprefix(("/a/b", "/c/d")) returns "/" which is truthy, so the condition is not met. And commonprefix takes an iterable and not variadic arguments so I think this errors out. Maybe use something like os.path.realpath(config_file).startswith(os.path.realpath(nginx_path) + os.sep) (though not as this ugly oneliner maybe).


with io.open(config_file, 'w') as f:
f.write(content['file'])

return flask.make_response({'success': True}), 200
Expand All @@ -57,6 +62,9 @@ def get_domains():
sites_available = []
sites_enabled = []

if not os.path.exists(config_path):
errorMessage = 'The config folder "{}" does not exists.'.format(config_path)
return flask.render_template('domains.html', errorMessage=errorMessage, sites_available=(), sites_enabled=()), 200
Copy link
Owner

@schenkd schenkd Jul 1, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Classic case of Java developer. Lower CamelCase is uncommon in Python. error_message would be nice! :)

Copy link
Owner

@schenkd schenkd Jul 1, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

I would also like to have the string formatting with f-string syntax. Then it will be consistent in the code.

error_message = f'The config folder "{config_path}" doesn't exists.'

for _ in os.listdir(config_path):

if os.path.isfile(os.path.join(config_path, _)):
Expand Down
7 changes: 6 additions & 1 deletion app/templates/domains.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<div class="column">

<div class="ui cards" id="domain_cards">
{% if errorMessage %}
<div>
{{errorMessage}}
Copy link
Owner

@schenkd schenkd Jul 1, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

It is functional, but you could enhance it with a message from the semantic framework. Here is a link to the component: Error Messages

</div>
{% endif %}
{% if sites_available %}
{% for domain in sites_available %}
<div class="card">
Expand Down Expand Up @@ -30,4 +35,4 @@
<!-- file content -->
</div>

</div>
</div>