|
|
|
@ -151,8 +151,8 @@ def decompress(fname): |
|
|
|
|
|
|
|
|
|
if fname.find('tar') >= 0 or fname.find('tgz') >= 0: |
|
|
|
|
with tarfile.open(fname) as tf: |
|
|
|
|
def is_within_directory(directory, target): |
|
|
|
|
|
|
|
|
|
def _is_within_directory(directory, target): |
|
|
|
|
abs_directory = os.path.abspath(directory) |
|
|
|
|
abs_target = os.path.abspath(target) |
|
|
|
|
|
|
|
|
@ -160,17 +160,19 @@ def decompress(fname): |
|
|
|
|
|
|
|
|
|
return prefix == abs_directory |
|
|
|
|
|
|
|
|
|
def safe_extract(tar, path=".", members=None, *, numeric_owner=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): |
|
|
|
|
if not _is_within_directory(path, member_path): |
|
|
|
|
raise Exception("Attempted Path Traversal in Tar File") |
|
|
|
|
|
|
|
|
|
tar.extractall(path, members, numeric_owner=numeric_owner) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
safe_extract(tf, path=fpath_tmp) |
|
|
|
|
_safe_extract(tf, path=fpath_tmp) |
|
|
|
|
elif fname.find('zip') >= 0: |
|
|
|
|
with zipfile.ZipFile(fname) as zf: |
|
|
|
|
zf.extractall(path=fpath_tmp) |
|
|
|
|