Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further improve is_subdir function.

Browse Source
This commit is contained in:
Wout Bouckaert 2024-08-16 14:42:44 -06:00
parent 1aabf491b1
commit 890e84cd5e
No known key found for this signature in database
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/classes/helpers/helpers.py
View File

@ -544,7 +544,8 @@ class Helpers:
return mounts
def is_subdir(self, child_path: str, parent_path: str) -> bool:
@staticmethod
def is_subdir(child_path: str, parent_path: str) -> bool:
"""
Checks if given child_path is a subdirectory of given parent_path. Returns True
or False.
@ -560,19 +561,18 @@ class Helpers:
server_path = os.path.realpath(child_path)
root_dir = os.path.realpath(parent_path)
if self.is_os_windows():
try:
relative = os.path.relpath(server_path, root_dir)
except ValueError:
# Windows will crash out if two paths are on different
# Drives We can happily return false if this is the case.
# Since two different drives will not be relative to each-other.
return False
else:
relative = os.path.relpath(server_path, root_dir)
if relative.startswith(os.pardir):
return False
except ValueError:
# Windows will crash out if two paths are on different Drives We can happily
# return false if this is the case. Since two different drives will not be
# relative to each-other.
return False
# If all checks pass, child path must be a child of parent.
return True
def set_setting(self, key, new_value):