diff --git a/tarballer.py b/tarballer.py index 546cf88..68e363d 100755 --- a/tarballer.py +++ b/tarballer.py @@ -40,7 +40,26 @@ def decompress_tar(directory: str, name: str) -> None: os.chdir(directory) with tarfile.open(f"{name}.tar.xz", "r:xz") as tar: - tar.extractall(".") + 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, ".") if __name__ == "__main__":