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

Fix compatability with Django safe_join and Windows (leading "/" on file path) #1015

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix compatability with Django safe_join and Windows (leading "/" on file path) #1015

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0141717
Add compatability on windows systems A drive letter will not be prefixed
johnvorsten Feb 23, 2020
572fe3a
Remove debug print statement
johnvorsten Feb 23, 2020
afc1e92
Removed unnecessary print
johnvorsten Mar 1, 2020
0be70ee
Merge branch 'jschneier:master' into jv_windows
johnvorsten May 20, 2021
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
22 changes: 20 additions & 2 deletions storages/backends/dropbox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,26 @@ def __init__(self, oauth2_access_token=oauth2_access_token, root_path=location,

def _full_path(self, name):
if name == '/':
name = ''
return safe_join(self.root_path, name).replace('\\', '/')
name = ''
# If the machine is windows do not append the drive letter to file path
if os.name == 'nt':
final_path = os.path.join(self.root_path, name).replace('\\', '/')

# Separator on linux system
sep = '//'
Copy link
Owner

Choose a reason for hiding this comment

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

Isn't sep on Linux (Unix) just a single slash (/)?

base_path = self.root_path

if (not os.path.normcase(final_path).startswith(os.path.normcase(base_path + sep)) and
os.path.normcase(final_path) != os.path.normcase(base_path) and
os.path.dirname(os.path.normcase(base_path)) != os.path.normcase(base_path)):
raise SuspiciousFileOperation(
'The joined path ({}) is located outside of the base path '
'component ({})'.format(final_path, base_path))

return final_path

else:
return safe_join(self.root_path, name).replace('\\', '/')

def delete(self, name):
self.client.files_delete(self._full_path(name))
Expand Down