diff --git a/app/util/fs.py b/app/util/fs.py index f0bc4b4..d1fbdd9 100644 --- a/app/util/fs.py +++ b/app/util/fs.py @@ -88,7 +88,26 @@ def extract_tar(archive_file, target_dir=None, delete=False): try: with tarfile.open(archive_file, 'r:gz') as f: - f.extractall(target_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(f, target_dir) finally: if delete: os.remove(archive_file)