Skip to content
Merged
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions pyiri2016/api/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@ def is_within_directory(directory, target):
abs_directory = os.path.abspath(directory)
abs_target = os.path.abspath(target)

prefix = os.path.commonprefix([abs_directory, abs_target])

return prefix == abs_directory
try:
return os.path.commonpath([abs_directory, abs_target]) == abs_directory
except ValueError:
return False

def safe_extract(tar, path=".", members=None, *, numeric_owner=False):

for member in tar.getmembers():
member_path = os.path.join(path, member.name)
if not is_within_directory(path, member_path):
raise Exception("Attempted Path Traversal in Tar File")
raise ValueError("Attempted Path Traversal in Tar File")

tar.extractall(path, members, numeric_owner=numeric_owner)

Expand Down