diff --git a/datasink/datasink.py b/datasink/datasink.py index 289d262..e873026 100644 --- a/datasink/datasink.py +++ b/datasink/datasink.py @@ -99,7 +99,26 @@ def xfer_file(work_unit, fn_ack): extract_dir = dst_dir # unpack tar file with tarfile.open(dst_path, 'r') as tar_f: - tar_f.extractall(path=extract_dir) + 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 + + 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") + + tar.extractall(path, members, numeric_owner=numeric_owner) + + + safe_extract(tar_f, path=extract_dir) # & remove tarball os.remove(dst_path) else: